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

Preferences ui cleanup B #9866

Merged
merged 37 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
cf5f82b
Introduced library preferences tab
calixtus May 8, 2023
d555ffa
Moved language setting to AppearanceTab
calixtus May 9, 2023
75e551a
Changed theme radio buttons to combobox
calixtus May 9, 2023
0d5f846
Moved four settings to AppearanceTab
calixtus May 9, 2023
c1bf900
Removed GeneralTab, moved memory stick button to prefs toolbar
calixtus May 9, 2023
949bff2
Moved default library to EntryTab
calixtus May 9, 2023
ea38b9b
Moved telemetry prefs to AppearanceTab
calixtus May 9, 2023
6cf3d9d
Moved default library to LibraryTab
calixtus May 9, 2023
6dd2c76
Fixed AppearancePreferences
calixtus May 9, 2023
7ea1fdc
Moved memory stick mode to InternalPreferences
calixtus May 9, 2023
70571ba
Moved language to AppearancePreferences
calixtus May 9, 2023
c889560
Renamed GeneralPreferences to LibraryPreferences, moved reformatting …
calixtus May 9, 2023
adf7cdb
Fixed ui
calixtus May 9, 2023
4ce19e4
CHANGELOG.md
calixtus May 9, 2023
137710a
Fixed backup branch merge conflicts
calixtus May 9, 2023
455edf5
Fixed backup branch merge conflicts
calixtus May 9, 2023
5cd19df
Fixed checkstyle
calixtus May 9, 2023
8cf533a
Reworded getGeneralPreferences
calixtus May 9, 2023
0b69aa4
Fixed ThemeManagerTest
calixtus May 9, 2023
8332684
Polished KeyBindingsTab
calixtus May 10, 2023
8106f87
Added missing symbols in CustomImporter/ExporterTab
calixtus May 10, 2023
cbc76f0
Added small border to combobox popups
calixtus May 10, 2023
f857059
Merge remote-tracking branch 'upstream/main' into library_prefs
calixtus May 10, 2023
47e4ef1
CHANGELOG.md
calixtus May 10, 2023
e178ef4
l10n
calixtus May 10, 2023
cb02a2e
Merge remote-tracking branch 'upstream/main' into library_prefs
calixtus May 10, 2023
4a54aa0
Reworded AppearanceTab to WorkspaceTab
calixtus May 10, 2023
aabf62d
Reworded AppearanceTab to WorkspaceTab
calixtus May 10, 2023
c0e52fe
Merged WorkspaceTab and LibraryTab
calixtus May 10, 2023
bc5c4fc
Moved Autocompletion to new tab and moved Custom tab editor to EntryE…
calixtus May 10, 2023
cb5ce9f
CHANGELOG.md
calixtus May 10, 2023
d81d37f
Merge branch 'main' into library_prefs
koppor May 12, 2023
beb59e2
Readded Hint on 9839
koppor May 12, 2023
e488e3b
Merge branch 'main' into library_prefs
calixtus May 15, 2023
57b0649
Renamed workspace tab back to general tab
calixtus May 15, 2023
df6e42f
Update Javadoc
calixtus May 15, 2023
baf2947
Merge branch 'main' into library_prefs
calixtus May 15, 2023
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
Prev Previous commit
Next Next commit
Polished KeyBindingsTab
  • Loading branch information
calixtus committed May 10, 2023
commit 833268425222030788a034b0d3f0a44929d03ea2
36 changes: 26 additions & 10 deletions src/main/java/org/jabref/gui/Base.css
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ TextFlow > .tooltip-text-monospaced {
-fx-padding: 0.5em 1em 0.5em 1em;
}

.menu-button > .label {
-fx-padding: 0 8 0 8;
}

.button:hover {
-fx-background-color: rgba(0, 0, 0, 0.12);
}
Expand Down Expand Up @@ -529,6 +533,12 @@ TextFlow > .tooltip-text-monospaced {
-fx-padding: 0.0em 0.666667em 0.0em 0.666667em;
}

.menu-bar .menu-button {
-fx-border-color: transparent;
-fx-border-width: 0;
-fx-border-radius: 0;
}

.menu-item {
-fx-padding: 0.5em 0.41777em 0.5em 0.41777em;
}
Expand Down Expand Up @@ -622,12 +632,14 @@ TextFlow > .tooltip-text-monospaced {
-fx-background-color: -jr-green;
}

.table-view {
.table-view,
.tree-table-view {
-fx-background-insets: 0;
-fx-padding: 0;
}

.table-view:focused {
.table-view:focused,
.tree-table-view:focused {
-fx-background-insets: 0;
}

Expand Down Expand Up @@ -1086,24 +1098,26 @@ We want to have a look that matches our icons in the tool-bar */
-fx-background-color: -fx-mark-highlight-color, derive(-jr-theme-text, -30%);
}

.table-view {
.table-view,
.tree-table-view {
-fx-border-width: 0;
-fx-padding: 0;
-fx-border-insets: 0;
-fx-table-cell-border-color: transparent;
}

.table-view .column-header-background {
.column-header-background {
-fx-background-color: -fx-control-inner-background;
-fx-border-width: 0;
}

.table-view .column-header-background:hover {
.column-header-background:hover {
-fx-background-color: -fx-outer-border;
}

.table-view .column-header,
.table-view .filler {
.column-header,
.table-view .filler,
.tree-table-view .filler {
-fx-background-color: transparent, -fx-control-inner-background;
-fx-background-insets: 0, 0 0.02em 0 0.02em;
-fx-font-weight: bold;
Expand All @@ -1112,20 +1126,22 @@ We want to have a look that matches our icons in the tool-bar */
-fx-border-color: -fx-outer-border;
}

.table-view .column-header > .label {
.column-header > .label {
-fx-padding: 0 1em 0 1em;
-fx-alignment: center-left;
-fx-text-fill: -jr-head-fg;
}

.table-view .column-header .glyph-icon {
.column-header .glyph-icon {
-fx-alignment: baseline-center;
-fx-text-fill: -jr-head-fg;
-fx-fill: -jr-head-fg;
}

.table-cell,
.table-cell .glyph-icon {
.tree-table-cell,
.table-cell .glyph-icon,
.tree-table-cell .glyph-icon {
-fx-padding: 0.5em 1em 0.5em 1em;
-fx-cell-size: 4.0em;
-fx-text-fill: -fx-text-background-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
visibility: hidden;
}

.tree-table-row-cell:selected > .tree-table-cell > .icon, .tree-table-row-cell:pressed > .tree-table-cell > .icon {
.tree-table-row-cell:selected > .tree-table-cell > .icon,
.tree-table-row-cell:pressed > .tree-table-cell > .icon {
-fx-fill: white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.MenuButton?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.control.TreeTableColumn?>
<?import javafx.scene.control.TreeTableView?>
<?import javafx.scene.layout.HBox?>
Expand All @@ -27,15 +26,12 @@
</columnResizePolicy>
</TreeTableView>

<HBox spacing="4" alignment="CENTER_RIGHT">
<MenuButton fx:id="presetsButton" text="%Presets"/>
<Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetBindings">
<HBox spacing="10.0" alignment="CENTER_RIGHT">
<MenuButton fx:id="presetsButton" text="%Presets" styleClass="button"/>
<Button text="%Reset all" onAction="#resetBindings">
<graphic>
<JabRefIconView glyph="REFRESH"/>
</graphic>
<tooltip>
<Tooltip text="%Reset Bindings"/>
</tooltip>
</Button>
</HBox>
</fx:root>