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

UI Preferences->advanced tab optimization : separators and text modification #4922

Merged
merged 15 commits into from Apr 26, 2019
Merged

UI Preferences->advanced tab optimization : separators and text modification #4922

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b25f298
UI Preferences->advanced tab optimisation : separators and text modif…
fritz-reynouard Apr 25, 2019
4146244
AdvancedTab.java minor imports modifications
fritz-reynouard Apr 25, 2019
5af09a5
advancedTab : Localization.lang for text
fritz-reynouard Apr 25, 2019
319174d
Rework PosteOpenActions to javafx (custom entry type import)
Siedlerchr Apr 18, 2019
273de83
rework threading stuff
Siedlerchr Apr 20, 2019
6d5e9fd
rework dialog, create fxml etc
Siedlerchr Apr 20, 2019
2a9d60c
remove dialog service argument
Siedlerchr Apr 20, 2019
bf8c037
remove dialogService parameter
Siedlerchr Apr 20, 2019
2a71a3f
Fixes throwing an exception when 'id' field is present in bib file (#…
CaptainDaVinci Apr 24, 2019
24bec55
Toggle enable status of menu items (#4872)
tobiasdiez Apr 24, 2019
632bdf1
Refactorings, move functionality of CustomEntryTypesManager to Prefer…
Siedlerchr Apr 24, 2019
0ce291d
Fix for the issue #4912 (#4916)
znuznu Apr 24, 2019
738146c
Merge branch 'master' of https://github.com/JabRef/jabref
fritz-reynouard Apr 25, 2019
9e02ce1
Merge branch 'master' into UIadvancedTabOptimization
fritz-reynouard Apr 25, 2019
a85a1a0
translation items key modification for advanced Tab UI
fritz-reynouard Apr 25, 2019
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
49 changes: 15 additions & 34 deletions src/main/java/org/jabref/gui/preferences/AdvancedTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.shape.Line;
import javafx.scene.text.Text;

import org.jabref.Globals;
import org.jabref.gui.DialogService;
Expand Down Expand Up @@ -54,26 +54,12 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
Label remoteOperation = new Label(Localization.lang("Remote operation"));
remoteOperation.getStyleClass().add("sectionHeader");
builder.add(remoteOperation, 2, 1);
builder.add(new Separator(), 2, 1);
builder.add(new Pane(), 1, 2);
Label label1 = new Label(Localization.lang("This feature lets new files be opened or imported into an "

+ "already running instance of JabRef<BR>instead of opening a new instance. For instance, this "

+ "is useful when you open a file in JabRef<br>from your web browser."

+ "<BR>Note that this will prevent you from running more than one instance of JabRef at a time."));
label1.setVisible(false);
builder.add(label1, 2, 22);

Label textLabel1 = new Label(" This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For");
builder.add(textLabel1, 2, 3);
Label textLabel2 = new Label("instance, this is useful when you open a file in JabRef from your web browser. ");
builder.add(textLabel2, 2, 4);
Label textLabel3 = new Label(" Note that this will prevent you from running more than one instance of JabRef at a time.");
builder.add(textLabel3, 2, 5);
builder.add(new Line(), 2, 6);
builder.add(new Pane(), 2, 7);
Text textRemote = new Text(
Copy link
Member

Choose a reason for hiding this comment

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

Please add a Localization.lang call around the text so that it gets translated properly if the user changes the language. This should also take care of the failing travis build.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks, I changed it but it doesn't work. I've some issues when I just change little things, most frequently this one

Capture du 2019-04-25 21-27-32
:

Copy link
Member

Choose a reason for hiding this comment

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

This should not be related to your changes. Have you merged in the latest Master?
And regarding the l10n, just run the Localisation Consistency Test to check if you need to remove or add new translation items

"This feature lets new files be opened or imported into an already running instance of JabRef " +
"instead of opening a new instance. For instance, this is useful when you open a file in JabRef " +
"from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time.");
textRemote.setWrappingWidth(600);
builder.add(textRemote, 2, 4);

HBox p = new HBox();
p.getChildren().add(useRemoteServer);
Expand All @@ -84,26 +70,21 @@ public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
help.setMaxWidth(Double.MAX_VALUE);
p.getChildren().add(help);

builder.add(p, 2, 9);
builder.add(new Label(""), 1, 10);
builder.add(p, 2, 10);
builder.add(new Separator(), 2, 11);

Label explore = new Label(Localization.lang("Search %0", "IEEEXplore"));
explore.getStyleClass().add("sectionHeader");
builder.add(explore, 2, 11);
builder.add(new Separator(), 2, 11);
builder.add(new Pane(), 2, 12);
builder.add(useIEEEAbrv, 2, 13);

builder.add(new Line(), 2, 16);
builder.add(new Label(""), 1, 17);
builder.add(explore, 2, 12);
builder.add(useIEEEAbrv, 2, 14);

builder.add(new Separator(), 2, 19);
Label importConversions = new Label(Localization.lang("Import conversions"));
importConversions.getStyleClass().add("sectionHeader");
builder.add(importConversions, 2, 18);
builder.add(importConversions, 2, 20);

builder.add(useCaseKeeperOnSearch, 2, 19);
builder.add(new Pane(), 2, 20);
builder.add(useUnitFormatterOnSearch, 2, 21);
builder.add(useCaseKeeperOnSearch, 2, 21);
builder.add(useUnitFormatterOnSearch, 2, 23);

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}

.preferencePaneContainer {
-fx-padding: 0em 1em 0em 3em;
-fx-padding: 1em 1em 1em 3em;
}

*:search-highlight {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


<?import javafx.scene.control.DialogPane?>
<DialogPane prefHeight="514.0" prefWidth="818.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreferencesDialog" />
<DialogPane prefHeight="600.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreferencesDialog" />