Browse Source

Using ControlsFX's BSD-licensed assets for dialogs, rather than OpenJDK's GPL licensed ones.
Adjusted dialog styles for Linux and Windows.
[ci skip]

Sebastian Stenzel 9 years ago
parent
commit
34629a69ea

BIN
main/ui/src/main/resources/css/dialog-confirm.png


BIN
main/ui/src/main/resources/css/dialog-confirm@2x.png


BIN
main/ui/src/main/resources/css/dialog-error.png


BIN
main/ui/src/main/resources/css/dialog-error@2x.png


BIN
main/ui/src/main/resources/css/dialog-fewer-details.png


BIN
main/ui/src/main/resources/css/dialog-fewer-details@2x.png


BIN
main/ui/src/main/resources/css/dialog-information.png


BIN
main/ui/src/main/resources/css/dialog-information@2x.png


BIN
main/ui/src/main/resources/css/dialog-more-details.png


BIN
main/ui/src/main/resources/css/dialog-more-details@2x.png


BIN
main/ui/src/main/resources/css/dialog-warning.png


BIN
main/ui/src/main/resources/css/dialog-warning@2x.png


+ 27 - 51
main/ui/src/main/resources/css/linux_theme.css

@@ -77,7 +77,7 @@
 	-fx-pref-height: 25px;
 	-fx-background-color: COLOR_BORDER, COLOR_VGRAD_LIGHT;
 	-fx-background-insets: 0, 1;
-	-fx-padding: 4px 8px 4px 8px;
+	-fx-padding: 4px 12px 6px 12px;
 	-fx-text-fill: COLOR_TEXT;
 	-fx-alignment: CENTER;
 }
@@ -451,79 +451,55 @@
 
 .dialog-pane {
     -fx-background-color: COLOR_BACKGROUND;
-    -fx-padding: 0;
-}
-
-.dialog-pane > .expandable-content {
-    -fx-padding: 0.666em; /* 8px */
-}
-
-.dialog-pane > .button-bar > .container {
-    -fx-padding: 0.833em; /* 10px */
-}
-
-.dialog-pane > .content.label {
-    -fx-alignment: top-left;
-    -fx-padding: 1.333em 0.833em 0 0.833em; /* 16px 10px 0px 10px */
-}
-
-.dialog-pane > .content {
-    -fx-padding: 0.833em; /* 10 */
-}
-
-.dialog-pane:no-header .graphic-container {
-    -fx-padding: 0.833em 0 0 0.833em; /* 10px 0px 0px 10px */
+    -fx-padding: 20px 20px 20px 96px;
+    
+    -fx-background-image: url("/img/dialog-appicon.png");
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: 20px 20px;
 }
 
+/* HEADER */
 .dialog-pane:header .header-panel {
-    /*-fx-padding: 0.833em 1.166em 0.833em 1.166em; *//* 10px 14px 10px 14px */
-    -fx-padding: 0.833em; /* 10px */
-    -fx-background-color: COLOR_BORDER, linear-gradient(COLOR_BACKGROUND, derive(COLOR_BACKGROUND, 30%));
-    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0 0 12px 0;
 }
 
+/* TITLE */
 .dialog-pane:header .header-panel .label {
-    -fx-font-size: 1.167em; /* 14px */
+    -fx-font-weight: bold;
     -fx-wrap-text: true;
+    -fx-font-size: 14px;
 }
 
-.dialog-pane:header .header-panel .graphic-container {
-    /* This prevents the text in the header running directly into the graphic */
-    -fx-padding: 0 0 0 0.833em; /* 0px 0px 0px 10px */
-}
-
-.dialog-pane > .button-bar > .container > .details-button {
-  -fx-alignment: baseline-left;
-  -fx-focus-traversable: false;
-  -fx-padding: 0.416em; /* 5px */
-}
-
-.dialog-pane > .button-bar > .container > .details-button.more {
-    -fx-graphic: url("dialog-more-details.png");
-}
-
-.dialog-pane > .button-bar > .container > .details-button.less {
-    -fx-graphic: url("dialog-fewer-details.png");
+/* CONTENT LABEL */
+.dialog-pane > .content {
+	-fx-alignment: top-left;
+	-fx-wrap-text: true;
+	-fx-font-size: 12px;
 }
 
-.dialog-pane > .button-bar > .container > .details-button:hover {
-    -fx-underline: true;
+/* BUTTONS */
+.dialog-pane > .button-bar > .container {
+    -fx-padding: 20px 0 0 0;
 }
 
 .alert.confirmation.dialog-pane,
 .text-input-dialog.dialog-pane,
 .choice-dialog.dialog-pane {
-    -fx-graphic: url("dialog-confirm.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-confirm.png");
 }
 
 .alert.information.dialog-pane {
-    -fx-graphic: url("dialog-information.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-information.png");
 }
 
 .alert.error.dialog-pane {
-    -fx-graphic: url("dialog-error.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-error.png");
 }
 
 .alert.warning.dialog-pane {
-    -fx-graphic: url("dialog-warning.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-warning.png");
 }

+ 1 - 1
main/ui/src/main/resources/css/mac_theme.css

@@ -543,7 +543,7 @@
     -fx-background-color: COLOR_BACKGROUND;
     -fx-padding: 20px 20px 20px 96px;
     
-    -fx-background-image: url("/img/dialog-icon.png");
+    -fx-background-image: url("/img/dialog-appicon.png");
     -fx-background-repeat: no-repeat;
     -fx-background-position: 20px 20px;
 }

+ 38 - 50
main/ui/src/main/resources/css/win_theme.css

@@ -25,6 +25,10 @@
 	COLOR_CHART_GREEN: #A1CD5f;
 	COLOR_CHART_RED: #C75050;
 	
+	COLOR_HGRAD_BTN_BACKGROUND: linear-gradient(to bottom, #F0F0F0 0%, #E5E5E5 100%);
+	COLOR_HGRAD_BTN_DISABLED_BORDER: linear-gradient(to bottom, #D2D2D2 0%, #C4C4C4 100%);
+	COLOR_HGRAD_BTN_ARMED_BACKGROUND: linear-gradient(to bottom, #DAECFC 0%, #C4E0FC 100%);
+	
 	-fx-background-color: COLOR_BACKGROUND;
 	-fx-text-fill: COLOR_TEXT;
 }
@@ -67,7 +71,7 @@
 .button,
 .toggle-button {
 	-fx-pref-height: 27px;
-	-fx-background-color: COLOR_BORDER, linear-gradient(to bottom, #F0F0F0 0%, #E5E5E5 100%);
+	-fx-background-color: COLOR_BORDER, COLOR_HGRAD_BTN_BACKGROUND;
 	-fx-background-insets: 0, 1;
     -fx-padding: 2px 12px 2px 12px;
     -fx-text-fill: COLOR_TEXT;
@@ -77,12 +81,12 @@
 }
 
 .button:default {
-	-fx-background-color: COLOR_BORDER_FOCUS, linear-gradient(to bottom, #F0F0F0 0%, #E5E5E5 100%);
+	-fx-background-color: COLOR_BORDER_FOCUS, COLOR_HGRAD_BTN_BACKGROUND;
 }
 
 .button:disabled,
 .button:default:disabled {
-	-fx-background-color: linear-gradient(to bottom, #D2D2D2 0%, #C4C4C4 100%), #F2F2F2;
+	-fx-background-color: COLOR_HGRAD_BTN_DISABLED_BORDER, #F2F2F2;
     -fx-text-fill: #8B8B8B;
 }
 
@@ -90,7 +94,7 @@
 .button:default:armed,
 .toggle-button:armed,
 .toggle-button:selected {
-    -fx-background-color: COLOR_BORDER_FOCUS, linear-gradient(to bottom, #DAECFC 0%, #C4E0FC 100%);
+    -fx-background-color: COLOR_BORDER_FOCUS, COLOR_HGRAD_BTN_ARMED_BACKGROUND;
 }
 
 .button:focused,
@@ -523,79 +527,63 @@
 
 .dialog-pane {
     -fx-background-color: COLOR_BACKGROUND;
-    -fx-padding: 0;
-}
-
-.dialog-pane > .expandable-content {
-    -fx-padding: 0.666em; /* 8px */
-}
-
-.dialog-pane > .button-bar > .container {
-    -fx-padding: 0.833em; /* 10px */
-}
-
-.dialog-pane > .content.label {
-    -fx-alignment: top-left;
-    -fx-padding: 1.333em 0.833em 0 0.833em; /* 16px 10px 0px 10px */
-}
-
-.dialog-pane > .content {
-    -fx-padding: 0.833em; /* 10 */
-}
-
-.dialog-pane:no-header .graphic-container {
-    -fx-padding: 0.833em 0 0 0.833em; /* 10px 0px 0px 10px */
+    -fx-padding: 20px 20px 20px 96px;
+    
+    -fx-background-image: url("/img/dialog-appicon.png");
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: 20px 20px;
 }
 
+/* HEADER */
 .dialog-pane:header .header-panel {
-    /*-fx-padding: 0.833em 1.166em 0.833em 1.166em; *//* 10px 14px 10px 14px */
-    -fx-padding: 0.833em; /* 10px */
-    -fx-background-color: COLOR_BORDER, linear-gradient(COLOR_BACKGROUND, derive(COLOR_BACKGROUND, 30%));
-    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0 0 12px 0;
 }
 
+/* TITLE */
 .dialog-pane:header .header-panel .label {
-    -fx-font-size: 1.167em; /* 14px */
+    -fx-font-weight: bold;
     -fx-wrap-text: true;
 }
 
-.dialog-pane:header .header-panel .graphic-container {
-    /* This prevents the text in the header running directly into the graphic */
-    -fx-padding: 0 0 0 0.833em; /* 0px 0px 0px 10px */
-}
-
-.dialog-pane > .button-bar > .container > .details-button {
-  -fx-alignment: baseline-left;
-  -fx-focus-traversable: false;
-  -fx-padding: 0.416em; /* 5px */
+/* CONTENT LABEL */
+.dialog-pane > .content {
+	-fx-alignment: top-left;
+	-fx-wrap-text: true;
+	-fx-font-size: 11px;
+	-fx-line-spacing: 1.0;
 }
 
-.dialog-pane > .button-bar > .container > .details-button.more {
-    -fx-graphic: url("dialog-more-details.png");
+/* BUTTONS */
+.dialog-pane > .button-bar > .container {
+    -fx-padding: 20px 0 0 0;
 }
 
-.dialog-pane > .button-bar > .container > .details-button.less {
-    -fx-graphic: url("dialog-fewer-details.png");
+.dialog-pane > .button-bar .button:default {
+	-fx-background-color: COLOR_BORDER_FOCUS, COLOR_HGRAD_BTN_BACKGROUND;
 }
 
-.dialog-pane > .button-bar > .container > .details-button:hover {
-    -fx-underline: true;
+.dialog-pane > .button-bar .button:default:armed {
+    -fx-background-color: COLOR_BORDER_FOCUS, COLOR_HGRAD_BTN_ARMED_BACKGROUND;
 }
 
 .alert.confirmation.dialog-pane,
 .text-input-dialog.dialog-pane,
 .choice-dialog.dialog-pane {
-    -fx-graphic: url("dialog-confirm.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-confirm.png");
 }
 
 .alert.information.dialog-pane {
-    -fx-graphic: url("dialog-information.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-information.png");
 }
 
 .alert.error.dialog-pane {
-    -fx-graphic: url("dialog-error.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-error.png");
 }
 
 .alert.warning.dialog-pane {
-    -fx-graphic: url("dialog-warning.png");
+	-fx-padding: 20px 20px 20px 80px;
+	-fx-background-image: url("/img/dialog-warning.png");
 }

main/ui/src/main/resources/img/dialog-icon.png → main/ui/src/main/resources/img/dialog-appicon.png


main/ui/src/main/resources/img/dialog-icon@2x.png → main/ui/src/main/resources/img/dialog-appicon@2x.png


BIN
main/ui/src/main/resources/img/dialog-confirm.png


BIN
main/ui/src/main/resources/img/dialog-error.png


BIN
main/ui/src/main/resources/img/dialog-information.png


BIN
main/ui/src/main/resources/img/dialog-warning.png