Skip to content
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

Jump to bottom

Change export to save #7518

Merged
merged 4 commits into from
Apr 5, 2021
Merged

Change export to save #7518

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
84ad057
fix: change save and export
yinpeiqi Apr 4, 2021
5ff0da0
fix: remove method changeExportDescriptionToSave
yinpeiqi Apr 5, 2021
74b30e5
fix: remove method changeExportDescriptionToSave
yinpeiqi Apr 5, 2021
6cdea31
fix: remove unused import
yinpeiqi Apr 5, 2021
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
6 changes: 3 additions & 3 deletions src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<ToggleGroup fx:id="saveOrderToggleGroup"/>
</fx:define>

<RadioButton fx:id="exportInOriginalOrder" text="%Export entries in their original order"
<RadioButton fx:id="exportInOriginalOrder" text="%Keep original order"
toggleGroup="$saveOrderToggleGroup"/>
<RadioButton fx:id="exportInTableOrder" text="%Export in current table sort order"
<RadioButton fx:id="exportInTableOrder" text="%Use current table sort order"
toggleGroup="$saveOrderToggleGroup"/>
<RadioButton fx:id="exportInSpecifiedOrder"
text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup"/>
text="%Use specified order" toggleGroup="$saveOrderToggleGroup"/>

<GridPane hgap="10.0" vgap="4.0">
<columnConstraints>
Expand Down
7 changes: 0 additions & 7 deletions 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 @@ -11,7 +11,6 @@

import org.jabref.gui.util.FieldsUtil;
import org.jabref.gui.util.ViewModelListCellFactory;
import org.jabref.logic.l10n.Localization;
import org.jabref.model.entry.field.Field;

import com.airhacks.afterburner.views.ViewLoader;
Expand Down Expand Up @@ -70,12 +69,6 @@ private void initialize() {
saveTerDesc.selectedProperty().bindBidirectional(viewModel.saveTertiaryDescPropertySelected());
}

public void changeExportDescriptionToSave() {
exportInOriginalOrder.setText(Localization.lang("Save entries in their original order"));
exportInSpecifiedOrder.setText(Localization.lang("Save entries ordered as specified"));
exportInTableOrder.setText(Localization.lang("Save in current table sort order"));
}

public BooleanProperty saveInOriginalProperty() {
return viewModel.saveInOriginalProperty();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<CheckBox fx:id="protect"
text="%Refuse to save the library before external changes have been reviewed."/>

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

<Label styleClass="sectionHeader" text="%Save actions"/>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ private void initialize() {
protect.disableProperty().bind(viewModel.protectDisableProperty());
protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());

saveOrderConfigPanel.changeExportDescriptionToSave();
saveOrderConfigPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
saveOrderConfigPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
saveOrderConfigPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
Expand Down
12 changes: 3 additions & 9 deletions src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,8 +736,6 @@ Save\ before\ closing=Save before closing
Save\ library=Save library
Save\ library\ as...=Save library as...

Save\ entries\ in\ their\ original\ order=Save entries in their original order

Saved\ selected\ to\ '%0'.=Saved selected to '%0'.

Saving=Saving
Expand Down Expand Up @@ -956,10 +954,6 @@ A\ local\ copy\ will\ be\ opened.=A local copy will be opened.
Autosave\ local\ libraries=Autosave local libraries
Automatically\ save\ the\ library\ to=Automatically save the library to
Please\ enter\ a\ valid\ file\ path.=Please enter a valid file path.


Export\ in\ current\ table\ sort\ order=Export in current table sort order
Export\ entries\ in\ their\ original\ order=Export entries in their original order
Error\ opening\ file\ '%0'.=Error opening file '%0'.

Formatter\ not\ found\:\ %0=Formatter not found: %0
Expand Down Expand Up @@ -1196,13 +1190,13 @@ Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stor
Clear\ connection\ settings=Clear connection settings

Open\ folder=Open folder
Export\ entries\ ordered\ as\ specified=Export entries ordered as specified
Export\ sort\ order=Export sort order
Save\ sort\ order=Save sort order
Newline\ separator=Newline separator

Save\ in\ current\ table\ sort\ order=Save in current table sort order
Save\ entries\ ordered\ as\ specified=Save entries ordered as specified
Keep\ original\ order=Keep original order
Use\ current\ table\ sort\ order=Use current table sort order
Use\ specified\ order=Use specified order
Show\ extra\ columns=Show extra columns
Parsing\ error=Parsing error
illegal\ backslash\ expression=illegal backslash expression
Expand Down