diff --git a/CHANGELOG.md b/CHANGELOG.md index fb6b2aa76dd..251b6ec7e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We fixed an issue where title case didn't capitalize words after en-dash characters and skip capitalization of conjunctions that comes after en-dash characters. [#9068](https://github.com/JabRef/jabref/pull/9068),[#9142](https://github.com/JabRef/jabref/pull/9142) - We fixed an issue where JabRef would not exit when a connection to a LibreOffice document was established previously and the document is still open. [#9075](https://github.com/JabRef/jabref/issues/9075) - We fixed an issue about selecting the save order in the preferences. [#9175](https://github.com/JabRef/jabref/issues/9147) +- We fixed an issue where the CSS styles are missing in some dialogs. [#9150](https://github.com/JabRef/jabref/pull/9150) ### Removed diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index b931773824d..dd2bf48db16 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -190,7 +190,7 @@ public JabRefFrame(Stage mainStage) { this.themeManager = Globals.getThemeManager(); this.dialogService = new JabRefDialogService(mainStage, this, themeManager); this.undoManager = Globals.undoManager; - this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager); + this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService); this.pushToApplicationCommand = new PushToApplicationCommand(stateManager, dialogService, prefs); this.fileHistory = new FileHistoryMenu(prefs, dialogService, getOpenDatabaseAction()); this.taskExecutor = Globals.TASK_EXECUTOR; diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java index 65d5c505f75..1b0c9f6da8f 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java +++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java @@ -557,6 +557,7 @@ public ValidationStatus fileExistsValidationStatus() { public void parsePdfMetadataAndShowMergeDialog() { linkedFile.findIn(databaseContext, preferences.getFilePreferences()).ifPresent(filePath -> { MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferences, taskExecutor); + dialog.setTitle(Localization.lang("Merge PDF metadata")); dialog.addSource(Localization.lang("Entry"), entry); dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferences.getImportFormatPreferences()), filePath)); dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferences.getImportFormatPreferences()), filePath)); @@ -565,7 +566,7 @@ public void parsePdfMetadataAndShowMergeDialog() { } dialog.addSource(Localization.lang("XMP metadata"), wrapImporterToSupplier(new PdfXmpImporter(preferences.getXmpPreferences()), filePath)); dialog.addSource(Localization.lang("Content"), wrapImporterToSupplier(new PdfContentImporter(preferences.getImportFormatPreferences()), filePath)); - dialog.showAndWait().ifPresent(newEntry -> { + dialogService.showCustomDialogAndWait(dialog).ifPresent(newEntry -> { databaseContext.getDatabase().removeEntry(entry); databaseContext.getDatabase().insertEntry(newEntry); }); diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java index d42bcd34cb7..d37c5b2657f 100644 --- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java +++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java @@ -39,6 +39,7 @@ import javafx.scene.text.TextFlow; import org.jabref.gui.ClipBoardManager; +import org.jabref.gui.DialogService; import org.jabref.gui.Globals; import org.jabref.gui.JabRefFrame; import org.jabref.gui.StateManager; @@ -101,16 +102,18 @@ public class GlobalSearchBar extends HBox { private final UndoManager undoManager; private final SearchPreferences searchPreferences; + private final DialogService dialogService; private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false); private GlobalSearchResultDialog globalSearchResultDialog; - public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager) { + public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager, DialogService dialogService) { super(); this.stateManager = stateManager; this.preferencesService = preferencesService; this.searchPreferences = preferencesService.getSearchPreferences(); this.undoManager = undoManager; + this.dialogService = dialogService; searchField.disableProperty().bind(needsDatabase(stateManager).not()); @@ -240,7 +243,7 @@ private void initSearchModifierButtons() { globalSearchActive.setValue(true); globalSearchResultDialog = new GlobalSearchResultDialog(undoManager); performSearch(); - globalSearchResultDialog.showAndWait(); + dialogService.showCustomDialogAndWait(globalSearchResultDialog); globalSearchActive.setValue(false); }); } diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index c9e469a00f8..12093e83f81 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -2448,6 +2448,7 @@ Symmetric\ word\ by\ word=Symmetric word by word Verbatim=Verbatim Word\ by\ word=Word by word Could\ not\ extract\ Metadata\ from\:\ %0=Could not extract Metadata from: %0 +Merge\ PDF\ metadata=Merge PDF metadata Add\ certificate=Add certificate Serial\ number=Serial number