Merge remote-tracking branch 'upstream/master' into libraryproperties…

…tofx

* upstream/master: (25 commits)
  Convert "Manage external file types" dialog to JavaFX (#4711)
  Remove add/move/remove from group dialog (#4695)
  Fix entry preview copy exception (#4721)
  Fix default import format pattern (#4731)
  Add key bindings (#4732)
  Convert "wait for save" dialog to JavaFX (#4697)
  Add changes to CHANGELOG and fix New Library icons
  Adding GENERATE_CITE_KEYS button to toolbar.
  Change toolbar icons and add separators
  Adding additional modifiers to be used in bibtex key generator
  Adding "von" part to Author's last name when exporting to MS Office 2007 (#4725)
  Bump mockito-core from 2.24.5 to 2.25.0 (#4723)
  remove obsolete localization strings fix checkstyle
  fix build
  cleanup
  convert file chooser in preferences
  remove unused swing stuff convert help  buttons
  Fix #4703: Newline format couldn't be changed (#4720)
  Group and reorder the Main Menu (tabs & icons) (#4707)
  Convert Manage keywords dialog to JavaFX (#4701)
  ...

CHANGELOG.md

@@ -52,8 +52,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
 - We added the ability change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546)
 - We added the ability to execute default action in dialog by using with <kbd>Ctrl</kbd> + <kbd>Enter</kbd> combination [#4496](https://github.com/JabRef/jabref/issues/4496)
-
-
+- We grouped and reordered the Main Menu (File, Edit, Library, Quality, Tools, and View tabs & icons). [#4666](https://github.com/JabRef/jabref/issues/4666) [#4667](https://github.com/JabRef/jabref/issues/4667) [#4668](https://github.com/JabRef/jabref/issues/4668) [#4669](https://github.com/JabRef/jabref/issues/4669) [#4670](https://github.com/JabRef/jabref/issues/4670) [#4671](https://github.com/JabRef/jabref/issues/4671) [#4672](https://github.com/JabRef/jabref/issues/4672) [#4673](https://github.com/JabRef/jabref/issues/4673)
+- We added additional modifiers (capitalize, titlecase and sentencecase) to the Bibtex key generator. [#1506](https://github.com/JabRef/jabref/issues/1506)
+- We grouped the toolbar icons and changed the Open Library and Copy icons. [#4584](https://github.com/JabRef/jabref/issues/4584) 
 
 
 ### Fixed
@@ -110,6 +111,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
   - Set/clear/append/rename fields: available through Edit menu
   - Manage keywords: available through Edit menu
   - Copy linked files to folder: available through File menu
+  - Add/move/remove from group: removed completely (functionality still available through group interface)
 - We removed the option to change the column widths in the preferences dialog. [#4546](https://github.com/JabRef/jabref/issues/4546)
 
 

build.gradle

@@ -134,7 +134,7 @@ dependencies {
     compile 'de.saxsys:mvvmfx:1.7.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
-    compile 'org.fxmisc.richtext:richtextfx:0.9.2'
+    compile 'org.fxmisc.richtext:richtextfx:0.9.3'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
     compile 'com.jfoenix:jfoenix:8.0.8'
@@ -167,7 +167,7 @@ dependencies {
 
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.2'
-    testCompile 'org.mockito:mockito-core:2.24.5'
+    testCompile 'org.mockito:mockito-core:2.25.0'
     testCompile 'com.github.tomakehurst:wiremock:2.21.0'
     testCompile 'org.assertj:assertj-swing-junit:3.9.2'
     testCompile 'org.reflections:reflections:0.9.11'

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

@@ -818,14 +818,14 @@
 
 .separator:horizontal .line {
     -fx-border-color: -jr-separator;
-    -fx-border-width: 0;
-    -fx-border-insets: 1 0 0 0;
+    -fx-border-width: 0.3;
+    -fx-border-insets: 1 15 0 20;
 }
 
 .separator:vertical .line {
     -fx-border-color: -jr-separator;
     -fx-border-width: 1;
-    -fx-border-insets: 0 0 0 1;
+    -fx-border-insets: 5 15 5 15;
 }
 
 .mainToolbar {

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

@@ -52,7 +52,6 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.filelist.FileListEntry;
 import org.jabref.gui.filelist.FileListTableModel;
-import org.jabref.gui.groups.GroupAddRemoveDialog;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.importer.actions.AppendDatabaseAction;
 import org.jabref.gui.journals.AbbreviateAction;
@@ -405,10 +404,6 @@ private void setupActions() {
         actions.put(Actions.ABBREVIATE_MEDLINE, new AbbreviateAction(this, false));
         actions.put(Actions.UNABBREVIATE, new UnabbreviateAction(this));
 
-        actions.put(Actions.ADD_TO_GROUP, new GroupAddRemoveDialog(this, true, false));
-        actions.put(Actions.REMOVE_FROM_GROUP, new GroupAddRemoveDialog(this, false, false));
-        actions.put(Actions.MOVE_TO_GROUP, new GroupAddRemoveDialog(this, true, true));
-
         actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this)::execute);
     }
 
@@ -418,7 +413,8 @@ private void setupActions() {
      * @param outputFormat the desired {@link CitationStyleOutputFormat}
      */
     private void copyCitationToClipboard(CitationStyleOutputFormat outputFormat) {
-        new CitationStyleToClipboardWorker(this, outputFormat).execute();
+        CitationStyleToClipboardWorker worker = new CitationStyleToClipboardWorker(this, outputFormat, dialogService, Globals.clipboardManager, Globals.prefs.getPreviewPreferences());
+        worker.copyCitationStyleToClipboard(Globals.TASK_EXECUTOR);
     }
 
     /**
@@ -964,7 +960,7 @@ public void entryEditorClosing(EntryEditor editor) {
      */
     public void ensureNotShowingBottomPanel(BibEntry entry) {
         if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))
-        || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
+            || ((mode == BasePanelMode.SHOWING_PREVIEW) && (preview.getEntry() == entry))) {
             closeBottomPane();
         }
     }
@@ -1394,8 +1390,8 @@ public void action() {
 
                     Optional<LinkedFile> linkedFile = files.stream()
                                                            .filter(file -> (FieldName.URL.equalsIgnoreCase(file.getFileType())
-                                                           || FieldName.PS.equalsIgnoreCase(file.getFileType())
-                                                           || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
+                                                                            || FieldName.PS.equalsIgnoreCase(file.getFileType())
+                                                                            || FieldName.PDF.equalsIgnoreCase(file.getFileType())))
                                                            .findFirst();
 
                     if (linkedFile.isPresent()) {

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

@@ -6,6 +6,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
@@ -38,6 +39,8 @@ private static Object createDependency(Class<?> clazz) {
             return Globals.stateManager;
         } else if (clazz == FileUpdateMonitor.class) {
             return Globals.getFileUpdateMonitor();
+        } else if (clazz == ProtectedTermsLoader.class) {
+            return Globals.protectedTermsLoader;
         } else if (clazz == ClipBoardManager.class) {
             return Globals.clipboardManager;
         } else {