Skip to content

fix: Inconsistencies in the add button #13786

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
Siedlerchr merged 6 commits into from
Sep 2, 2025
Merged

fix: Inconsistencies in the add button #13786

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ad372c
fix: Inconsistencies in the add button
Yubo-Cao Aug 29, 2025
01eb895
docs: Update CHANGELOG.md
Yubo-Cao Aug 30, 2025
5286ebc
Merge branch 'main' into fix/add-buttons
Yubo-Cao Aug 30, 2025
d2cea1b
docs: Update CHANGELOG.md
Yubo-Cao Aug 30, 2025
8b96e6b
fix: A typo
Yubo-Cao Sep 1, 2025
b281e47
Merge branch 'main' into fix/add-buttons
Yubo-Cao Sep 2, 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 improved consistency in the Add Buttons
Copy link
Member

@Siedlerchr Siedlerchr Aug 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just add the PR as a number/link here as well


### Removed

Expand Down
1 change: 0 additions & 1 deletion jabgui/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import jakarta.inject.Inject;

public class SaveOrderConfigPanel extends VBox {

@FXML private RadioButton exportInSpecifiedOrder;
@FXML private RadioButton exportInTableOrder;
@FXML private RadioButton exportInOriginalOrder;
Expand Down
4 changes: 4 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 @@ -2669,6 +2669,10 @@ journalInfo .grid-cell-b {
-fx-border-color: transparent;
}

.add-certificate {
-fx-pref-width: 17em;
-fx-min-width: 17em;
}

/* Quick Settings */
.quick-settings-container,
Expand Down
4 changes: 2 additions & 2 deletions jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<?import javafx.scene.layout.VBox?>
<?import org.jabref.gui.icon.JabRefIconView?>
<fx:root spacing="10.0" type="VBox"
xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel">
xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel">
<CheckBox fx:id="cleanupsEnabled" text="%Enable field formatters"/>
<HBox spacing="4.0">
<VBox spacing="4.0" HBox.hgrow="ALWAYS">
Expand Down
22 changes: 12 additions & 10 deletions jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.HBox?>
<?import org.jabref.gui.icon.JabRefIconView?>
<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
Expand All @@ -23,7 +24,7 @@
<RadioButton fx:id="exportInSpecifiedOrder"
text="%Use specified order" toggleGroup="$saveOrderToggleGroup"/>

<GridPane fx:id="sortCriterionList" hgap="10.0" vgap="4.0" maxWidth="450.0"
<GridPane fx:id="sortCriterionList" hgap="10.0" vgap="4.0"
disable="${!exportInSpecifiedOrder.selected}">
<columnConstraints>
<ColumnConstraints hgrow="NEVER" minWidth="40.0" maxWidth="40.0"/>
Expand All @@ -35,13 +36,14 @@
<Insets left="30.0"/>
</padding>
</GridPane>
<Button fx:id="addButton" onAction="#addCriterion" styleClass="icon-button" disable="${!exportInSpecifiedOrder.selected}"
maxWidth="450.0" prefWidth="450.0">
<graphic>
<JabRefIconView glyph="ADD_NOBOX"/>
</graphic>
<tooltip>
<Tooltip text="Add"/>
</tooltip>
</Button>
<HBox alignment="BASELINE_RIGHT" disable="${!exportInSpecifiedOrder.selected}">
<Button fx:id="addButton" onAction="#addCriterion" text="%Add">
<graphic>
<JabRefIconView glyph="ADD_NOBOX"/>
</graphic>
<tooltip>
<Tooltip text="Add"/>
</tooltip>
</Button>
</HBox>
</fx:root>
68 changes: 32 additions & 36 deletions ...ui/src/main/resources/org/jabref/gui/libraryproperties/constants/ConstantsProperties.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,38 @@
<?import javafx.scene.layout.VBox?>
<?import org.jabref.gui.icon.JabRefIconView?>
<fx:root spacing="10.0" type="VBox"
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/ja\vafx" xmlns:fx="http://javafx.com/fxml"
Copy link
Member

@calixtus calixtus Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accident?

Copy link
Collaborator Author

@Yubo-Cao Yubo-Cao Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed :)

fx:controller="org.jabref.gui.libraryproperties.constants.ConstantsPropertiesView">
<Label styleClass="sectionHeader" text="%String constants"/>
<HBox spacing="4.0" VBox.vgrow="ALWAYS">
<VBox spacing="4.0" HBox.hgrow="ALWAYS">
<TableView fx:id="stringsList" VBox.vgrow="ALWAYS">
<columns>
<TableColumn fx:id="labelColumn" minWidth="75.0" text="%Label"/>
<TableColumn fx:id="contentColumn" minWidth="75.0" text="%Content"/>
<TableColumn fx:id="actionsColumn" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"
editable="false" resizable="false" reorderable="false"/>
</columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView>
</VBox>
<VBox>
<Button styleClass="icon-button,narrow" onAction="#openHelp">
<graphic>
<JabRefIconView glyph="HELP"/>
</graphic>
<tooltip>
<Tooltip text="%Open Help page"/>
</tooltip>
</Button>
<VBox VBox.vgrow="ALWAYS"/>
<Button styleClass="icon-button,narrow" fx:id="addStringButton" minWidth="-Infinity"
onAction="#addString">
<graphic>
<JabRefIconView glyph="ADD_NOBOX"/>
</graphic>
<tooltip>
<Tooltip text="%Add new String"/>
</tooltip>
</Button>
</VBox>
<HBox alignment="BOTTOM_LEFT" spacing="8.0">
<Label styleClass="sectionHeader" text="%String constants"/>
<Button onAction="#openHelp" styleClass="icon-button,narrow">
<graphic>
<JabRefIconView glyph="HELP"/>
</graphic>
<tooltip>
<Tooltip text="%Open Help page"/>
</tooltip>
</Button>
</HBox>
<TableView fx:id="stringsList" VBox.vgrow="ALWAYS">
<columns>
<TableColumn fx:id="labelColumn" minWidth="75.0" text="%Label"/>
<TableColumn fx:id="contentColumn" minWidth="75.0" text="%Content"/>
<TableColumn fx:id="actionsColumn" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"
editable="false" resizable="false" reorderable="false"/>
</columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView>
<HBox alignment="BASELINE_RIGHT" spacing="4.0">
<Button fx:id="addStringButton" text="%Add" onAction="#addString">
<graphic>
<JabRefIconView glyph="ADD_NOBOX"/>
</graphic>
<tooltip>
<Tooltip text="%Add new String"/>
</tooltip>
</Button>
</HBox>
</fx:root>
6 changes: 2 additions & 4 deletions .../src/main/resources/org/jabref/gui/libraryproperties/keypattern/KeyPatternProperties.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import org.jabref.gui.commonfxcontrols.CitationKeyPatternsPanel?>
<fx:root spacing="10.0" type="VBox"
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
fx:controller="org.jabref.gui.libraryproperties.keypattern.KeyPatternPropertiesView">
<HBox>
<HBox alignment="BOTTOM_LEFT" spacing="8.0">
<Label styleClass="sectionHeader" text="%Key patterns"/>
<Region HBox.hgrow="ALWAYS"/>
<Button fx:id="keyPatternHelp" prefWidth="20.0"/>
<Button fx:id="keyPatternHelp" styleClass="icon-button,narrow" />
</HBox>
<Label text="%( Note: Press return to commit changes in the table! )"/>
<AnchorPane VBox.vgrow="ALWAYS">
Expand Down
8 changes: 6 additions & 2 deletions jabgui/src/main/resources/org/jabref/gui/libraryproperties/saving/SavingProperties.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.VBox?>
Expand All @@ -13,8 +14,11 @@
text="%Refuse to save the library before external changes have been reviewed."/>

<Label styleClass="sectionHeader" text="%Save sort order"/>
<SaveOrderConfigPanel fx:id="saveOrderConfigPanel"/>
<SaveOrderConfigPanel fx:id="saveOrderConfigPanel" />

<Label styleClass="sectionHeader" text="%Save actions"/>
<FieldFormatterCleanupsPanel fx:id="fieldFormatterCleanupsPanel"/>
<FieldFormatterCleanupsPanel fx:id="fieldFormatterCleanupsPanel" />
<padding>
<Insets bottom="12.0" />
</padding>
</fx:root>
5 changes: 3 additions & 2 deletions jabgui/src/main/resources/org/jabref/gui/preferences/network/NetworkTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@
<Button fx:id="addCertificate"
mnemonicParsing="false"
onAction="#addCertificateFile"
text="%Add certificate"
styleClass="add-certificate"
text="%Browse for certificate..."
GridPane.columnIndex="2"
GridPane.halignment="RIGHT"
GridPane.rowIndex="1"
Expand All @@ -146,7 +147,7 @@
<Insets right="16.0"/>
</GridPane.margin>
<graphic>
<JabRefIconView glyph="OPEN_LIST"/>
<JabRefIconView glyph="ADD_NOBOX"/>
</graphic>
</Button>
</GridPane>
Expand Down
2 changes: 1 addition & 1 deletion jablib/src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2564,7 +2564,7 @@ Symmetric\ word\ by\ word=Symmetric word by word
Verbatim=Verbatim
Word\ by\ word=Word by word

Add\ certificate=Add certificate
Browse\ for\ certificate...=Browse for certificate...
Serial\ number=Serial number
Issuer=Issuer
Valid\ from=Valid from
Expand Down