Skip to content

Remove unnecessary spacing and margin in the AutomaticFieldEditor #13792

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

Merged
calixtus merged 4 commits into from
Sep 1, 2025
Merged

Remove unnecessary spacing and margin in the AutomaticFieldEditor #13792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a0027c
fix: Update the UI for the automatic field editor
Yubo-Cao Aug 31, 2025
4fcc8bc
docs: Update CHANGELOG.md
Yubo-Cao Aug 31, 2025
d8b8892
docs: Update CHANGELOG.md
Yubo-Cao Aug 31, 2025
5aaba64
fix: Get the keep changes button to properly show
Yubo-Cao Aug 31, 2025
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
- We fixed an issue where "Copy to" was enabled even if no other library was opened. [#13280](https://github.com/JabRef/jabref/pull/13280)
- We fixed an issue where the groups were still displayed after closing all libraries. [#13382](https://github.com/JabRef/jabref/issues/13382)
- Enhanced field selection logic in the Merge Entries dialog when fetching from DOI to prefer valid years and entry types. [#12549](https://github.com/JabRef/jabref/issues/12549)
- We removed unnecessary spacing and margin in the AutomaticFieldEditor. [#13792](https://github.com/JabRef/jabref/pull/13792)

### Removed

Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jabref.gui.edit.automaticfiededitor;

import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.VBox;

public abstract class AbstractAutomaticFieldEditorTabView extends AnchorPane implements AutomaticFieldEditorTab {
public abstract class AbstractAutomaticFieldEditorTabView extends VBox implements AutomaticFieldEditorTab {

@Override
public AnchorPane getContent() {
public VBox getContent() {
return this;
}
}
8 changes: 1 addition & 7 deletions jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,11 @@ public AutomaticFieldEditorDialog(StateManager stateManager, UndoManager undoMan
}
return "";
});

// This will prevent all dialog buttons from having the same size
// Read more: https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
getDialogPane().getButtonTypes().stream()
.map(getDialogPane()::lookupButton)
.forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
}

@FXML
public void initialize() {
viewModel = new AutomaticFieldEditorViewModel(selectedEntries, database, undoManager, stateManager);
viewModel = new AutomaticFieldEditorViewModel(database, undoManager, stateManager);

for (AutomaticFieldEditorTab tabModel : viewModel.getFieldEditorTabs()) {
NotificationPaneAdapter notificationPane = new NotificationPaneAdapter(tabModel.getContent());
Expand Down
5 changes: 1 addition & 4 deletions .../src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.jabref.gui.edit.automaticfiededitor;

import java.util.List;

import javax.swing.undo.UndoManager;

import javafx.collections.FXCollections;
Expand All @@ -14,7 +12,6 @@
import org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldTabView;
import org.jabref.gui.undo.NamedCompound;
import org.jabref.model.database.BibDatabase;
import org.jabref.model.entry.BibEntry;

public class AutomaticFieldEditorViewModel extends AbstractViewModel {
public static final String NAMED_COMPOUND_EDITS = "EDIT_FIELDS";
Expand All @@ -23,7 +20,7 @@ public class AutomaticFieldEditorViewModel extends AbstractViewModel {

private final UndoManager undoManager;

public AutomaticFieldEditorViewModel(List<BibEntry> selectedEntries, BibDatabase database, UndoManager undoManager, StateManager stateManager) {
public AutomaticFieldEditorViewModel(BibDatabase database, UndoManager undoManager, StateManager stateManager) {
this.undoManager = undoManager;
fieldEditorTabs.addAll(
new EditFieldContentTabView(database, stateManager),
Expand Down
28 changes: 28 additions & 0 deletions jabgui/src/main/resources/org/jabref/gui/Base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3157,3 +3157,31 @@ journalInfo .grid-cell-b {
-fx-border-color: -jr-error;
-fx-border-width: 1px;
}

/* Automatic Field Editor */
.edit-field-content-pane {
-fx-padding: 0em 1em;
-fx-spacing: 1em;
}

.edit-field-content-pane .text-field {
-fx-padding: 0.5625em 0.75em;
}

.edit-field-content-pane .actions {
-fx-spacing: 0.75em;
-fx-alignment: BASELINE_LEFT;
}

.edit-field-content-pane .grid-pane {
-fx-hgap: 0.75em;
-fx-vgap: 0.75em;
}

.edit-field-content-pane .grid-pane .label {
-fx-min-width: 3.5em;
}

.automatic-field-editor .button-bar .button:default {
-fx-min-width: 12em;
}
4 changes: 2 additions & 2 deletions ...rc/main/resources/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<?import javafx.scene.control.TabPane?>
<DialogPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
fx:controller="org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorDialog"
prefHeight="400.0" prefWidth="600.0">
prefHeight="400.0" prefWidth="600.0" styleClass="automatic-field-editor">
<content>
<TabPane fx:id="tabPane" tabClosingPolicy="UNAVAILABLE"/>
</content>
<ButtonType fx:id="saveButton" text="%Keep Modifications" buttonData="OK_DONE"/>
<ButtonType text="%Keep Modifications" buttonData="OK_DONE" />
<ButtonType fx:constant="CANCEL"/>
</DialogPane>
78 changes: 28 additions & 50 deletions .../org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView">
<children>
<GridPane hgap="8.0" layoutX="16.0" layoutY="246.0" minHeight="160.0" prefHeight="230.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="8.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="379.20001220703125" minWidth="40.0" prefWidth="65.00001220703125" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="726.3999938964844" minWidth="10.0" prefWidth="324.1999877929687" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="726.3999938964844" minWidth="10.0" prefWidth="206.5999877929687" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="35.200015258789065" minHeight="10.0" prefHeight="20.800006103515624" vgrow="SOMETIMES" />
<RowConstraints maxHeight="33.000008010864256" minHeight="8.999984741210938" prefHeight="23.39999389648438" vgrow="SOMETIMES" />
<RowConstraints maxHeight="33.000008010864256" minHeight="10.0" prefHeight="26.60001220703125" vgrow="SOMETIMES" />
<RowConstraints maxHeight="35.99998168945312" minHeight="10.0" prefHeight="35.99998168945312" vgrow="SOMETIMES" />
<RowConstraints maxHeight="25.600012207031256" minHeight="10.0" prefHeight="23.20001831054688" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label prefHeight="19.0" prefWidth="48.0" text="%From" GridPane.rowIndex="2" />
<Label text="%To" GridPane.rowIndex="3" />
<ComboBox fx:id="fromFieldComboBox" editable="true" minWidth="-Infinity" prefHeight="32.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="NEVER" GridPane.rowIndex="2" GridPane.vgrow="NEVER" />
<ComboBox fx:id="toFieldComboBox" editable="true" minWidth="-Infinity" prefHeight="32.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<CheckBox fx:id="overwriteFieldContentCheckBox"
mnemonicParsing="false" prefHeight="19.0" prefWidth="210.0" text="%Overwrite field content" GridPane.columnSpan="2147483647" GridPane.rowIndex="4" />
<HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="8.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="5">
<children>
<Button fx:id="copyContentButton"
mnemonicParsing="false" onAction="#copyContent" text="%Copy content" />
<Button fx:id="moveContentButton"
mnemonicParsing="false" onAction="#moveContent" text="%Move content" />
<Button fx:id="swapContentButton"
mnemonicParsing="false" onAction="#swapContent" text="%Swap content" />
</children>
</HBox>
<HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnSpan="3" GridPane.rowSpan="2">
<children>
<Label alignment="BOTTOM_LEFT" minHeight="-Infinity" minWidth="-Infinity" styleClass="sectionHeader" text="%Copy or move the content of one field to another">
<HBox.margin>
<Insets bottom="10.0" />
</HBox.margin>
</Label>
</children>
<GridPane.margin>
<Insets />
</GridPane.margin>
</HBox>
</children>
</GridPane>
</children>
<?import javafx.scene.layout.VBox?>

<fx:root type="VBox" styleClass="edit-field-content-pane" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView">
<Label styleClass="sectionHeader" text="%Copy or move the content of one field to another"/>
<GridPane styleClass="grid-pane">
<columnConstraints>
<ColumnConstraints hgrow="NEVER"/>
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>
<rowConstraints>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>
<Label text="%From" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
<ComboBox fx:id="fromFieldComboBox" editable="true" maxWidth="Infinity" GridPane.columnIndex="1"
GridPane.rowIndex="0"/>
<Label text="%To" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
<ComboBox fx:id="toFieldComboBox" editable="true" maxWidth="Infinity" GridPane.columnIndex="1"
GridPane.rowIndex="1"/>
</GridPane>
<CheckBox fx:id="overwriteFieldContentCheckBox" mnemonicParsing="false" text="%Overwrite field content"/>
<HBox styleClass="actions">
<Button fx:id="copyContentButton" mnemonicParsing="false" onAction="#copyContent" text="%Copy content"/>
<Button fx:id="moveContentButton" mnemonicParsing="false" onAction="#moveContent" text="%Move content"/>
<Button fx:id="swapContentButton" mnemonicParsing="false" onAction="#swapContent" text="%Swap content"/>
</HBox>
</fx:root>
81 changes: 22 additions & 59 deletions ...sources/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>


<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import org.jabref.gui.icon.JabRefIconView?>
<fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentTabView">
<children>
<GridPane hgap="8.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<CheckBox fx:id="overwriteFieldContentCheckBox"
mnemonicParsing="false" text="%Overwrite field content" GridPane.columnSpan="2147483647" GridPane.rowIndex="3">
<GridPane.margin>
<Insets left="2.0" />
</GridPane.margin>
</CheckBox>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="8.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="4">
<children>
<Button fx:id="setValueButton" mnemonicParsing="false" onAction="#setFieldValue" text="%Set" />
<Button fx:id="appendValueButton" mnemonicParsing="false" onAction="#appendToFieldValue" text="%Append" />
<Separator maxHeight="1.7976931348623157E308" minWidth="10.0" orientation="VERTICAL" prefWidth="11.0" />
<Button fx:id="clearFieldButton" mnemonicParsing="false" onAction="#clearField" text="%Clear field content" >
<graphic>
<JabRefIconView glyph="DELETE_ENTRY"/>
</graphic>
</Button>
</children>
</HBox>
<HBox spacing="8.0" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
<children>
<ComboBox fx:id="fieldComboBox" editable="true" maxHeight="1.7976931348623157E308" minHeight="36.0" prefHeight="36.0" prefWidth="184.0" HBox.hgrow="ALWAYS" />
<TextField fx:id="fieldValueTextField" minHeight="32.0" minWidth="-Infinity" prefHeight="36.0" prefWidth="184.0" promptText="%Set or append content" HBox.hgrow="ALWAYS"/>
</children>
</HBox>
<HBox alignment="BOTTOM_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" GridPane.hgrow="ALWAYS" GridPane.rowSpan="2" GridPane.vgrow="ALWAYS">
<children>
<Label alignment="BOTTOM_LEFT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" styleClass="sectionHeader" text="%Edit field content for selected entries">
<HBox.margin>
<Insets bottom="10.0" />
</HBox.margin>
</Label>
</children>
</HBox>
</children>
</GridPane>
</children>
<fx:root type="VBox" styleClass="edit-field-content-pane" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentTabView">
<Label styleClass="sectionHeader" text="%Edit field content for selected entries"/>
<HBox styleClass="actions">
<ComboBox fx:id="fieldComboBox" editable="true" HBox.hgrow="ALWAYS"/>
<TextField fx:id="fieldValueTextField" promptText="%Set or append content" HBox.hgrow="ALWAYS"/>
</HBox>
<CheckBox fx:id="overwriteFieldContentCheckBox" mnemonicParsing="false" text="%Overwrite field content"/>
<HBox styleClass="actions">
<Button fx:id="setValueButton" mnemonicParsing="false" onAction="#setFieldValue" text="%Set"/>
<Button fx:id="appendValueButton" mnemonicParsing="false" onAction="#appendToFieldValue"
text="%Append"/>
<Separator orientation="VERTICAL"/>
<Button fx:id="clearFieldButton" mnemonicParsing="false" onAction="#clearField"
text="%Clear field content">
<graphic>
<JabRefIconView glyph="DELETE_ENTRY"/>
</graphic>
</Button>
</HBox>
</fx:root>
Loading