This commit is contained in:
Eduardo Bart 2014-07-02 13:20:02 -03:00
parent f0ed0bad13
commit 07f8e6fca9
46 changed files with 134 additions and 130 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 470 B

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 646 B

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -1,44 +1,45 @@
Button < UIButton Button < UIButton
font: verdana-11px-antialised font: verdana-11px-antialised
color: #f0ad4dff color: #dfdfdfff
size: 106 22 size: 106 23
text-offset: 0 0 text-offset: 0 0
image-source: /images/ui/button_rounded image-source: /images/ui/button
image-color: white image-color: #dfdfdf
image-clip: 0 0 20 20 image-clip: 0 0 22 23
image-border: 3 image-border: 3
padding: 5 10 5 10 padding: 5 10 5 10
$hover !disabled: $hover !disabled:
image-clip: 0 20 20 20 image-clip: 0 23 22 23
$pressed: $pressed:
image-clip: 0 40 20 20 image-clip: 0 46 22 23
text-offset: 1 1 text-offset: 1 1
$disabled: $disabled:
color: #f0ad4d88 color: #dfdfdf88
opacity: 0.8
TabButton < UIButton TabButton < UIButton
size: 20 20 size: 22 23
image-source: /images/ui/tabbutton_rounded image-source: /images/ui/tabbutton_rounded
image-color: white image-color: #dfdfdf
image-clip: 0 0 20 20 image-clip: 0 0 22 23
image-border: 3 image-border: 3
icon-color: white icon-color: #dfdfdf
color: #aaaaaa color: #dfdfdf
$hover !on: $hover !on:
image-clip: 0 20 20 20 image-clip: 0 23 22 23
color: white color: #dfdfdf
$disabled: $disabled:
image-color: #ffffff66 image-color: #dfdfdf66
icon-color: #888888 icon-color: #dfdfdf
$on: $on:
image-clip: 0 40 20 20 image-clip: 0 46 22 23
color: #80c7f8 color: #dfdfdf
NextButton < UIButton NextButton < UIButton
size: 12 21 size: 12 21
@ -52,7 +53,7 @@ NextButton < UIButton
image-clip: 12 21 12 21 image-clip: 12 21 12 21
$disabled: $disabled:
image-color: #ffffff55 image-color: #dfdfdf55
PreviousButton < UIButton PreviousButton < UIButton
size: 12 21 size: 12 21
@ -66,18 +67,18 @@ PreviousButton < UIButton
image-clip: 0 21 12 21 image-clip: 0 21 12 21
$disabled: $disabled:
image-color: #ffffff55 image-color: #dfdfdf55
AddButton < UIButton AddButton < UIButton
size: 20 20 size: 20 20
image-source: /images/ui/icon_add image-source: /images/ui/icon_add
image-color: #ffffffff image-color: #dfdfdfff
$hover !disabled: $hover !disabled:
image-color: #ffffff99 image-color: #dfdfdf99
$pressed: $pressed:
image-color: #ffffff44 image-color: #dfdfdf44
$disabled: $disabled:
image-color: #ffffff55 image-color: #dfdfdf55

View File

@ -1,35 +1,35 @@
CheckBox < UICheckBox CheckBox < UICheckBox
size: 16 16 size: 16 16
text-align: left text-align: left
text-offset: 16 0 text-offset: 18 1
color: #aaaaaa color: #dfdfdf
image-color: #ffffffff image-color: #dfdfdfff
image-rect: 0 0 12 12 image-rect: 0 0 15 15
image-offset: 0 2
image-source: /images/ui/checkbox image-source: /images/ui/checkbox
$hover !disabled: $hover !disabled:
color: #cccccc color: #ffffff
$!checked: $!checked:
image-clip: 0 0 12 12 image-clip: 0 0 15 15
$hover !checked: $hover !checked:
image-clip: 0 12 12 12 image-clip: 0 15 15 15
$checked: $checked:
image-clip: 0 24 12 12 image-clip: 0 30 15 15
$hover checked: $hover checked:
image-clip: 0 36 12 12 image-clip: 0 45 15 15
$disabled: $disabled:
image-color: #ffffff88 image-color: #dfdfdf88
color: #aaaaaa88 color: #dfdfdf88
opacity: 0.8
ColorBox < UICheckBox ColorBox < UICheckBox
size: 16 16 size: 16 16
image-color: #ffffffff image-color: #dfdfdfff
image-source: /images/ui/colorbox image-source: /images/ui/colorbox
$checked: $checked:
@ -40,26 +40,25 @@ ColorBox < UICheckBox
ButtonBox < UICheckBox ButtonBox < UICheckBox
font: verdana-11px-antialised font: verdana-11px-antialised
color: #ffffffff color: #dfdfdfff
size: 106 22 size: 106 23
text-offset: 0 0 text-offset: 0 0
text-align: center text-align: center
image-source: /images/ui/tabbutton_rounded image-source: /images/ui/button
image-color: white image-color: #dfdfdf
image-clip: 0 0 20 20 image-clip: 0 0 22 23
image-border: 3 image-border: 3
$hover !disabled: $hover !disabled:
image-clip: 0 20 20 20 image-clip: 0 23 22 23
$checked: $checked:
image-clip: 0 40 20 20 image-clip: 0 46 22 23
color: #80c7f8 color: #dfdfdf
$disabled: $disabled:
color: #666666ff color: #dfdfdf88
image-color: #ffffff88 image-color: #dfdfdf88
ButtonBoxRounded < ButtonBox ButtonBoxRounded < ButtonBox
image-source: /images/ui/tabbutton_rounded image-source: /images/ui/button_rounded
image-border: 2

View File

@ -1,62 +1,65 @@
ComboBoxPopupMenuButton < UIButton ComboBoxPopupMenuButton < UIButton
height: 20 height: 23
font: verdana-11px-antialised font: verdana-11px-antialised
text-align: left text-align: left
text-offset: 4 0 text-offset: 4 0
color: #aaaaaa color: #dfdfdf
background-color: alpha background-color: alpha
margin: 1
$hover !disabled: $hover !disabled:
color: #ffffff color: #dfdfdf
background-color: #ffffff44 background-color: #355d89
$disabled: $disabled:
color: #555555 color: #dfdfdf88
ComboBoxPopupMenu < UIPopupMenu ComboBoxPopupMenu < UIPopupMenu
image-source: /images/ui/combobox_square image-source: /images/ui/combobox_square
image-clip: 0 60 89 20 image-clip: 0 69 91 23
image-border-left: 1 image-border: 1
image-border-right: 1
ComboBox < UIComboBox ComboBox < UIComboBox
font: verdana-11px-antialised font: verdana-11px-antialised
color: #aaaaaa color: #dfdfdf
size: 89 20 size: 91 23
text-offset: 3 0 text-offset: 3 0
text-align: left text-align: left
image-source: /images/ui/combobox_square image-source: /images/ui/combobox_square
image-border: 1 image-border: 3
image-border-right: 17 image-border-right: 19
image-clip: 0 0 89 20 image-clip: 0 0 91 23
$hover !disabled: $hover !disabled:
image-clip: 0 20 89 20 image-clip: 0 23 91 23
$on: $on:
image-clip: 0 40 89 20 image-clip: 0 46 91 23
$disabled:
color: #dfdfdf88
opacity: 0.8
ComboBoxRoundedPopupMenuButton < UIButton ComboBoxRoundedPopupMenuButton < UIButton
height: 20 height: 23
font: verdana-11px-antialised font: verdana-11px-antialised
text-align: left text-align: left
text-offset: 4 0 text-offset: 4 0
color: #aaaaaa color: #dfdfdf
background-color: alpha background-color: alpha
$hover !disabled: $hover !disabled:
color: #ffffff color: #ffffff
background-color: #ffffff44 background-color: #355d89
$disabled: $disabled:
color: #555555 color: #dfdfdf88
ComboBoxRoundedPopupMenu < UIPopupMenu ComboBoxRoundedPopupMenu < UIPopupMenu
image-source: /images/ui/combobox_rounded image-source: /images/ui/combobox_rounded
image-clip: 0 60 89 20 image-clip: 0 69 91 23
image-border-left: 1 image-border: 3
image-border-right: 1
ComboBoxRounded < ComboBox ComboBoxRounded < ComboBox
image-source: /images/ui/combobox_rounded image-source: /images/ui/combobox_rounded
image-border: 2 image-border: 3

View File

@ -1,23 +1,23 @@
Label < UILabel Label < UILabel
font: verdana-11px-antialised font: verdana-11px-antialised
color: #bbbbbb color: #dfdfdf
$disabled: $disabled:
color: #bbbbbb88 color: #dfdfdf88
FlatLabel < UILabel FlatLabel < UILabel
font: verdana-11px-antialised font: verdana-11px-antialised
color: #aaaaaa color: #dfdfdf
size: 86 20 size: 86 20
text-offset: 3 3 text-offset: 3 3
image-source: /images/ui/panel_flat image-source: /images/ui/panel_flat
image-border: 1 image-border: 1
$disabled: $disabled:
color: #aaaaaa88 color: #dfdfdf88
MenuLabel < Label MenuLabel < Label
GameLabel < UILabel GameLabel < UILabel
font: verdana-11px-antialised font: verdana-11px-antialised
color: #bbbbbb color: #dfdfdf

View File

@ -1,19 +1,19 @@
TextList < UIScrollArea TextList < UIScrollArea
layout: verticalBox layout: verticalBox
border-width: 1 border-width: 1
border-color: #1d222b border-color: #272727
background-color: #222833 background-color: #636363
padding: 1 padding: 1
auto-focus: none auto-focus: none
HorizontalList < UIScrollArea HorizontalList < UIScrollArea
layout: horizontalBox layout: horizontalBox
border-width: 1 border-width: 1
border-color: #1d222b border-color: #272727
background-color: #222833 background-color: #636363
VerticalList < UIScrollArea VerticalList < UIScrollArea
layout: verticalBox layout: verticalBox
border-width: 1 border-width: 1
border-color: #1d222b border-color: #272727
background-color: #222833 background-color: #636363

View File

@ -10,7 +10,6 @@ ScrollBarSlider < UIButton
image-clip: 13 26 13 13 image-clip: 13 26 13 13
$pressed: $pressed:
image-clip: 26 26 13 13 image-clip: 26 26 13 13
image-color: #ffffff99
$disabled: $disabled:
image-color: #ffffff66 image-color: #ffffff66

View File

@ -1,13 +1,13 @@
HorizontalSeparator < UIWidget HorizontalSeparator < UIWidget
image-source: /images/ui/separator_horizontal image-source: /images/ui/separator_horizontal
image-border-top: 2 image-border: 1
height: 2 height: 2
phantom: true phantom: true
focusable: false focusable: false
VerticalSeparator < UIWidget VerticalSeparator < UIWidget
image-source: /images/ui/separator_vertical image-source: /images/ui/separator_vertical
image-border-left: 2 image-border: 1
width: 2 width: 2
phantom: true phantom: true
focusable: false focusable: false

View File

@ -1,15 +1,16 @@
TextEdit < UITextEdit TextEdit < UITextEdit
font: verdana-11px-antialised font: verdana-11px-antialised
color: #aaaaaa color: #272727
size: 86 20 size: 86 22
text-offset: 0 3 text-offset: 0 4
padding: 3 padding: 4
image-source: /images/ui/textedit image-source: /images/ui/textedit
image-border: 1 image-border: 1
selection-color: #111416 selection-color: #272727
selection-background-color: #999999 selection-background-color: #cccccc
$disabled: $disabled:
color: #aaaaaa88 color: #27272788
opacity: 0.5
PasswordTextEdit < TextEdit PasswordTextEdit < TextEdit
text-hidden: true text-hidden: true

View File

@ -2,20 +2,19 @@ Window < UIWindow
font: verdana-11px-antialised font: verdana-11px-antialised
size: 200 200 size: 200 200
opacity: 1 opacity: 1
color: white color: #dfdfdf
text-offset: 0 4 text-offset: 0 6
text-align: top text-align: top
image-source: /images/ui/window image-source: /images/ui/window
image-border: 5 image-border: 6
image-border-top: 22 image-border-top: 27
opacity: 1 padding-top: 36
padding-top: 30
padding-left: 16 padding-left: 16
padding-right: 16 padding-right: 16
padding-bottom: 16 padding-bottom: 16
$disabled: $disabled:
color: #aaaaaa88 color: #dfdfdf88
$dragging: $dragging:
opacity: 0.8 opacity: 0.8

View File

@ -1,47 +1,49 @@
MoveableTabBar < UIMoveableTabBar MoveableTabBar < UIMoveableTabBar
size: 80 20 size: 80 21
MoveableTabBarPanel < Panel MoveableTabBarPanel < Panel
MoveableTabBarButton < UIButton MoveableTabBarButton < UIButton
size: 20 20 size: 20 21
image-source: /images/ui/tabbutton_square image-source: /images/ui/tabbutton_square
image-color: white image-color: #dfdfdf
image-clip: 0 0 20 20 image-clip: 0 0 20 21
image-border: 3 image-border: 3
icon-color: white image-border-bottom: 0
color: #aaaaaa icon-color: #dfdfdf
color: #dfdfdf
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
padding: 5 padding: 5
$hover !checked: $hover !checked:
image-clip: 0 20 20 20 image-clip: 0 21 20 21
color: white color: #dfdfdf
$disabled: $disabled:
image-color: #ffffff66 image-color: #dfdfdf88
icon-color: #888888 icon-color: #dfdfdf
$checked: $checked:
image-clip: 0 40 20 20 image-clip: 0 42 20 21
color: #D8E7F0 color: #dfdfdf
$on !checked: $on !checked:
color: #F55E5E color: #dfdfdf
TabBar < UITabBar TabBar < UITabBar
size: 80 20 size: 80 21
Panel Panel
id: buttonsPanel id: buttonsPanel
anchors.fill: parent anchors.fill: parent
TabBarPanel < Panel TabBarPanel < Panel
TabBarButton < UIButton TabBarButton < UIButton
size: 20 20 size: 22 23
image-source: /images/ui/tabbutton_square image-source: /images/ui/tabbutton_square
image-color: white image-color: #dfdfdf
image-clip: 0 0 20 20 image-clip: 0 0 22 23
image-border: 3 image-border: 3
icon-color: white image-border-bottom: 0
color: #aaaaaa icon-color: #dfdfdf
color: #dfdfdf
anchors.top: parent.top anchors.top: parent.top
padding: 5 padding: 5
@ -53,19 +55,19 @@ TabBarButton < UIButton
margin-left: 5 margin-left: 5
$hover !checked: $hover !checked:
image-clip: 0 20 20 20 image-clip: 0 23 22 23
color: white color: #dfdfdf
$disabled: $disabled:
image-color: #ffffff66 image-color: #dfdfdf88
icon-color: #888888 icon-color: #dfdfdf
$checked: $checked:
image-clip: 0 40 20 20 image-clip: 0 46 22 23
color: #80c7f8 color: #dfdfdf
$on !checked: $on !checked:
color: #F55E5E color: #dfdfdf
TabBarRounded < TabBar TabBarRounded < TabBar
TabBarRoundedPanel < TabBarPanel TabBarRoundedPanel < TabBarPanel
@ -107,7 +109,7 @@ TabBarVerticalButton < UIButton
margin-top: 10 margin-top: 10
$hover !checked: $hover !checked:
color: white color: white
icon-color: #cccccc icon-color: #dfdfdf
$disabled: $disabled:
icon-color: #333333 icon-color: #333333
$checked: $checked:

View File

@ -146,7 +146,7 @@ MinimapFlagWindow < MainWindow
anchors.left: parent.left anchors.left: parent.left
anchors.top: prev.bottom anchors.top: prev.bottom
margin-top: 6 margin-top: 6
margin-left: 0 margin-left: 0
MinimapFlagCheckBox MinimapFlagCheckBox
id: flag1 id: flag1
@ -190,7 +190,7 @@ MinimapFlagWindow < MainWindow
anchors.left: parent.left anchors.left: parent.left
anchors.top: prev.bottom anchors.top: prev.bottom
margin-top: 6 margin-top: 6
margin-left: 0 margin-left: 0
MinimapFlagCheckBox MinimapFlagCheckBox
id: flag11 id: flag11