improvements to skins

modules/client_skins/skins/default.lua

@@ -1,7 +1,32 @@
 local skin = {
-	name = 'Default',
+  name = 'Default',
 
-	styles = {}
+  -- first font is default
+  fonts = {
+    'verdana-11px-antialised',
+    'verdana-11px-monochrome',
+    'verdana-11px-rounded',
+    'terminus-14px-bold'
+  },
+
+  styles = {
+    'buttons.otui',
+    'labels.otui',
+    'panels.otui',
+    'separators.otui',
+    'textedits.otui',
+    'checkboxes.otui',
+    'progressbars.otui',
+    'tabbars.otui',
+    'windows.otui',
+    'listboxes.otui',
+    'popupmenus.otui',
+    'comboboxes.otui',
+    'spinboxes.otui',
+    'messageboxes.otui',
+    'scrollbars.otui',
+    'splitters.otui'
+  }
 }
 
 Skins.installSkin(skin)

modules/client_skins/skins/default/fonts/terminus-14px-bold.otfont

@@ -0,0 +1,8 @@
+Font
+  name: terminus-14px-bold
+  height: 16
+  y-offset: 2
+  texture: terminus-14px-bold.png
+  glyph-size: 16 16
+  fixed-glyph-width: 8
+

modules/client_skins/skins/default/fonts/verdana-11px-antialised.otfont

@@ -0,0 +1,8 @@
+Font
+  name: verdana-11px-antialised
+  texture: verdana-11px-antialised.png
+  height: 14
+  glyph-size: 16 16
+
+  glyph-widths:
+    32: 4

modules/client_skins/skins/default/fonts/verdana-11px-monochrome.otfont

@@ -0,0 +1,8 @@
+Font
+  name: verdana-11px-monochrome
+  texture: verdana-11px-monochrome.png
+  height: 14
+  glyph-size: 16 16
+
+  glyph-widths:
+    32: 2

modules/client_skins/skins/default/fonts/verdana-11px-rounded.otfont

@@ -0,0 +1,232 @@
+Font
+  name: verdana-11px-rounded
+  texture: verdana-11px-rounded.png
+  height: 14
+  glyph-size: 16 16
+  spacing: -1 0
+
+  glyph-widths:
+    32: 4
+    33: 4
+    34: 7
+    35: 9
+    36: 8
+    37: 10
+    38: 10
+    39: 4
+    40: 6
+    41: 6
+    42: 8
+    43: 9
+    44: 4
+    45: 7
+    46: 4
+    47: 8
+    48: 8
+    49: 6
+    50: 8
+    51: 8
+    52: 8
+    53: 8
+    54: 8
+    55: 8
+    56: 8
+    57: 8
+    58: 5
+    59: 5
+    60: 10
+    61: 10
+    62: 10
+    63: 7
+    64: 10
+    65: 9
+    66: 8
+    67: 8
+    68: 9
+    69: 8
+    70: 8
+    71: 9
+    72: 9
+    73: 6
+    74: 7
+    75: 8
+    76: 8
+    77: 10
+    78: 9
+    79: 9
+    80: 8
+    81: 9
+    82: 9
+    83: 8
+    84: 10
+    85: 9
+    86: 8
+    87: 10
+    88: 8
+    89: 8
+    90: 8
+    91: 6
+    92: 8
+    93: 6
+    94: 11
+    95: 9
+    96: 7
+    97: 8
+    98: 8
+    99: 7
+    100: 8
+    101: 8
+    102: 7
+    103: 8
+    104: 8
+    105: 4
+    106: 6
+    107: 8
+    108: 4
+    109: 10
+    110: 8
+    111: 8
+    112: 8
+    113: 8
+    114: 7
+    115: 7
+    116: 7
+    117: 8
+    118: 8
+    119: 10
+    120: 8
+    121: 8
+    122: 7
+    123: 8
+    124: 5
+    125: 8
+    126: 9
+    127: 13
+    128: 8
+    129: 13
+    130: 4
+    131: 8
+    132: 6
+    133: 13
+    134: 8
+    135: 8
+    136: 7
+    137: 20
+    138: 8
+    139: 6
+    140: 13
+    141: 13
+    142: 7
+    143: 13
+    144: 13
+    145: 4
+    146: 4
+    147: 6
+    148: 6
+    149: 8
+    150: 8
+    151: 12
+    152: 7
+    153: 11
+    154: 7
+    155: 6
+    156: 13
+    157: 13
+    158: 7
+    159: 9
+    160: 4
+    161: 5
+    162: 8
+    163: 8
+    164: 8
+    165: 8
+    166: 7
+    167: 8
+    168: 7
+    169: 12
+    170: 7
+    171: 9
+    172: 11
+    173: 6
+    174: 12
+    175: 8
+    176: 7
+    177: 11
+    178: 7
+    179: 7
+    180: 7
+    181: 8
+    182: 8
+    183: 5
+    184: 7
+    185: 7
+    186: 7
+    187: 9
+    188: 15
+    189: 15
+    190: 15
+    191: 7
+    192: 10
+    193: 10
+    194: 10
+    195: 10
+    196: 10
+    197: 10
+    198: 13
+    199: 8
+    200: 7
+    201: 7
+    202: 7
+    203: 7
+    204: 5
+    205: 5
+    206: 5
+    207: 5
+    208: 10
+    209: 8
+    210: 9
+    211: 9
+    212: 9
+    213: 9
+    214: 9
+    215: 11
+    216: 9
+    217: 8
+    218: 9
+    219: 8
+    220: 8
+    221: 9
+    222: 9
+    223: 8
+    224: 8
+    225: 8
+    226: 8
+    227: 8
+    228: 8
+    229: 8
+    230: 12
+    231: 6
+    232: 8
+    233: 8
+    234: 8
+    235: 8
+    236: 5
+    237: 5
+    238: 3
+    239: 3
+    240: 8
+    241: 8
+    242: 8
+    243: 8
+    244: 8
+    245: 8
+    246: 8
+    247: 11
+    248: 8
+    249: 8
+    250: 8
+    251: 8
+    252: 8
+    253: 8
+    254: 8
+    255: 8

modules/client_skins/skins/default/styles/buttons.otui

@@ -0,0 +1,41 @@
+Button < UIButton
+  font: verdana-11px-antialised
+  color: #f0ad4dff
+  size: 106 22
+  text-offset: 0 0
+  image-source: /images/button.png
+  image-color: white
+  image-clip: 0 0 20 20
+  image-border: 2
+  padding: 5 10 5 10
+
+  $hover !disabled:
+    image-clip: 0 20 20 20
+
+  $pressed:
+    image-clip: 0 40 20 20
+    text-offset: 1 1
+
+  $disabled:
+    color: #f0ad4d88
+
+TabButton < UIButton
+  size: 20 20
+  image-source: /images/tabbutton.png
+  image-color: white
+  image-clip: 0 0 20 20
+  image-border: 2
+  icon-color: white
+  color: #aaaaaa
+
+  $hover !on:
+    image-clip: 0 20 20 20
+    color: white
+
+  $disabled:
+    image-color: #ffffff66
+    icon-color: #888888
+
+  $on:
+    image-clip: 0 40 20 20
+    color: #80c7f8

modules/client_skins/skins/default/styles/checkboxes.otui

@@ -0,0 +1,62 @@
+CheckBox < UICheckBox
+  size: 16 16
+  text-align: left
+  text: aa
+  text-offset: 16 0
+  color: #aaaaaa
+  image-color: #ffffffff
+  image-rect: 0 0 12 12
+  image-offset: 0 2
+  image-source: /images/checkbox.png
+
+  $hover !disabled:
+    color: #cccccc
+
+  $!checked:
+    image-clip: 0 0 12 12
+
+  $hover !checked:
+    image-clip: 0 12 12 12
+
+  $checked:
+    image-clip: 0 24 12 12
+
+  $hover checked:
+    image-clip: 0 36 12 12
+
+  $disabled:
+    image-color: #ffffff88
+    color: #aaaaaa88
+
+ColorBox < UICheckBox
+  size: 16 16
+  image-color: #ffffffff
+  image-source: /images/colorbox.png
+
+  $checked:
+    image-clip: 16 0 16 16
+
+  $!checked:
+    image-clip: 0 0 16 16
+
+ButtonBox < UICheckBox
+  font: verdana-11px-antialised
+  color: #ffffffff
+  size: 106 22
+  text-offset: 0 0
+  text-align: center
+  image-source: /images/tabbutton.png
+  image-color: white
+  image-clip: 0 0 20 20
+  image-border: 2
+
+  $hover !disabled:
+    image-clip: 0 20 20 20
+
+  $checked:
+    image-clip: 0 40 20 20
+    color: #80c7f8
+
+  $disabled:
+    color: #666666ff
+    image-color: #ffffff88

modules/client_skins/skins/default/styles/comboboxes.otui

@@ -0,0 +1,45 @@
+ComboBoxPopupMenuButton < UIButton
+  height: 18
+  font: verdana-11px-antialised
+  text-align: left
+  text-offset: 2 0
+  color: #aaaaaa
+  background-color: alpha
+
+  $hover !disabled:
+    color: #ffffff
+    background-color: #ffffff44
+
+  $disabled:
+    color: #555555
+
+ComboBoxPopupMenuSeparator < UIWidget
+  image-source: /images/combobox.png
+  image-repeated: true
+  image-clip: 1 59 89 1
+  height: 1
+  phantom: true
+
+ComboBoxPopupMenu < UIPopupMenu
+  image-source: /images/combobox.png
+  image-clip: 0 60 89 20
+  image-border: 1
+  image-border-top: 0
+  padding: 1
+
+ComboBox < UIComboBox
+  font: verdana-11px-antialised
+  color: #aaaaaa
+  size: 86 20
+  text-offset: 3 0
+  text-align: left
+  image-source: /images/combobox.png
+  image-border: 1
+  image-border-right: 17
+  image-clip: 0 0 89 20
+
+  $hover !disabled:
+    image-clip: 0 20 89 20
+
+  $on:
+    image-clip: 0 40 89 20

modules/client_skins/skins/default/styles/labels.otui

@@ -0,0 +1,22 @@
+Label < UILabel
+  font: verdana-11px-antialised
+  color: #bbbbbb
+
+  $disabled:
+    color: #bbbbbb88
+
+FlatLabel < UILabel
+  font: verdana-11px-antialised
+  color: #aaaaaa
+  size: 86 20
+  text-offset: 3 3
+  text-margin: 3
+  image-source: /images/panel_flat.png
+  image-border: 1
+
+  $disabled:
+    color: #aaaaaa88
+
+GameLabel < UILabel
+  font: verdana-11px-antialised
+  color: #bbbbbb

modules/client_skins/skins/default/styles/listboxes.otui

@@ -0,0 +1,5 @@
+TextList < UIScrollArea
+  layout: verticalBox
+  border-width: 1
+  border-color: #1d222b
+  background-color: #222833

modules/client_skins/skins/default/styles/messageboxes.otui

@@ -0,0 +1,19 @@
+MessageBoxWindow < MainWindow
+  id: messageBoxWindow
+  anchors.centerIn: parent
+  height: 60
+  width: 80
+  padding-bottom: 10
+  padding-right: 10
+
+MessageBoxLabel < Label
+  id: messageBoxLabel
+  anchors.horizontalCenter: parent.horizontalCenter
+  anchors.top: parent.top
+
+MessageBoxRightButton < Button
+  id: messageBoxRightButton
+  anchors.bottom: parent.bottom
+  anchors.right: parent.right
+  width: 64
+  visible: true

modules/client_skins/skins/default/styles/panels.otui

@@ -0,0 +1,13 @@
+Panel < UIWidget
+  phantom: true
+
+ScrollablePanel < UIScrollArea
+  phantom: true
+
+FlatPanel < Panel
+  image-source: /images/panel_flat.png
+  image-border: 1
+
+ScrollableFlatPanel < ScrollablePanel
+  image-source: /images/panel_flat.png
+  image-border: 1

modules/client_skins/skins/default/styles/popupmenus.otui

@@ -0,0 +1,32 @@
+PopupMenuButton < UIButton
+  height: 18
+  margin-left: 3
+  margin-right: 3
+  font: verdana-11px-antialised
+
+  color: #aaaaaa
+  background-color: alpha
+
+  $hover !disabled:
+    color: #ffffff
+    background-color: #ffffff44
+
+  $disabled:
+    color: #555555
+
+PopupMenuSeparator < UIWidget
+  margin-left: 2
+  margin-right: 2
+  image-source: images/menubox.png
+  image-border-left: 1
+  image-border-right: 1
+  image-clip: 0 0 32 2
+  height: 2
+  phantom: true
+
+PopupMenu < UIPopupMenu
+  width: 50
+  image-source: images/menubox.png
+  image-border: 3
+  padding-top: 3
+  padding-bottom: 3

modules/client_skins/skins/default/styles/progressbars.otui

@@ -0,0 +1,13 @@
+ProgressBar < UIProgressBar
+  height: 16
+  background-color: red
+  border: 1 black
+  image-source: /images/progressbar.png
+  image-border: 1
+
+ProgressRect < UIProgressRect
+  anchors.fill: parent
+  phantom: true
+  color: white
+  background-color: #00000088
+  font: verdana-11px-rounded

modules/client_skins/skins/default/styles/scrollbars.otui

@@ -0,0 +1,95 @@
+ScrollBarSlider < UIButton
+  id: sliderButton
+  anchors.centerIn: parent
+  size: 13 13
+  image-source: /images/scrollbar.png
+  image-clip: 0 26 13 13
+  image-border: 2
+  image-color: #ffffffff
+  $hover:
+    image-clip: 13 26 13 13
+  $pressed:
+    image-clip: 26 26 13 13
+  $disabled:
+    image-color: #ffffff66
+
+VerticalScrollBar < UIScrollBar
+  orientation: vertical
+  width: 13
+  height: 39
+  image-source: /images/scrollbar.png
+  image-clip: 39 0 13 65
+  image-border: 1
+  pixels-scroll: true
+
+  UIButton
+    id: decrementButton
+    anchors.top: parent.top
+    anchors.left: parent.left
+    image-source: /images/scrollbar.png
+    image-clip: 0 0 13 13
+    image-color: #ffffffff
+    size: 13 13
+    $hover:
+      image-clip: 13 0 13 13
+    $pressed:
+      image-clip: 26 0 13 13
+    $disabled:
+      image-color: #ffffff66
+
+  UIButton
+    id: incrementButton
+    anchors.bottom: parent.bottom
+    anchors.right: parent.right
+    size: 13 13
+    image-source: /images/scrollbar.png
+    image-clip: 0 13 13 13
+    image-color: #ffffffff
+    $hover:
+      image-clip: 13 13 13 13
+    $pressed:
+      image-clip: 26 13 13 13
+    $disabled:
+      image-color: #ffffff66
+
+  ScrollBarSlider
+
+HorizontalScrollBar < UIScrollBar
+  orientation: horizontal
+  height: 13
+  width: 39
+  image-source: /images/scrollbar.png
+  image-clip: 0 65 52 13
+  image-border: 1
+
+  UIButton
+    id: decrementButton
+    anchors.top: parent.top
+    anchors.left: parent.left
+    image-source: /images/scrollbar.png
+    image-clip: 0 39 13 13
+    image-color: #ffffffff
+    size: 13 13
+    $hover:
+      image-clip: 13 39 13 13
+    $pressed:
+      image-clip: 26 39 13 13
+    $disabled:
+      image-color: #ffffff66
+
+  UIButton
+    id: incrementButton
+    anchors.bottom: parent.bottom
+    anchors.right: parent.right
+    size: 13 13
+    image-source: /images/scrollbar.png
+    image-clip: 0 52 13 13
+    image-color: #ffffffff
+    $hover:
+      image-clip: 13 52 13 13
+    $pressed:
+      image-clip: 26 52 13 13
+    $disabled:
+      image-color: #ffffff66
+
+  ScrollBarSlider

modules/client_skins/skins/default/styles/separators.otui

@@ -0,0 +1,13 @@
+HorizontalSeparator < UIWidget
+  image-source: /images/horizontal_separator.png
+  image-border-top: 2
+  height: 2
+  phantom: true
+  focusable: false
+
+VerticalSeparator < UIWidget
+  image-source: /images/horizontal_separator.png
+  image-border-left: 2
+  width: 2
+  phantom: true
+  focusable: false

modules/client_skins/skins/default/styles/spinboxes.otui

@@ -0,0 +1,11 @@
+SpinBox < UISpinBox
+  font: verdana-11px-antialised
+  color: #aaaaaa
+  size: 86 20
+  text-offset: 0 3
+  text-margin: 3
+  image-source: images/panel_flat.png
+  image-border: 1
+
+  $disabled:
+    color: #aaaaaa88

modules/client_skins/skins/default/styles/splitters.otui

@@ -0,0 +1,9 @@
+Splitter < UISplitter
+  size: 4 4
+  opacity: 0
+  background: #ffffff44
+
+ResizeBorder < UIResizeBorder
+  size: 4 4
+  opacity: 0
+  background: #ffffff44

modules/client_skins/skins/default/styles/tabbars.otui

@@ -0,0 +1,35 @@
+TabBar < UITabBar
+  size: 80 20
+TabBarPanel < Panel
+TabBarButton < UIButton
+  size: 20 20
+  image-source: /images/tabbutton.png
+  image-color: white
+  image-clip: 0 0 20 20
+  image-border: 2
+  icon-color: white
+  color: #aaaaaa
+  anchors.top: parent.top
+  padding: 5
+
+  $first:
+    anchors.left: parent.left
+
+  $!first:
+    anchors.left: prev.right
+    margin-left: 5
+
+  $hover !checked:
+    image-clip: 0 20 20 20
+    color: white
+
+  $disabled:
+    image-color: #ffffff66
+    icon-color: #888888
+
+  $checked:
+    image-clip: 0 40 20 20
+    color: #80c7f8
+
+  $on !checked:
+    color: #F55E5E

modules/client_skins/skins/default/styles/textedits.otui

@@ -0,0 +1,17 @@
+TextEdit < UITextEdit
+  font: verdana-11px-antialised
+  color: #aaaaaa
+  size: 86 20
+  text-offset: 0 3
+  text-margin: 3
+  image-source: /images/panel_flat.png
+  image-border: 1
+
+  $disabled:
+    color: #aaaaaa88
+
+PasswordTextEdit < TextEdit
+  text-hidden: true
+
+MultilineTextEdit < TextEdit
+  multiline: true

modules/client_skins/skins/default/styles/windows.otui

@@ -0,0 +1,24 @@
+Window < UIWindow
+  font: verdana-11px-antialised
+  size: 200 200
+  opacity: 1
+  color: white
+  text-offset: 0 4
+  text-align: top
+  image-source: /images/window.png
+  image-border: 5
+  image-border-top: 22
+  opacity: 1
+  padding-top: 30
+  padding-left: 16
+  padding-right: 16
+  padding-bottom: 16
+
+  $disabled:
+    color: #aaaaaa88
+
+  $dragging:
+    opacity: 0.8
+
+MainWindow < Window
+  anchors.centerIn: parent

modules/client_skins/skins/example.lua

@@ -1,6 +1,8 @@
 local skin = {
 	name = 'Example',
 
+	fonts = {},
+
 	styles = {
 		'topmenu.otui'
 	}