Reintroducing master table index column (#5844)

* Added master table index column * Added master table index column * l10n
JabRef · Jan 21, 2020 · f4847b1 · f4847b1
1 parent 3656bf7
commit f4847b1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 ### Changed
 
+- We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
+
 ### Fixed
 
 - We fixed an issue where the Medline fetcher was only working when JabRef was running from source. [#5645](https://github.com/JabRef/jabref/issues/5645)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -10,6 +10,7 @@
 
 import javax.swing.undo.UndoManager;
 
+import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -22,6 +23,7 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Text;
 
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
@@ -82,6 +84,9 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
         preferences.getColumns().forEach(column -> {
 
             switch (column.getType()) {
+                case INDEX:
+                    columns.add(createIndexColumn(column));
+                    break;
                 case GROUPS:
                     columns.add(createGroupColumn(column));
                     break;
@@ -125,6 +130,24 @@ private void setExactWidth(TableColumn<?, ?> column, double width) {
         column.setMaxWidth(width);
     }
 
+    /**
+     * Creates a text column to display any standard field.
+     */
+    private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableColumnModel columnModel) {
+        TableColumn<BibEntryTableViewModel, String> column = new MainTableColumn<>(columnModel);
+        Node header = new Text("#");
+        Tooltip.install(header, new Tooltip(MainTableColumnModel.Type.INDEX.getDisplayName()));
+        column.setGraphic(header);
+        column.setStyle("-fx-alignment: CENTER-RIGHT;");
+        column.setCellValueFactory(cellData -> new ReadOnlyObjectWrapper<>(
+                String.valueOf(cellData.getTableView().getItems().indexOf(cellData.getValue()) + 1)));
+        new ValueTableCellFactory<BibEntryTableViewModel, String>()
+                .withText(text -> text)
+                .install(column);
+        column.setSortable(false);
+        return column;
+    }
+
     /**
      * Creates a column for group color bars.
      */

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -30,6 +30,7 @@ public class MainTableColumnModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnModel.class);
 
     public enum Type {
+        INDEX("index", Localization.lang("Index")),
         EXTRAFILE("extrafile", Localization.lang("File type")),
         FILES("files", Localization.lang("Linked files")),
         GROUPS("groups", Localization.lang("Groups")),
@@ -132,7 +133,8 @@ public String getName() {
     }
 
     public String getDisplayName() {
-        if (Type.ICON_COLUMNS.contains(typeProperty.getValue()) && qualifierProperty.getValue().isBlank()) {
+        if ((Type.ICON_COLUMNS.contains(typeProperty.getValue()) && qualifierProperty.getValue().isBlank())
+                || typeProperty.getValue() == Type.INDEX) {
             return typeProperty.getValue().getDisplayName();
         } else {
             return FieldsUtil.getNameWithType(FieldFactory.parseField(qualifierProperty.getValue()));

diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
@@ -115,6 +115,7 @@ public void setValues() {
         availableColumnsProperty.clear();
 
         availableColumnsProperty.addAll(
+                new MainTableColumnModel(MainTableColumnModel.Type.INDEX),
                 new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER),
                 new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
                 new MainTableColumnModel(MainTableColumnModel.Type.FILES),

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -2101,3 +2101,5 @@ Mark\ all\ changes\ as\ accepted=Mark all changes as accepted
 Unmark\ all\ changes=Unmark all changes
 Normalize\ newline\ characters=Normalize newline characters
 Normalizes\ all\ newline\ characters\ in\ the\ field\ content.=Normalizes all newline characters in the field content.
+
+Index=Index