diff --git a/data/images/ui/arrow_horizontal.png b/data/images/ui/arrow_horizontal.png index 9cd5aacd..a0ec72ca 100644 Binary files a/data/images/ui/arrow_horizontal.png and b/data/images/ui/arrow_horizontal.png differ diff --git a/data/images/ui/arrow_vertical.png b/data/images/ui/arrow_vertical.png index a5de15ef..d48aba33 100644 Binary files a/data/images/ui/arrow_vertical.png and b/data/images/ui/arrow_vertical.png differ diff --git a/data/images/ui/button.png b/data/images/ui/button.png index 49c45dbd..103f6175 100644 Binary files a/data/images/ui/button.png and b/data/images/ui/button.png differ diff --git a/data/images/ui/button_popupmenu.png b/data/images/ui/button_popupmenu.png index 75b2c6cc..103f6175 100644 Binary files a/data/images/ui/button_popupmenu.png and b/data/images/ui/button_popupmenu.png differ diff --git a/data/images/ui/button_rounded.png b/data/images/ui/button_rounded.png index 49c45dbd..eebfa2f4 100644 Binary files a/data/images/ui/button_rounded.png and b/data/images/ui/button_rounded.png differ diff --git a/data/images/ui/button_square.png b/data/images/ui/button_square.png index ad8374ef..103f6175 100644 Binary files a/data/images/ui/button_square.png and b/data/images/ui/button_square.png differ diff --git a/data/images/ui/button_top.png b/data/images/ui/button_top.png index d0480416..73703a0e 100644 Binary files a/data/images/ui/button_top.png and b/data/images/ui/button_top.png differ diff --git a/data/images/ui/checkbox.png b/data/images/ui/checkbox.png index b54e41f2..e3aa5e1b 100644 Binary files a/data/images/ui/checkbox.png and b/data/images/ui/checkbox.png differ diff --git a/data/images/ui/combobox.png b/data/images/ui/combobox.png index a3d9c62b..8ef29ab3 100644 Binary files a/data/images/ui/combobox.png and b/data/images/ui/combobox.png differ diff --git a/data/images/ui/combobox_rounded.png b/data/images/ui/combobox_rounded.png index a3d9c62b..3c007022 100644 Binary files a/data/images/ui/combobox_rounded.png and b/data/images/ui/combobox_rounded.png differ diff --git a/data/images/ui/combobox_square.png b/data/images/ui/combobox_square.png index a630bd06..8ef29ab3 100644 Binary files a/data/images/ui/combobox_square.png and b/data/images/ui/combobox_square.png differ diff --git a/data/images/ui/icon_add.png b/data/images/ui/icon_add.png index 9c2a0f75..f820a0b9 100644 Binary files a/data/images/ui/icon_add.png and b/data/images/ui/icon_add.png differ diff --git a/data/images/ui/item.png b/data/images/ui/item.png index 2491584a..4230ace9 100644 Binary files a/data/images/ui/item.png and b/data/images/ui/item.png differ diff --git a/data/images/ui/menubox.png b/data/images/ui/menubox.png index 8f660b80..307e5fd5 100644 Binary files a/data/images/ui/menubox.png and b/data/images/ui/menubox.png differ diff --git a/data/images/ui/miniwindow.png b/data/images/ui/miniwindow.png index 1db0bcd9..e258304f 100644 Binary files a/data/images/ui/miniwindow.png and b/data/images/ui/miniwindow.png differ diff --git a/data/images/ui/miniwindow_buttons.png b/data/images/ui/miniwindow_buttons.png index 260c05e7..c073ecf3 100644 Binary files a/data/images/ui/miniwindow_buttons.png and b/data/images/ui/miniwindow_buttons.png differ diff --git a/data/images/ui/panel_bottom.png b/data/images/ui/panel_bottom.png index 70e8d6b9..b56a0c94 100644 Binary files a/data/images/ui/panel_bottom.png and b/data/images/ui/panel_bottom.png differ diff --git a/data/images/ui/panel_container.png b/data/images/ui/panel_container.png index 9fe1337c..984672e9 100644 Binary files a/data/images/ui/panel_container.png and b/data/images/ui/panel_container.png differ diff --git a/data/images/ui/panel_content.png b/data/images/ui/panel_content.png index 0eab48aa..b56a0c94 100644 Binary files a/data/images/ui/panel_content.png and b/data/images/ui/panel_content.png differ diff --git a/data/images/ui/panel_flat.png b/data/images/ui/panel_flat.png index 64a7b6aa..d32beb7a 100644 Binary files a/data/images/ui/panel_flat.png and b/data/images/ui/panel_flat.png differ diff --git a/data/images/ui/panel_lightflat.png b/data/images/ui/panel_lightflat.png index b98810ab..d32beb7a 100644 Binary files a/data/images/ui/panel_lightflat.png and b/data/images/ui/panel_lightflat.png differ diff --git a/data/images/ui/panel_map.png b/data/images/ui/panel_map.png index 8f113879..b56a0c94 100644 Binary files a/data/images/ui/panel_map.png and b/data/images/ui/panel_map.png differ diff --git a/data/images/ui/panel_side.png b/data/images/ui/panel_side.png index a8e1b081..b56a0c94 100644 Binary files a/data/images/ui/panel_side.png and b/data/images/ui/panel_side.png differ diff --git a/data/images/ui/panel_top.png b/data/images/ui/panel_top.png index e3ea84e7..649874a9 100644 Binary files a/data/images/ui/panel_top.png and b/data/images/ui/panel_top.png differ diff --git a/data/images/ui/scrollbar.png b/data/images/ui/scrollbar.png index 4d87786c..f565ecdc 100644 Binary files a/data/images/ui/scrollbar.png and b/data/images/ui/scrollbar.png differ diff --git a/data/images/ui/separator_horizontal.png b/data/images/ui/separator_horizontal.png index ec557166..40484e3d 100644 Binary files a/data/images/ui/separator_horizontal.png and b/data/images/ui/separator_horizontal.png differ diff --git a/data/images/ui/separator_vertical.png b/data/images/ui/separator_vertical.png index 85238b53..ca3b5d3f 100644 Binary files a/data/images/ui/separator_vertical.png and b/data/images/ui/separator_vertical.png differ diff --git a/data/images/ui/spinbox.png b/data/images/ui/spinbox.png index 635fb32a..8029090e 100644 Binary files a/data/images/ui/spinbox.png and b/data/images/ui/spinbox.png differ diff --git a/data/images/ui/spinbox_down.png b/data/images/ui/spinbox_down.png index 541abd86..0f99b8eb 100644 Binary files a/data/images/ui/spinbox_down.png and b/data/images/ui/spinbox_down.png differ diff --git a/data/images/ui/spinbox_up.png b/data/images/ui/spinbox_up.png index 18e22529..8432b2d2 100644 Binary files a/data/images/ui/spinbox_up.png and b/data/images/ui/spinbox_up.png differ diff --git a/data/images/ui/tabbutton_rounded.png b/data/images/ui/tabbutton_rounded.png index 2b67bbd1..eebfa2f4 100644 Binary files a/data/images/ui/tabbutton_rounded.png and b/data/images/ui/tabbutton_rounded.png differ diff --git a/data/images/ui/tabbutton_square.png b/data/images/ui/tabbutton_square.png index 87268787..1e1c5836 100644 Binary files a/data/images/ui/tabbutton_square.png and b/data/images/ui/tabbutton_square.png differ diff --git a/data/images/ui/textedit.png b/data/images/ui/textedit.png index 64a7b6aa..96062ef6 100644 Binary files a/data/images/ui/textedit.png and b/data/images/ui/textedit.png differ diff --git a/data/images/ui/window.png b/data/images/ui/window.png index 2776f07b..0b3f3c89 100644 Binary files a/data/images/ui/window.png and b/data/images/ui/window.png differ diff --git a/data/images/ui/window_headless.png b/data/images/ui/window_headless.png index 846dfe1b..d74ec1df 100644 Binary files a/data/images/ui/window_headless.png and b/data/images/ui/window_headless.png differ diff --git a/data/styles/10-buttons.otui b/data/styles/10-buttons.otui index 0eebf67b..8967b2e2 100644 --- a/data/styles/10-buttons.otui +++ b/data/styles/10-buttons.otui @@ -1,44 +1,45 @@ Button < UIButton font: verdana-11px-antialised - color: #f0ad4dff - size: 106 22 + color: #dfdfdfff + size: 106 23 text-offset: 0 0 - image-source: /images/ui/button_rounded - image-color: white - image-clip: 0 0 20 20 + image-source: /images/ui/button + image-color: #dfdfdf + image-clip: 0 0 22 23 image-border: 3 padding: 5 10 5 10 $hover !disabled: - image-clip: 0 20 20 20 + image-clip: 0 23 22 23 $pressed: - image-clip: 0 40 20 20 + image-clip: 0 46 22 23 text-offset: 1 1 $disabled: - color: #f0ad4d88 + color: #dfdfdf88 + opacity: 0.8 TabButton < UIButton - size: 20 20 + size: 22 23 image-source: /images/ui/tabbutton_rounded - image-color: white - image-clip: 0 0 20 20 + image-color: #dfdfdf + image-clip: 0 0 22 23 image-border: 3 - icon-color: white - color: #aaaaaa + icon-color: #dfdfdf + color: #dfdfdf $hover !on: - image-clip: 0 20 20 20 - color: white + image-clip: 0 23 22 23 + color: #dfdfdf $disabled: - image-color: #ffffff66 - icon-color: #888888 + image-color: #dfdfdf66 + icon-color: #dfdfdf $on: - image-clip: 0 40 20 20 - color: #80c7f8 + image-clip: 0 46 22 23 + color: #dfdfdf NextButton < UIButton size: 12 21 @@ -52,7 +53,7 @@ NextButton < UIButton image-clip: 12 21 12 21 $disabled: - image-color: #ffffff55 + image-color: #dfdfdf55 PreviousButton < UIButton size: 12 21 @@ -66,18 +67,18 @@ PreviousButton < UIButton image-clip: 0 21 12 21 $disabled: - image-color: #ffffff55 + image-color: #dfdfdf55 AddButton < UIButton size: 20 20 image-source: /images/ui/icon_add - image-color: #ffffffff + image-color: #dfdfdfff $hover !disabled: - image-color: #ffffff99 + image-color: #dfdfdf99 $pressed: - image-color: #ffffff44 + image-color: #dfdfdf44 $disabled: - image-color: #ffffff55 + image-color: #dfdfdf55 diff --git a/data/styles/10-checkboxes.otui b/data/styles/10-checkboxes.otui index 3b255f16..3edccec9 100644 --- a/data/styles/10-checkboxes.otui +++ b/data/styles/10-checkboxes.otui @@ -1,35 +1,35 @@ CheckBox < UICheckBox size: 16 16 text-align: left - text-offset: 16 0 - color: #aaaaaa - image-color: #ffffffff - image-rect: 0 0 12 12 - image-offset: 0 2 + text-offset: 18 1 + color: #dfdfdf + image-color: #dfdfdfff + image-rect: 0 0 15 15 image-source: /images/ui/checkbox $hover !disabled: - color: #cccccc + color: #ffffff $!checked: - image-clip: 0 0 12 12 + image-clip: 0 0 15 15 $hover !checked: - image-clip: 0 12 12 12 + image-clip: 0 15 15 15 $checked: - image-clip: 0 24 12 12 + image-clip: 0 30 15 15 $hover checked: - image-clip: 0 36 12 12 + image-clip: 0 45 15 15 $disabled: - image-color: #ffffff88 - color: #aaaaaa88 + image-color: #dfdfdf88 + color: #dfdfdf88 + opacity: 0.8 ColorBox < UICheckBox size: 16 16 - image-color: #ffffffff + image-color: #dfdfdfff image-source: /images/ui/colorbox $checked: @@ -40,26 +40,25 @@ ColorBox < UICheckBox ButtonBox < UICheckBox font: verdana-11px-antialised - color: #ffffffff - size: 106 22 + color: #dfdfdfff + size: 106 23 text-offset: 0 0 text-align: center - image-source: /images/ui/tabbutton_rounded - image-color: white - image-clip: 0 0 20 20 + image-source: /images/ui/button + image-color: #dfdfdf + image-clip: 0 0 22 23 image-border: 3 $hover !disabled: - image-clip: 0 20 20 20 + image-clip: 0 23 22 23 $checked: - image-clip: 0 40 20 20 - color: #80c7f8 + image-clip: 0 46 22 23 + color: #dfdfdf $disabled: - color: #666666ff - image-color: #ffffff88 + color: #dfdfdf88 + image-color: #dfdfdf88 ButtonBoxRounded < ButtonBox - image-source: /images/ui/tabbutton_rounded - image-border: 2 \ No newline at end of file + image-source: /images/ui/button_rounded \ No newline at end of file diff --git a/data/styles/10-comboboxes.otui b/data/styles/10-comboboxes.otui index b4a71b46..a2966f7d 100644 --- a/data/styles/10-comboboxes.otui +++ b/data/styles/10-comboboxes.otui @@ -1,62 +1,65 @@ ComboBoxPopupMenuButton < UIButton - height: 20 + height: 23 font: verdana-11px-antialised text-align: left text-offset: 4 0 - color: #aaaaaa + color: #dfdfdf background-color: alpha + margin: 1 $hover !disabled: - color: #ffffff - background-color: #ffffff44 + color: #dfdfdf + background-color: #355d89 $disabled: - color: #555555 + color: #dfdfdf88 ComboBoxPopupMenu < UIPopupMenu image-source: /images/ui/combobox_square - image-clip: 0 60 89 20 - image-border-left: 1 - image-border-right: 1 + image-clip: 0 69 91 23 + image-border: 1 ComboBox < UIComboBox font: verdana-11px-antialised - color: #aaaaaa - size: 89 20 + color: #dfdfdf + size: 91 23 text-offset: 3 0 text-align: left image-source: /images/ui/combobox_square - image-border: 1 - image-border-right: 17 - image-clip: 0 0 89 20 + image-border: 3 + image-border-right: 19 + image-clip: 0 0 91 23 $hover !disabled: - image-clip: 0 20 89 20 + image-clip: 0 23 91 23 $on: - image-clip: 0 40 89 20 + image-clip: 0 46 91 23 + + $disabled: + color: #dfdfdf88 + opacity: 0.8 ComboBoxRoundedPopupMenuButton < UIButton - height: 20 + height: 23 font: verdana-11px-antialised text-align: left text-offset: 4 0 - color: #aaaaaa + color: #dfdfdf background-color: alpha $hover !disabled: color: #ffffff - background-color: #ffffff44 + background-color: #355d89 $disabled: - color: #555555 + color: #dfdfdf88 ComboBoxRoundedPopupMenu < UIPopupMenu image-source: /images/ui/combobox_rounded - image-clip: 0 60 89 20 - image-border-left: 1 - image-border-right: 1 + image-clip: 0 69 91 23 + image-border: 3 ComboBoxRounded < ComboBox image-source: /images/ui/combobox_rounded - image-border: 2 + image-border: 3 diff --git a/data/styles/10-labels.otui b/data/styles/10-labels.otui index f257494e..8edfbb1b 100644 --- a/data/styles/10-labels.otui +++ b/data/styles/10-labels.otui @@ -1,23 +1,23 @@ Label < UILabel font: verdana-11px-antialised - color: #bbbbbb + color: #dfdfdf $disabled: - color: #bbbbbb88 + color: #dfdfdf88 FlatLabel < UILabel font: verdana-11px-antialised - color: #aaaaaa + color: #dfdfdf size: 86 20 text-offset: 3 3 image-source: /images/ui/panel_flat image-border: 1 $disabled: - color: #aaaaaa88 + color: #dfdfdf88 MenuLabel < Label GameLabel < UILabel font: verdana-11px-antialised - color: #bbbbbb + color: #dfdfdf diff --git a/data/styles/10-listboxes.otui b/data/styles/10-listboxes.otui index 1942f631..d52ff2f4 100644 --- a/data/styles/10-listboxes.otui +++ b/data/styles/10-listboxes.otui @@ -1,19 +1,19 @@ TextList < UIScrollArea layout: verticalBox border-width: 1 - border-color: #1d222b - background-color: #222833 + border-color: #272727 + background-color: #636363 padding: 1 auto-focus: none HorizontalList < UIScrollArea layout: horizontalBox border-width: 1 - border-color: #1d222b - background-color: #222833 + border-color: #272727 + background-color: #636363 VerticalList < UIScrollArea layout: verticalBox border-width: 1 - border-color: #1d222b - background-color: #222833 \ No newline at end of file + border-color: #272727 + background-color: #636363 \ No newline at end of file diff --git a/data/styles/10-scrollbars.otui b/data/styles/10-scrollbars.otui index f11dd71b..7f6b5d11 100644 --- a/data/styles/10-scrollbars.otui +++ b/data/styles/10-scrollbars.otui @@ -10,7 +10,6 @@ ScrollBarSlider < UIButton image-clip: 13 26 13 13 $pressed: image-clip: 26 26 13 13 - image-color: #ffffff99 $disabled: image-color: #ffffff66 diff --git a/data/styles/10-separators.otui b/data/styles/10-separators.otui index 98999143..420d0fad 100644 --- a/data/styles/10-separators.otui +++ b/data/styles/10-separators.otui @@ -1,13 +1,13 @@ HorizontalSeparator < UIWidget image-source: /images/ui/separator_horizontal - image-border-top: 2 + image-border: 1 height: 2 phantom: true focusable: false VerticalSeparator < UIWidget image-source: /images/ui/separator_vertical - image-border-left: 2 + image-border: 1 width: 2 phantom: true focusable: false diff --git a/data/styles/10-textedits.otui b/data/styles/10-textedits.otui index b2fea47e..1e176996 100644 --- a/data/styles/10-textedits.otui +++ b/data/styles/10-textedits.otui @@ -1,15 +1,16 @@ TextEdit < UITextEdit font: verdana-11px-antialised - color: #aaaaaa - size: 86 20 - text-offset: 0 3 - padding: 3 + color: #272727 + size: 86 22 + text-offset: 0 4 + padding: 4 image-source: /images/ui/textedit image-border: 1 - selection-color: #111416 - selection-background-color: #999999 + selection-color: #272727 + selection-background-color: #cccccc $disabled: - color: #aaaaaa88 + color: #27272788 + opacity: 0.5 PasswordTextEdit < TextEdit text-hidden: true diff --git a/data/styles/10-windows.otui b/data/styles/10-windows.otui index 644a4bf3..ffe69ebe 100644 --- a/data/styles/10-windows.otui +++ b/data/styles/10-windows.otui @@ -2,20 +2,19 @@ Window < UIWindow font: verdana-11px-antialised size: 200 200 opacity: 1 - color: white - text-offset: 0 4 + color: #dfdfdf + text-offset: 0 6 text-align: top image-source: /images/ui/window - image-border: 5 - image-border-top: 22 - opacity: 1 - padding-top: 30 + image-border: 6 + image-border-top: 27 + padding-top: 36 padding-left: 16 padding-right: 16 padding-bottom: 16 $disabled: - color: #aaaaaa88 + color: #dfdfdf88 $dragging: opacity: 0.8 diff --git a/data/styles/20-tabbars.otui b/data/styles/20-tabbars.otui index 3d7dca02..e90f6e6a 100644 --- a/data/styles/20-tabbars.otui +++ b/data/styles/20-tabbars.otui @@ -1,47 +1,49 @@ MoveableTabBar < UIMoveableTabBar - size: 80 20 + size: 80 21 MoveableTabBarPanel < Panel MoveableTabBarButton < UIButton - size: 20 20 + size: 20 21 image-source: /images/ui/tabbutton_square - image-color: white - image-clip: 0 0 20 20 + image-color: #dfdfdf + image-clip: 0 0 20 21 image-border: 3 - icon-color: white - color: #aaaaaa + image-border-bottom: 0 + icon-color: #dfdfdf + color: #dfdfdf anchors.top: parent.top anchors.left: parent.left padding: 5 $hover !checked: - image-clip: 0 20 20 20 - color: white + image-clip: 0 21 20 21 + color: #dfdfdf $disabled: - image-color: #ffffff66 - icon-color: #888888 + image-color: #dfdfdf88 + icon-color: #dfdfdf $checked: - image-clip: 0 40 20 20 - color: #D8E7F0 + image-clip: 0 42 20 21 + color: #dfdfdf $on !checked: - color: #F55E5E + color: #dfdfdf TabBar < UITabBar - size: 80 20 + size: 80 21 Panel id: buttonsPanel anchors.fill: parent TabBarPanel < Panel TabBarButton < UIButton - size: 20 20 + size: 22 23 image-source: /images/ui/tabbutton_square - image-color: white - image-clip: 0 0 20 20 + image-color: #dfdfdf + image-clip: 0 0 22 23 image-border: 3 - icon-color: white - color: #aaaaaa + image-border-bottom: 0 + icon-color: #dfdfdf + color: #dfdfdf anchors.top: parent.top padding: 5 @@ -53,19 +55,19 @@ TabBarButton < UIButton margin-left: 5 $hover !checked: - image-clip: 0 20 20 20 - color: white + image-clip: 0 23 22 23 + color: #dfdfdf $disabled: - image-color: #ffffff66 - icon-color: #888888 + image-color: #dfdfdf88 + icon-color: #dfdfdf $checked: - image-clip: 0 40 20 20 - color: #80c7f8 + image-clip: 0 46 22 23 + color: #dfdfdf $on !checked: - color: #F55E5E + color: #dfdfdf TabBarRounded < TabBar TabBarRoundedPanel < TabBarPanel @@ -107,7 +109,7 @@ TabBarVerticalButton < UIButton margin-top: 10 $hover !checked: color: white - icon-color: #cccccc + icon-color: #dfdfdf $disabled: icon-color: #333333 $checked: diff --git a/data/styles/30-minimap.otui b/data/styles/30-minimap.otui index 1bfa4c82..3a2c9b9e 100644 --- a/data/styles/30-minimap.otui +++ b/data/styles/30-minimap.otui @@ -146,7 +146,7 @@ MinimapFlagWindow < MainWindow anchors.left: parent.left anchors.top: prev.bottom margin-top: 6 - margin-left: 0 + margin-left: 0 MinimapFlagCheckBox id: flag1 @@ -190,7 +190,7 @@ MinimapFlagWindow < MainWindow anchors.left: parent.left anchors.top: prev.bottom margin-top: 6 - margin-left: 0 + margin-left: 0 MinimapFlagCheckBox id: flag11