allow top menu font size change

springzfx · Sep 26, 2019 · 9af0f7c · 9af0f7c
1 parent 6d43ea1
commit 9af0f7c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1,16 +1,6 @@
 package org.jabref.gui;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.GraphicsEnvironment;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Window;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.MouseAdapter;
@@ -895,11 +885,13 @@ public boolean quit() {
     private void initLayout() {
 
         setProgressBarVisible(false);
+        Font menuFont = new Font("sans-serif", Font.PLAIN, Globals.prefs.getInt(JabRefPreferences.MENU_FONT_SIZE));
 
         pushApplications = new PushToApplications();
         pushExternalButton = new PushToApplicationButton(this, pushApplications.getApplications());
         fillMenu();
         createToolBar();
+        setFontRecursive(mb, menuFont);
         setJMenuBar(mb);
         getContentPane().setLayout(new BorderLayout());
 
@@ -1279,6 +1271,13 @@ private void fillMenu() {
         createDisabledIconsForMenuEntries(mb);
     }
 
+    private void setFontRecursive(JComponent m, Font f){
+        m.setFont(f);
+        for (int i=0;i<m.getComponentCount();i++){
+            setFontRecursive((JComponent) m.getComponent(i), f);
+        }
+    }
+
     public void addParserResult(ParserResult parserResult, boolean focusPanel) {
         if (parserResult.toOpenTab()) {
             // Add the entries to the open tab.

diff --git a/src/main/java/org/jabref/gui/preftabs/GeneralTab.java b/src/main/java/org/jabref/gui/preftabs/GeneralTab.java
@@ -249,10 +249,11 @@ public void storeSettings() {
     }
 
     @Override
+    @SuppressWarnings("ReturnValueIgnored")
     public boolean validateSettings() {
         try {
             // Test if date format is legal:
-            DateTimeFormatter.ofPattern(timeStampFormat.getText());
+           DateTimeFormatter.ofPattern(timeStampFormat.getText());
 
         } catch (IllegalArgumentException ex2) {
             JOptionPane.showMessageDialog