Implement better scaling of main table showing entries

CHANGELOG.md

@@ -174,6 +174,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Changed
 
+- We changed the resize behavior of table columns to have smart fit into the table if there is enough space. [#967](https://github.com/JabRef/jabref/issues/967)
 - The export to MS Office XML now exports the author field as `Inventor` if the bibtex entry type is `patent` [#7830](https://github.com/JabRef/jabref/issues/7830)
 - We changed the EndNote importer to import the field `label` to the corresponding bibtex field `endnote-label` [forum#2734](https://discourse.jabref.org/t/importing-endnote-label-field-to-jabref-from-xml-file/2734)
 - The keywords added via "Manage content selectors" are now displayed in alphabetical order. [#3791](https://github.com/JabRef/jabref/issues/3791)
@@ -303,6 +304,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We changed the way JabRef displays the title of a tab and of the window. [4161](https://github.com/JabRef/jabref/issues/4161)
 - We changed connect timeouts for server requests to 30 seconds in general and 5 seconds for GROBID server (special) and improved user notifications on connection issues. [7026](https://github.com/JabRef/jabref/pull/7026)
 - We changed the order of the library tab context menu items. [#7171](https://github.com/JabRef/jabref/issues/7171)
+- We renamed "Show extra columns" to "Show dedicated file columns". [#7181](https://github.com/JabRef/jabref/pull/7181)
 - We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined  packages. [7037](https://github.com/JabRef/jabref/pull/7037)
 - We refined the entry preview to show the full names of authors and editors, to list the editor only if no author is present, have the year earlier. [#7083](https://github.com/JabRef/jabref/issues/7083)
 

src/main/java/org/jabref/gui/maintable/ColumnPreferences.java

@@ -4,15 +4,20 @@
 
 public class ColumnPreferences {
 
+    public static final double DEFAULT_COLUMN_MIN_WIDTH = 80;
     public static final double DEFAULT_COLUMN_WIDTH = 100;
     public static final double ICON_COLUMN_WIDTH = 16 + 12; // add some additional space to improve appearance
 
     private final List<MainTableColumnModel> columns;
+
     private final List<MainTableColumnModel> columnSortOrder;
 
-    public ColumnPreferences(List<MainTableColumnModel> columns, List<MainTableColumnModel> columnSortOrder) {
+    private final boolean dedicatedFileColumnsEnabled;
+
+    public ColumnPreferences(List<MainTableColumnModel> columns, List<MainTableColumnModel> columnSortOrder, boolean dedicatedFileColumnsEnabled) {
         this.columns = columns;
         this.columnSortOrder = columnSortOrder;
+        this.dedicatedFileColumnsEnabled = dedicatedFileColumnsEnabled;
     }
 
     public List<MainTableColumnModel> getColumns() {
@@ -22,4 +27,9 @@ public List<MainTableColumnModel> getColumns() {
     public List<MainTableColumnModel> getColumnSortOrder() {
         return columnSortOrder;
     }
+
+    public boolean isDedicatedFileColumnsEnabled() {
+        return dedicatedFileColumnsEnabled;
+    }
+
 }

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -83,7 +83,7 @@ public MainTable(MainTableDataModel model,
         this.database = Objects.requireNonNull(database);
         this.model = model;
         UndoManager undoManager = libraryTab.getUndoManager();
-        MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
+        ColumnPreferences columnPreferences = preferencesService.getColumnPreferences();
 
         importHandler = new ImportHandler(
                 database, externalFileTypes,
@@ -141,17 +141,14 @@ public MainTable(MainTableDataModel model,
             }
         }
         */
-
-        mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
+        columnPreferences.getColumnSortOrder().forEach(columnModel ->
                 this.getColumns().stream()
                     .map(column -> (MainTableColumn<?>) column)
                     .filter(column -> column.getModel().equals(columnModel))
                     .findFirst()
                     .ifPresent(column -> this.getSortOrder().add(column)));
 
-        if (mainTablePreferences.getResizeColumnsToFit()) {
-            this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
-        }
+        this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
 
         this.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
@@ -344,7 +341,7 @@ private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntry
 
         List<BibEntry> entries = getSelectionModel().getSelectedItems().stream().map(BibEntryTableViewModel::getEntry).collect(Collectors.toList());
 
-        // The following is necesary to initiate the drag and drop in javafx, although we don't need the contents
+        // The following is necessary to initiate the drag and drop in javafx, although we don't need the contents
         // It doesn't work without
         ClipboardContent content = new ClipboardContent();
         Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);

src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java

@@ -37,7 +37,9 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.SpecialField;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
@@ -80,7 +82,6 @@ public MainTableColumnFactory(BibDatabaseContext database,
         List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
 
         columnPreferences.getColumns().forEach(column -> {
-
             switch (column.getType()) {
                 case INDEX:
                     columns.add(createIndexColumn(column));
@@ -113,7 +114,19 @@ public MainTableColumnFactory(BibDatabaseContext database,
                 default:
                 case NORMALFIELD:
                     if (!column.getQualifier().isBlank()) {
-                        columns.add(createFieldColumn(column));
+                        TableColumn<BibEntryTableViewModel, ?> fieldColumn = createFieldColumn(column);
+                        columns.add(fieldColumn);
+                        fieldColumn.setPrefWidth(ColumnPreferences.DEFAULT_COLUMN_WIDTH);
+                        if (column.getQualifier().equalsIgnoreCase(StandardField.YEAR.getName())) {
+                            // 60 is chosen, because of the optimal width of a four digit number
+                            fieldColumn.setPrefWidth(60);
+                        } else if (column.getQualifier().equalsIgnoreCase(InternalField.TYPE_HEADER.getName())) {
+                            // 90 is chosen, because of the optimal width of the entry type
+                            fieldColumn.setPrefWidth(90);
+                        } else {
+                            fieldColumn.setMinWidth(ColumnPreferences.DEFAULT_COLUMN_MIN_WIDTH);
+                            fieldColumn.setPrefWidth(ColumnPreferences.DEFAULT_COLUMN_WIDTH);
+                        }
                     }
                     break;
             }
@@ -129,7 +142,7 @@ public static void setExactWidth(TableColumn<?, ?> column, double width) {
     }
 
     /**
-     * Creates a column with a continous number
+     * Creates a column with a continuous number
      */
     private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableColumnModel columnModel) {
         TableColumn<BibEntryTableViewModel, String> column = new MainTableColumn<>(columnModel);

src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java

@@ -124,6 +124,9 @@ public Type getType() {
         return typeProperty.getValue();
     }
 
+    /**
+     * Returns the field name of the column (e.g., year)
+     */
     public String getQualifier() {
         return qualifierProperty.getValue();
     }

src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java

@@ -38,18 +38,20 @@ private void updateColumns() {
                 mainTable.getColumns().stream()
                          .map(column -> ((MainTableColumn<?>) column).getModel())
                          .collect(Collectors.toList()),
-                preferences.getColumnPreferences().getColumnSortOrder()));
+                preferences.getColumnPreferences().getColumnSortOrder(),
+                preferences.getColumnPreferences().isDedicatedFileColumnsEnabled()));
     }
 
     /**
-     * Stores the SortOrder of the the Table in the preferences. Cannot be combined with updateColumns, because JavaFX
+     * Stores the SortOrder of the Table in the preferences. Cannot be combined with updateColumns, because JavaFX
      * would provide just an empty list for the sort order on other changes.
      */
     private void updateSortOrder() {
         preferences.storeColumnPreferences(new ColumnPreferences(
-                preferences.getColumnPreferences().getColumns(),
-                mainTable.getSortOrder().stream()
-                         .map(column -> ((MainTableColumn<?>) column).getModel())
-                         .collect(Collectors.toList())));
+                        preferences.getColumnPreferences().getColumns(),
+                        mainTable.getSortOrder().stream()
+                                 .map(column -> ((MainTableColumn<?>) column).getModel())
+                                 .collect(Collectors.toList()),
+                preferences.getColumnPreferences().isDedicatedFileColumnsEnabled()));
     }
 }