Fix/theme manager (#13764)

* fix: Force ThemeManager to apply font and theme settings to all new dialog and window

* fix: Remove unnecessary manual font size updater

* refactor: Rename the parameter name in the DialogService

* fix: Small quick fix to BaseWindow

* fix: Remove unnecessary WindowOverlay hack to get tooltip to be themed

* Fix submodules

* fix: Remove unnecessary call to updateFontStyle, which is now done automatically for all new Dialog that's created.

* fix: Get dialog button to scale with the font size

Author: Yubo-Cao

jabgui/src/main/java/org/jabref/gui/JabRefDialogService.java

@@ -526,11 +526,11 @@ public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOE
     }
 
     @Override
-    public void showCustomDialog(BaseDialog<?> aboutDialogView) {
-        if (aboutDialogView.getOwner() == null) {
-            aboutDialogView.initOwner(mainWindow);
+    public void showCustomDialog(BaseDialog<?> dialogView) {
+        if (dialogView.getOwner() == null) {
+            dialogView.initOwner(mainWindow);
         }
-        aboutDialogView.show();
+        dialogView.show();
     }
 
     @Override

jabgui/src/main/java/org/jabref/gui/JabRefGUI.java

@@ -181,8 +181,8 @@ public void initialize() {
 
         JabRefGUI.themeManager = new ThemeManager(
                 preferences.getWorkspacePreferences(),
-                fileUpdateMonitor,
-                Runnable::run);
+                fileUpdateMonitor
+        );
         Injector.setModelOrService(ThemeManager.class, themeManager);
 
         JabRefGUI.countingUndoManager = new CountingUndoManager();

jabgui/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java

@@ -11,7 +11,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
@@ -34,7 +33,6 @@ public class FromAuxDialog extends BaseDialog<Void> {
 
     @Inject private CliPreferences preferences;
     @Inject private DialogService dialogService;
-    @Inject private ThemeManager themeManager;
     @Inject private StateManager stateManager;
 
     private final LibraryTabContainer tabContainer;
@@ -57,8 +55,6 @@ public FromAuxDialog(LibraryTabContainer tabContainer) {
             }
             return null;
         });
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java

@@ -24,7 +24,6 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
@@ -48,7 +47,6 @@ public class ErrorConsoleView extends BaseDialog<Void> {
     @Inject private ClipBoardManager clipBoardManager;
     @Inject private BuildInfo buildInfo;
     @Inject private KeyBindingRepository keyBindingRepository;
-    @Inject private ThemeManager themeManager;
 
     public ErrorConsoleView() {
         this.setTitle(Localization.lang("Event log"));
@@ -61,8 +59,6 @@ public ErrorConsoleView() {
         ControlHelper.setAction(copyLogButton, getDialogPane(), event -> copyLog());
         ControlHelper.setAction(clearLogButton, getDialogPane(), event -> clearLog());
         ControlHelper.setAction(createIssueButton, getDialogPane(), event -> createIssue());
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java

@@ -36,7 +36,6 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.preferences.GuiPreferences;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileNodeViewModel;
 import org.jabref.gui.util.IconValidationDecorator;
@@ -59,7 +58,6 @@
 import org.controlsfx.control.CheckTreeView;
 
 public class UnlinkedFilesDialogView extends BaseDialog<Void> {
-
     private static final String REFRESH_CLASS = "refresh";
 
     @FXML private TextField directoryPathField;
@@ -89,7 +87,6 @@ public class UnlinkedFilesDialogView extends BaseDialog<Void> {
     @Inject private UndoManager undoManager;
     @Inject private TaskExecutor taskExecutor;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private ThemeManager themeManager;
 
     private final ControlsFxVisualizer validationVisualizer;
     private UnlinkedFilesDialogViewModel viewModel;
@@ -112,8 +109,6 @@ public UnlinkedFilesDialogView() {
             saveConfiguration();
             return null;
         });
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java

@@ -48,7 +48,6 @@
 import org.jabref.gui.search.SearchType;
 import org.jabref.gui.sidepane.SidePane;
 import org.jabref.gui.sidepane.SidePaneType;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
@@ -510,8 +509,7 @@ public void showWelcomeTab() {
                 taskExecutor,
                 fileHistory,
                 Injector.instantiateModelOrService(BuildInfo.class),
-                preferences.getWorkspacePreferences(),
-                Injector.instantiateModelOrService(ThemeManager.class)
+                preferences.getWorkspacePreferences()
         );
         tabbedPane.getTabs().add(welcomeTab);
         tabbedPane.getSelectionModel().select(welcomeTab);

jabgui/src/main/java/org/jabref/gui/help/AboutDialogView.java

@@ -37,14 +37,6 @@ public AboutDialogView() {
                   .setAsDialogPane(this);
 
         ControlHelper.setAction(copyVersionButton, getDialogPane(), ignored -> copyVersionToClipboard());
-
-        getDialogPane()
-                .sceneProperty()
-                .addListener((_, ignored, newScene) -> {
-                    if (newScene != null) {
-                        themeManager.updateFontStyle(newScene);
-                    }
-                });
     }
 
     public AboutDialogViewModel getViewModel() {

jabgui/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java

@@ -21,7 +21,6 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.entryeditor.EntryEditor;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.ViewModelTableRowFactory;
@@ -49,7 +48,6 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @FXML private VBox dialogVBox;
 
     @Inject private EntryEditor entryEditor;
-    @Inject private ThemeManager themeManager;
     @Inject private StateManager stateManager;
     private final List<IntegrityMessage> messages;
     private final LibraryTab libraryTab;
@@ -58,6 +56,7 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     private TableFilter<IntegrityMessage> tableFilter;
     private BibLogSettingsPane bibLogSettingsPane;
     private final List<IntegrityMessage> blgWarnings = new ArrayList<>();
+
     public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab, DialogService dialogService) {
         this.messages = messages;
         this.libraryTab = libraryTab;
@@ -69,8 +68,6 @@ public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryT
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     private void handleRowClick(IntegrityMessage message, MouseEvent event) {

jabgui/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java

@@ -6,22 +6,18 @@
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
 
 public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel> {
 
     @FXML private TabPane tabPane;
     @FXML private ButtonType saveButton;
 
-    @Inject private ThemeManager themeManager;
-
     private final BibDatabaseContext databaseContext;
     private LibraryPropertiesViewModel viewModel;
 
@@ -39,8 +35,6 @@ public LibraryPropertiesView(BibDatabaseContext databaseContext) {
         } else {
             setTitle(Localization.lang("Library properties"));
         }
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML

jabgui/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java

@@ -13,7 +13,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -40,7 +39,6 @@ public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel
 
     @Inject private DialogService dialogService;
     @Inject private GuiPreferences preferences;
-    @Inject private ThemeManager themeManager;
 
     private PreferencesDialogViewModel viewModel;
     private final Class<? extends PreferencesTab> preferencesTabToSelectClass;
@@ -61,8 +59,6 @@ public PreferencesDialogView(Class<? extends PreferencesTab> preferencesTabToSel
                 event.consume();
             }
         });
-
-        themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     public PreferencesDialogViewModel getViewModel() {