New global search

src/main/java/org/jabref/gui/Base.css

@@ -960,6 +960,13 @@ TextFlow > .tooltip-text-monospaced {
     -fx-fill: -jr-search-text;
 }
 
+
+.mainToolbar .search-field .button .glyph-icon {
+    -fx-fill: -jr-search-text;
+    -fx-text-fill: -jr-search-text;
+    -fx-icon-color: -jr-search-text;
+}
+
 /* magnifier glass */
 .mainToolbar .search-field .glyph-icon {
     -fx-fill: -jr-search-text;

src/main/java/org/jabref/gui/Dark.css

@@ -108,6 +108,11 @@
     -fx-background-color: -jr-background;
 }
 
+.mainToolbar .search-field .button .glyph-icon {
+    -fx-fill: derive(-fx-light-text-color, 80%);
+    -fx-text-fill: derive(-fx-light-text-color, 80%);
+    -fx-icon-color: derive(-fx-light-text-color, 80%);
+}
 
 .mainToolbar .search-field .toggle-button .glyph-icon {
     -fx-fill: -jr-search-text;

src/main/java/org/jabref/gui/DialogService.java

@@ -168,6 +168,14 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      */
     void showCustomDialog(BaseDialog<?> dialog);
 
+    /**
+     * This will create and display a new dialog showing a custom {@link DialogPane}
+     * and using custom {@link ButtonType}s.
+     *
+     *
+     */
+    Optional<ButtonType> showNonModalCustomDialogAndWait(String title, DialogPane contentPane, ButtonType... buttonTypes);
+
     /**
      * This will create and display a new dialog of the specified
      * {@link Alert.AlertType} but with user defined buttons as optional

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

@@ -30,6 +30,7 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
@@ -63,6 +64,7 @@
  * advised to rather create a new sub class of {@link FXDialog}.
  */
 public class JabRefDialogService implements DialogService {
+
     // Snackbar dialog maximum size
     public static final int DIALOG_SIZE_LIMIT = 300;
 
@@ -272,6 +274,20 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
         return alert.showAndWait();
     }
 
+    @Override
+    public Optional<ButtonType> showNonModalCustomDialogAndWait(String title, DialogPane contentPane,
+                                 ButtonType... buttonTypes) {
+        FXDialog alert = new FXDialog(AlertType.NONE, title);
+        alert.initModality(Modality.NONE);
+        alert.setDialogPane(contentPane);
+        alert.getButtonTypes().setAll(buttonTypes);
+        alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+        alert.setResizable(true);
+        alert.initOwner(mainWindow);
+        preferences.getTheme().installCss(alert.getDialogPane().getScene());
+        return alert.showAndWait();
+    }
+
     @Override
     public <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog) {
         if (dialog.getOwner() == null) {

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

@@ -180,8 +180,8 @@ public JabRefFrame(Stage mainStage) {
         this.dialogService = new JabRefDialogService(mainStage, this, prefs);
         this.stateManager = Globals.stateManager;
         this.pushToApplicationsManager = new PushToApplicationsManager(dialogService, stateManager, prefs);
-        this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs);
         this.undoManager = Globals.undoManager;
+        this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService);
         this.fileHistory = new FileHistoryMenu(prefs, dialogService, getOpenDatabaseAction());
         this.taskExecutor = Globals.TASK_EXECUTOR;
         this.setOnKeyTyped(key -> {
@@ -593,10 +593,16 @@ public void init() {
 
         // Subscribe to the search
         EasyBind.subscribe(stateManager.activeSearchQueryProperty(),
-                query -> {
-                    if (getCurrentLibraryTab() != null) {
-                        getCurrentLibraryTab().setCurrentSearchQuery(query);
-                    }
+                           query -> {
+                               if (prefs.getSearchPreferences().isKeepSearchStrng()) {
+                                   for (LibraryTab tab : getLibraryTabs()) {
+                                       tab.setCurrentSearchQuery(query);
+                                   }
+                               } else {
+                                   if (getCurrentLibraryTab() != null) {
+                                       getCurrentLibraryTab().setCurrentSearchQuery(query);
+                                   }
+                               }
                 });
 
         // Wait for the scene to be created, otherwise focusOwnerProperty is not provided

src/main/java/org/jabref/gui/LibraryTab.java

@@ -1,6 +1,5 @@
 package org.jabref.gui;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -109,7 +108,7 @@ public class LibraryTab extends Tab {
     // initializing it so we prevent NullPointerException
     private BackgroundTask<ParserResult> dataLoadingTask = BackgroundTask.wrap(() -> null);
 
-    private IndexingTaskManager indexingTaskManager = new IndexingTaskManager(Globals.TASK_EXECUTOR);
+    private final IndexingTaskManager indexingTaskManager = new IndexingTaskManager(Globals.TASK_EXECUTOR);
 
     public LibraryTab(JabRefFrame frame,
                       PreferencesService preferencesService,
@@ -311,17 +310,9 @@ public void updateTabTitle(boolean isChanged) {
             }
 
             // Unique path fragment
-            List<String> uniquePathParts = FileUtil.uniquePathSubstrings(collectAllDatabasePaths());
-            Optional<String> uniquePathPart = uniquePathParts.stream()
-                                                             .filter(part -> databasePath.toString().contains(part)
-                                                                     && !part.equals(fileName) && part.contains(File.separator))
-                                                             .findFirst();
-            if (uniquePathPart.isPresent()) {
-                String uniquePath = uniquePathPart.get();
-                // remove filename
-                uniquePath = uniquePath.substring(0, uniquePath.lastIndexOf(File.separator));
-                tabTitle.append(" \u2013 ").append(uniquePath);
-            }
+            Optional<String> uniquePathPart = FileUtil.getUniquePathFragment(collectAllDatabasePaths(), databasePath);
+            uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
+
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
                 tabTitle.append(Localization.lang("untitled"));

src/main/java/org/jabref/gui/StateManager.java

@@ -7,9 +7,11 @@
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -52,10 +54,11 @@ public class StateManager {
     private final OptionalObjectProperty<SearchQuery> activeSearchQuery = OptionalObjectProperty.empty();
     private final ObservableMap<BibDatabaseContext, IntegerProperty> searchResultMap = FXCollections.observableHashMap();
     private final OptionalObjectProperty<Node> focusOwner = OptionalObjectProperty.empty();
-    private final ObservableList<Task<?>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[]{task.progressProperty(), task.runningProperty()});
+    private final ObservableList<Task<?>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[] {task.progressProperty(), task.runningProperty()});
     private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.anyMatch(Task::isRunning));
     private final EasyBinding<Double> tasksProgress = EasyBind.reduce(backgroundTasks, tasks -> tasks.filter(Task::isRunning).mapToDouble(Task::getProgress).average().orElse(1));
     private final ObservableMap<String, DialogWindowState> dialogWindowStates = FXCollections.observableHashMap();
+    private final BooleanProperty globalSearch = new SimpleBooleanProperty();
 
     public StateManager() {
         activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElse(null)));
@@ -128,6 +131,18 @@ public void setSearchQuery(SearchQuery searchQuery) {
         activeSearchQuery.setValue(Optional.of(searchQuery));
     }
 
+    public void setGlobalSearchActive(boolean active) {
+        globalSearch.setValue(active);
+    }
+
+    public BooleanProperty globalSearchPropery() {
+        return globalSearch;
+    }
+
+    public boolean isGlobalSearchActive() {
+        return globalSearch.get();
+    }
+
     public OptionalObjectProperty<Node> focusOwnerProperty() {
         return focusOwner;
     }

src/main/java/org/jabref/gui/icon/IconTheme.java

@@ -334,7 +334,9 @@ public enum JabRefIcons implements JabRefIcon {
         LINK(MaterialDesignL.LINK),
         LINK_VARIANT(MaterialDesignL.LINK_VARIANT),
         PROTECT_STRING(MaterialDesignC.CODE_BRACES),
-        SELECT_ICONS(MaterialDesignA.APPS);
+        SELECT_ICONS(MaterialDesignA.APPS),
+        KEEP_SEARCH_STRING(MaterialDesignE.EARTH),
+        OPEN_GLOBAL_SEARCH(MaterialDesignO.OPEN_IN_NEW);
 
         private final JabRefIcon icon;
 

src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

@@ -51,10 +51,10 @@ public MainTableDataModel(BibDatabaseContext context, PreferencesService prefere
         IntegerProperty resultSize = new SimpleIntegerProperty();
         resultSize.bind(Bindings.size(entriesFiltered));
         stateManager.setActiveSearchResultSize(context, resultSize);
+        stateManager.setActiveSearchResultSize(context, resultSize);
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesSorted = new SortedList<>(entriesFiltered);
         groupViewMode = preferencesService.getGroupViewMode();
-
     }
 
     private boolean isMatched(ObservableList<GroupTreeNode> groups, Optional<SearchQuery> query, BibEntryTableViewModel entry) {