Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue 3861 : XMP Dialog, Add new Groups dialog, Append Library dialog to javafx #4264

Merged
merged 15 commits into from
Oct 9, 2018
Merged

Fix issue 3861 : XMP Dialog, Add new Groups dialog, Append Library dialog to javafx #4264

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f6a3346
issue_3861
1160300712 Aug 13, 2018
66f1aa8
issue #3861
AyachiNene Aug 13, 2018
792371e
Merge branch 'master' into fix_issue_3861
tobiasdiez Sep 25, 2018
aebf8e7
Revise append database dialog
tobiasdiez Sep 30, 2018
a284f86
Move replace string dialog to new package (and remove duplicate JavaF…
tobiasdiez Sep 30, 2018
ff804a3
Revise mass set field dialog
tobiasdiez Sep 30, 2018
5da85d3
Merge branch 'master' of https://github.com/JabRef/jabref into fix_is…
tobiasdiez Sep 30, 2018
f654542
Revise mass set field dialog
tobiasdiez Sep 30, 2018
2f988f7
Move mass set field dialog
tobiasdiez Sep 30, 2018
4a138dd
Revise group dialog
tobiasdiez Sep 30, 2018
f02d4a9
Revise group dialog
tobiasdiez Sep 30, 2018
7fa5c68
Fix checkstyle
tobiasdiez Oct 9, 2018
43b7631
Update JabRef_en.properties
tobiasdiez Oct 9, 2018
eda93a9
Update JabRef_en.properties
tobiasdiez Oct 9, 2018
29c4969
Update AppendDatabaseDialog.java
tobiasdiez Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/jabref/gui/BasePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.jabref.gui.collab.FileUpdatePanel;
import org.jabref.gui.contentselector.ContentSelectorDialog;
import org.jabref.gui.desktop.JabRefDesktop;
import org.jabref.gui.edit.ReplaceStringAction;
import org.jabref.gui.entryeditor.EntryEditor;
import org.jabref.gui.exporter.SaveDatabaseAction;
import org.jabref.gui.externalfiles.FindFullTextAction;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/jabref/gui/JabRefFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
import org.jabref.gui.actions.ManageJournalsAction;
import org.jabref.gui.actions.ManageKeywordsAction;
import org.jabref.gui.actions.ManageProtectedTermsAction;
import org.jabref.gui.actions.MassSetFieldAction;
import org.jabref.gui.actions.MergeEntriesAction;
import org.jabref.gui.actions.NewDatabaseAction;
import org.jabref.gui.actions.NewEntryAction;
Expand All @@ -85,6 +84,7 @@
import org.jabref.gui.actions.SimpleCommand;
import org.jabref.gui.actions.StandardActions;
import org.jabref.gui.dialogs.AutosaveUIManager;
import org.jabref.gui.edit.MassSetFieldsAction;
import org.jabref.gui.exporter.ExportCommand;
import org.jabref.gui.exporter.ExportToClipboardAction;
import org.jabref.gui.exporter.SaveAllAction;
Expand Down Expand Up @@ -152,7 +152,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
private final JabRefPreferences prefs = Globals.prefs;
private final GlobalSearchBar globalSearchBar = new GlobalSearchBar(this);
private final JFXSnackbar statusLine = new JFXSnackbar(this);
;
private final ProgressBar progressBar = new ProgressBar();
private final FileHistoryMenu fileHistory = new FileHistoryMenu(prefs, this);

Expand Down Expand Up @@ -831,7 +830,7 @@ private MenuBar createMenu() {
edit.getItems().addAll(
factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(this)),
factory.createMenuItem(StandardActions.REPLACE_ALL, new OldDatabaseCommandWrapper(Actions.REPLACE_ALL, this, Globals.stateManager)),
factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldAction(this))
factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(this))

);

Expand Down
117 changes: 0 additions & 117 deletions src/main/java/org/jabref/gui/MergeDialog.java
View file
Open in desktop

This file was deleted.

Loading