Merge branch 'main' into fix/add-buttons

Author: Yubo-Cao

CHANGELOG.md

@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We fixed an issue where "Print preview" would throw a `NullPointerException` if no printers were available. [#13708](https://github.com/JabRef/jabref/issues/13708)
 - We added the option to enable the language server in the preferences. [#13697](https://github.com/JabRef/jabref/pull/13697)
 - We introduced an option in Preferences under (under Linked files -> Linked file name conventions) to automatically rename linked files when an entry data changes. [#11316](https://github.com/JabRef/jabref/issues/11316)
 - We added tooltips (on hover) for 'Library-specific file directory', 'User-specific file directory' and 'LaTeX file directory' fields of the library properties window. [#12269](https://github.com/JabRef/jabref/issues/12269)

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/actions/ActionHelper.java

@@ -10,6 +10,8 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.StateManager;
+import org.jabref.logic.git.GitHandler;
+import org.jabref.logic.git.util.GitHandlerRegistry;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.util.io.FileUtil;
@@ -104,4 +106,21 @@ public static BooleanExpression hasLinkedFileForSelectedEntries(StateManager sta
         return BooleanExpression.booleanExpression(EasyBind.reduce(stateManager.getSelectedEntries(),
                 entries -> entries.anyMatch(entry -> !entry.getFiles().isEmpty())));
     }
+
+    public static BooleanExpression needsGitRemoteConfigured(StateManager stateManager) {
+        return BooleanExpression.booleanExpression(
+                EasyBind.map(stateManager.activeDatabaseProperty(), contextOptional -> {
+                    if (contextOptional.isPresent()) {
+                        return contextOptional.get().getDatabasePath()
+                                         .map(path -> {
+                                             GitHandler handler = new GitHandlerRegistry().get(path.getParent());
+                                             return handler != null && handler.hasRemote("origin");
+                                         })
+                                         .orElse(false);
+                    } else {
+                        return false;
+                    }
+                })
+        );
+    }
 }

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

@@ -3,6 +3,7 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContentDisplay;
@@ -24,7 +25,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 +48,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 +60,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
@@ -83,19 +80,21 @@ private void initialize() {
 
     private Callback<ListView<LogEventViewModel>, ListCell<LogEventViewModel>> createCellFactory() {
         return cell -> new ListCell<>() {
-            private HBox graphic;
-            private Node icon;
-            private VBox message;
-            private Label heading;
-            private Label stacktrace;
+            private final HBox graphic;
+            private final VBox message;
+            private final Label heading;
+            private final Label stacktrace;
 
             {
-                graphic = new HBox(10);
+                graphic = new HBox();
                 heading = new Label();
                 stacktrace = new Label();
                 message = new VBox();
+                message.setAlignment(Pos.CENTER_LEFT);
                 message.getChildren().setAll(heading, stacktrace);
+                message.getStyleClass().add("message-box");
                 setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+                getStyleClass().add("error-console-cell");
             }
 
             @Override
@@ -105,10 +104,17 @@ public void updateItem(LogEventViewModel event, boolean empty) {
                 if ((event == null) || empty) {
                     setGraphic(null);
                 } else {
-                    icon = event.getIcon().getGraphicNode();
+                    Node icon = event.getIcon().getGraphicNode();
                     heading.setText(event.getDisplayText());
                     heading.getStyleClass().setAll(event.getStyleClass());
-                    stacktrace.setText(event.getStackTrace().orElse(""));
+                    event.getStackTrace().ifPresentOrElse(text -> {
+                        stacktrace.setText(text);
+                        stacktrace.setVisible(true);
+                        stacktrace.setManaged(true);
+                    }, () -> {
+                        stacktrace.setVisible(false);
+                        stacktrace.setManaged(false);
+                    });
                     graphic.getStyleClass().setAll(event.getStyleClass());
                     graphic.getChildren().setAll(icon, message);
                     setGraphic(graphic);

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/frame/MainMenu.java

@@ -37,6 +37,9 @@
 import org.jabref.gui.externalfiles.AutoLinkFilesAction;
 import org.jabref.gui.externalfiles.DownloadFullTextAction;
 import org.jabref.gui.externalfiles.FindUnlinkedFilesAction;
+import org.jabref.gui.git.GitCommitAction;
+import org.jabref.gui.git.GitPullAction;
+import org.jabref.gui.git.GitPushAction;
 import org.jabref.gui.git.GitShareToGitHubAction;
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.ErrorConsoleAction;
@@ -179,9 +182,12 @@ private void createMenu() {
                 new SeparatorMenuItem(),
 
                 // region: Sharing of the library
-
                 // TODO: Should be only enabled if not yet shared.
                 factory.createSubMenu(StandardActions.GIT,
+                        factory.createMenuItem(StandardActions.GIT_COMMIT, new GitCommitAction(dialogService, stateManager)),
+                        factory.createMenuItem(StandardActions.GIT_PULL, new GitPullAction(dialogService, stateManager, preferences, taskExecutor)),
+                        factory.createMenuItem(StandardActions.GIT_PUSH, new GitPushAction(dialogService, stateManager, preferences, taskExecutor)),
+                        new SeparatorMenuItem(),
                         factory.createMenuItem(StandardActions.GIT_SHARE, new GitShareToGitHubAction(dialogService, stateManager))
                 ),
 

jabgui/src/main/java/org/jabref/gui/git/GitCommitAction.java

@@ -0,0 +1,43 @@
+package org.jabref.gui.git;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.actions.ActionHelper;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.logic.git.GitHandler;
+import org.jabref.logic.git.status.GitStatusChecker;
+import org.jabref.logic.l10n.Localization;
+
+public class GitCommitAction extends SimpleCommand {
+
+    private final DialogService dialogService;
+    private final StateManager stateManager;
+
+    public GitCommitAction(DialogService dialogService, StateManager stateManager) {
+        this.dialogService = dialogService;
+        this.stateManager = stateManager;
+
+        this.executable.bind(ActionHelper.needsDatabase(stateManager));
+    }
+
+    @Override
+    public void execute() {
+        if (hasNothingToCommit()) {
+            dialogService.notify(Localization.lang("Nothing to commit."));
+            return;
+        }
+
+        dialogService.showCustomDialogAndWait(
+                new GitCommitDialogView()
+        );
+    }
+
+    private boolean hasNothingToCommit() {
+        return stateManager.getActiveDatabase()
+                           .flatMap(context -> context.getDatabasePath())
+                           .flatMap(GitHandler::fromAnyPath)
+                           .map(GitStatusChecker::checkStatus)
+                           .map(status -> !status.uncommittedChanges())
+                           .orElse(true);
+    }
+}