Add group coloring in maintable as replacement for marked entries (#3769

) * Prototype * Make transparent * Remove everything related to marked entries * Display proper group membership for entry * Add migration from markings to groups
JabRef · Mar 5, 2018 · 9c6bd69 · 9c6bd69
1 parent fd98056
commit 9c6bd69
Show file tree

Hide file tree

Showing 30 changed files with 269 additions and 532 deletions.
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
@@ -558,47 +558,6 @@ public void update() {
                 (BaseAction) () -> JabRefExecutorService.INSTANCE.execute(new DuplicateSearch(BasePanel.this)));
         */
 
-        // TODO
-        //actions.put(Actions.MARK_ENTRIES, new MarkEntriesAction(frame, 0));
-
-        actions.put(Actions.UNMARK_ENTRIES, (BaseAction) () -> {
-            try {
-                List<BibEntry> bes = mainTable.getSelectedEntries();
-                if (bes.isEmpty()) {
-                    output(Localization.lang("This operation requires one or more entries to be selected."));
-                    return;
-                }
-                NamedCompound ce = new NamedCompound(Localization.lang("Unmark entries"));
-                for (BibEntry be : bes) {
-                    EntryMarker.unmarkEntry(be, false, bibDatabaseContext.getDatabase(), ce);
-                }
-                ce.end();
-                getUndoManager().addEdit(ce);
-                markBaseChanged();
-                String outputStr;
-                if (bes.size() == 1) {
-                    outputStr = Localization.lang("Unmarked selected entry");
-                } else {
-                    outputStr = Localization.lang("Unmarked all %0 selected entries", Integer.toString(bes.size()));
-                }
-                output(outputStr);
-            } catch (Throwable ex) {
-                LOGGER.warn("Could not unmark", ex);
-            }
-        });
-
-        actions.put(Actions.UNMARK_ALL, (BaseAction) () -> {
-            NamedCompound ce = new NamedCompound(Localization.lang("Unmark all"));
-
-            for (BibEntry be : bibDatabaseContext.getDatabase().getEntries()) {
-                EntryMarker.unmarkEntry(be, false, bibDatabaseContext.getDatabase(), ce);
-            }
-            ce.end();
-            getUndoManager().addEdit(ce);
-            markBaseChanged();
-            output(Localization.lang("Unmarked all entries"));
-        });
-
         // Note that we can't put the number of entries that have been reverted into the undoText as the concrete number cannot be injected
         actions.put(new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
                 new SpecialFieldViewModel(SpecialField.RELEVANCE, undoManager).getSpecialFieldAction(

diff --git a/src/main/java/org/jabref/gui/EntryMarker.java b/src/main/java/org/jabref/gui/EntryMarker.java
diff --git a/src/main/java/org/jabref/gui/IconTheme.java b/src/main/java/org/jabref/gui/IconTheme.java
@@ -207,9 +207,7 @@ public enum JabRefIcons implements JabRefIcon {
         COMMENT(MaterialDesignIcon.COMMENT),
         REDO(MaterialDesignIcon.REDO),
         UNDO(MaterialDesignIcon.UNDO),
-        MARK_ENTRIES(MaterialDesignIcon.BOOKMARK),
         MARKER(MaterialDesignIcon.MARKER),
-        UNMARK_ENTRIES(MaterialDesignIcon.BOOKMARK_OUTLINE),
         REFRESH(MaterialDesignIcon.REFRESH),
         DELETE_ENTRY(MaterialDesignIcon.DELETE),
         SEARCH(MaterialDesignIcon.MAGNIFY),
@@ -296,12 +294,11 @@ public enum JabRefIcons implements JabRefIcon {
         BLOG(MaterialDesignIcon.RSS), /* css: rss */
         GLOBAL_SEARCH(MaterialDesignIcon.EARTH), /* css: earth */
         DATE_PICKER(MaterialDesignIcon.CALENDAR), /* css: calendar */
-        DEFAULT_GROUP_ICON(MaterialDesignIcon.LABEL_OUTLINE), /* css: label-outline */
+        DEFAULT_GROUP_ICON_COLORED(MaterialDesignIcon.CHECKBOX_BLANK_CIRCLE),
+        DEFAULT_GROUP_ICON(MaterialDesignIcon.LABEL_OUTLINE),
         ALL_ENTRIES_GROUP_ICON(DefaultGroupsFactory.ALL_ENTRIES_GROUP_DEFAULT_ICON),
         IMPORT_EXPORT(MaterialDesignIcon.SWAP_VERTICAL),
-        CLOSE_JABREF(MaterialDesignIcon.GLASSDOOR),
-        // STILL MISSING:
-        GROUP_REGULAR(Color.RED, MaterialDesignIcon.SYNC);
+        CLOSE_JABREF(MaterialDesignIcon.GLASSDOOR);
 
         private final JabRefIcon icon;
 
@@ -337,6 +334,11 @@ public JabRefIcon disabled() {
             return icon.disabled();
         }
 
+        @Override
+        public JabRefIcon withColor(javafx.scene.paint.Color color) {
+            return icon.withColor(color);
+        }
+
         private class InternalFileIcon implements JabRefIcon {
 
             private final ImageIcon imageIcon;
@@ -364,6 +366,11 @@ public Node getGraphicNode() {
             public JabRefIcon disabled() {
                 throw new NotImplementedException("Cannot create disabled version of a file-based icon");
             }
+
+            @Override
+            public JabRefIcon withColor(javafx.scene.paint.Color color) {
+                throw new NotImplementedException("Cannot create colored version of a file-based icon");
+            }
         }
 
         public Button asButton() {

diff --git a/src/main/java/org/jabref/gui/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/InternalMaterialDesignIcon.java
@@ -71,6 +71,11 @@ public JabRefIcon disabled() {
         return new InternalMaterialDesignIcon(ColorUtil.toFX(IconTheme.DEFAULT_DISABLED_COLOR), icons);
     }
 
+    @Override
+    public JabRefIcon withColor(Color color) {
+        return new InternalMaterialDesignIcon(color, icons);
+    }
+
     public String getCode() {
         return this.unicode;
     }

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -169,13 +169,6 @@ public class JabRefFrame extends BorderPane implements OutputPrinter {
     // Note: GeneralAction's constructor automatically gets translations
     // for the name and message strings.
 
-    private final AbstractAction mark = new GeneralAction(Actions.MARK_ENTRIES, Localization.menuTitle("Mark entries"),
-            Localization.lang("Mark entries"), Globals.getKeyPrefs().getKey(KeyBinding.MARK_ENTRIES), IconTheme.JabRefIcons.MARK_ENTRIES.getIcon());
-    private final JMenu markSpecific = JabRefFrame.subMenu(Localization.menuTitle("Mark specific color"));
-    private final AbstractAction unmark = new GeneralAction(Actions.UNMARK_ENTRIES,
-            Localization.menuTitle("Unmark entries"), Localization.lang("Unmark entries"),
-            Globals.getKeyPrefs().getKey(KeyBinding.UNMARK_ENTRIES), IconTheme.JabRefIcons.UNMARK_ENTRIES.getIcon());
-    private final AbstractAction unmarkAll = new GeneralAction(Actions.UNMARK_ALL, Localization.menuTitle("Unmark all"));
     private final AbstractAction toggleRelevance = new GeneralAction(
             new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getCommand(),
             new SpecialFieldValueViewModel(SpecialField.RELEVANCE.getValues().get(0)).getMenuString(),
@@ -852,16 +845,7 @@ private MenuBar createMenu() {
                 new SeparatorMenuItem()
 
         );
-        /*
-        edit.add(mark);
-        for (int i = 0; i < EntryMarker.MAX_MARKING_LEVEL; i++) {
-            markSpecific.add(new MarkEntriesAction(this, i).getMenuItem());
-        }
-        edit.add(markSpecific);
-        edit.add(unmark);
-        edit.add(unmarkAll);
-        edit.addSeparator();
-        */
+
         /* TODO
         if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
             boolean menuitem = false;

diff --git a/src/main/java/org/jabref/gui/JabRefIcon.java b/src/main/java/org/jabref/gui/JabRefIcon.java
@@ -3,6 +3,7 @@
 import javax.swing.Icon;
 
 import javafx.scene.Node;
+import javafx.scene.paint.Color;
 
 public interface JabRefIcon {
     Icon getIcon();
@@ -12,4 +13,6 @@ public interface JabRefIcon {
     Node getGraphicNode();
 
     JabRefIcon disabled();
+
+    JabRefIcon withColor(Color color);
 }
diff --git a/src/main/java/org/jabref/gui/actions/Actions.java b/src/main/java/org/jabref/gui/actions/Actions.java
@@ -31,7 +31,6 @@ public enum Actions {
     EXPORT_TO_CLIPBOARD,
     MAKE_KEY,
     MANAGE_SELECTORS,
-    MARK_ENTRIES,
     MERGE_DATABASE,
     MERGE_ENTRIES,
     MERGE_WITH_FETCHED_ENTRY,
@@ -59,8 +58,6 @@ public enum Actions {
     TOGGLE_PREVIEW,
     UNABBREVIATE,
     UNDO,
-    UNMARK_ALL,
-    UNMARK_ENTRIES,
     WRITE_XMP,
     PRINT_PREVIEW,
     togglePrinted,

diff --git a/src/main/java/org/jabref/gui/groups/GroupMatcher.java b/src/main/java/org/jabref/gui/groups/GroupMatcher.java