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.

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

Fix Preferences Search #6946

Merged
merged 7 commits into from
Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<Label styleClass="sectionHeader" text="%Visual theme"/>
<RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
<RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
<RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
<HBox alignment="CENTER_LEFT" spacing="4.0">
<RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
<TextField fx:id="customThemePath" prefWidth="350.0" disable="${!customTheme.selected}"/>
<Button onAction="#importTheme" disable="${!customTheme.selected}"
styleClass="icon-button,narrow"
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/jabref/gui/preferences/CitationKeyPatternTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@
<Insets left="20.0"/>
</padding>
</HBox>
<Label text="%Remove the following characters:"/>

<HBox alignment="CENTER_LEFT" spacing="10.0">
<Label text="%Remove the following characters:"/>
<TextField fx:id="unwantedCharacters" HBox.hgrow="ALWAYS"/>
</HBox>

<Label styleClass="sectionHeader" text="%Key patterns"/>
<HBox prefWidth="650.0">
<Label styleClass="sectionHeader" text="%Key patterns"/>
<HBox HBox.hgrow="ALWAYS"/>
<Button fx:id="keyPatternHelp" prefWidth="20.0"/>
</HBox>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jabref/gui/preferences/FileTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
</fx:define>

<CheckBox fx:id="openLastStartup" text="%Open last edited libraries at startup"/>
<Label text="%Do not wrap the following fields when saving"/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<Label text="%Do not wrap the following fields when saving"/>
<TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
</HBox>
<RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only"
toggleGroup="$stringsResolveToggleGroup"/>
<RadioButton fx:id="resolveStringsAll" text="%Resolve strings for all fields except"
toggleGroup="$stringsResolveToggleGroup"/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<TextField fx:id="resolveStringsExcept" HBox.hgrow="ALWAYS"/>
<RadioButton fx:id="resolveStringsAll" text="%Resolve strings for all fields except"
toggleGroup="$stringsResolveToggleGroup"/>
<TextField fx:id="resolveStringsExcept" HBox.hgrow="ALWAYS"/>
</HBox>
<Label alignment="TOP_LEFT" text="%Newline separator"/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<Label alignment="TOP_LEFT" text="%Newline separator"/>
<ComboBox fx:id="newLineSeparator" prefWidth="120.0"/>
</HBox>
<CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>

<Label styleClass="sectionHeader" text="%Entry owner"/>
<CheckBox fx:id="markOwner" text="%Mark new entries with owner name"/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<CheckBox fx:id="markOwner" text="%Mark new entries with owner name"/>
<TextField fx:id="markOwnerName" HBox.hgrow="ALWAYS"/>
<CheckBox fx:id="markOwnerOverwrite" text="%Overwrite">
<tooltip>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<CheckBox fx:id="autoAssignGroup" text="%Automatically assign new entry to selected groups"/>
<CheckBox fx:id="displayGroupCount" text="%Display count of items in group"/>

<Label text="%Keyword seperator"/>
<HBox spacing="4" alignment="CENTER_LEFT">
<Label text="%Keyword seperator"/>
Copy link
Member

Choose a reason for hiding this comment

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

Typo

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

<TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0"/>
</HBox>
</fx:root>
7 changes: 4 additions & 3 deletions src/main/java/org/jabref/gui/preferences/LinkedFilesTab.fxml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
<ToggleGroup fx:id="autolinkToggleGroup"/>
</fx:define>
<Label styleClass="titleHeader" text="%Linked files"/>
<Label text="%Main file directory"/>

<HBox alignment="CENTER_LEFT" spacing="10.0">
<Label text="%Main file directory"/>
<TextField fx:id="mainFileDirectory" HBox.hgrow="ALWAYS"/>
<Button onAction="#mainFileDirBrowse" text="%Browse"/>
</HBox>
Expand All @@ -38,9 +39,9 @@
toggleGroup="$autolinkToggleGroup"/>
<RadioButton fx:id="autolinkFileExactBibtex" text="%Autolink only files that match the citation key"
toggleGroup="$autolinkToggleGroup"/>
<RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search"
toggleGroup="$autolinkToggleGroup"/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search"
toggleGroup="$autolinkToggleGroup"/>
<TextField fx:id="autolinkRegexKey" HBox.hgrow="ALWAYS"/>
<Button fx:id="autolinkRegexHelp"/>
</HBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private ArrayListMultimap<PreferencesTab, Labeled> getPrefsTabLabelMap() {
if (builder instanceof Parent) {
Parent parentBuilder = (Parent) builder;
scanInputControls(parentBuilder, prefsTabLabelMap, preferencesTab);

}
}
return prefsTabLabelMap;
Expand All @@ -89,7 +89,7 @@ protected ListProperty<PreferencesTab> filteredPreferenceTabsProperty() {
return filteredPreferenceTabs;
}

private void scanInputControls(Parent parent, ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap, PreferencesTab preferencesTab) {
private static void scanInputControls(Parent parent, ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap, PreferencesTab preferencesTab) {
Copy link
Member

Choose a reason for hiding this comment

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

Please give ths method a more meaningful name. You are scanning for label controls.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

for (Node child : parent.getChildrenUnmodifiable()) {
if (!(child instanceof Labeled)) {

Expand Down