BEAWARE all game functionality is disabled with this commit for a while
* rework client modules * hide main window when loading * remake top menu functions * rework modules autoload * improve path resolving for otml and lua * move core_widgets to core_lib * fix tooltip issues * split some styles * add bit32 lua library * fix assert issues * fix compilation on linux 32 systems * rework gcc compile options * renable and fix some warnings * remove unused constants * speedup sprite cache * move UIGame to lua (not funcional yet) * fix a lot of issues in x11 window * fix crash handler * add some warnings do uiwidget and much more...
@@ -4,15 +4,15 @@ Button < UIButton
|
||||
size: 106 24
|
||||
text-offset: 0 0
|
||||
image-color: white
|
||||
image-source: /core_styles/images/button.png
|
||||
image-source: /core_styles/styles/images/button.png
|
||||
image-border: 5
|
||||
|
||||
$hover !disabled:
|
||||
image-source: /core_styles/images/button_hover.png
|
||||
image-source: /core_styles/styles/images/button_hover.png
|
||||
|
||||
$pressed:
|
||||
text-offset: 1 1
|
||||
image-source: /core_styles/images/button_down.png
|
||||
image-source: /core_styles/styles/images/button_down.png
|
||||
|
||||
$disabled:
|
||||
color: #f0ad4d88
|
||||
@@ -20,7 +20,7 @@ Button < UIButton
|
||||
|
||||
ConsoleButton < UIButton
|
||||
size: 20 20
|
||||
image-source: /core_styles/images/tabbutton.png
|
||||
image-source: /core_styles/styles/images/tabbutton.png
|
||||
image-color: white
|
||||
image-clip: 0 0 20 20
|
||||
image-border: 2
|
||||
|
@@ -6,7 +6,7 @@ CheckBox < UICheckBox
|
||||
image-color: #ffffffff
|
||||
image-rect: 0 0 12 12
|
||||
image-offset: 0 2
|
||||
image-source: /core_styles/images/checkbox.png
|
||||
image-source: /core_styles/styles/images/checkbox.png
|
||||
|
||||
$hover !disabled:
|
||||
color: #cccccc
|
||||
@@ -30,7 +30,7 @@ CheckBox < UICheckBox
|
||||
ColorBox < UICheckBox
|
||||
size: 16 16
|
||||
image-color: #ffffffff
|
||||
image-source: /core_styles/images/colorbox.png
|
||||
image-source: /core_styles/styles/images/colorbox.png
|
||||
|
||||
$checked:
|
||||
image-clip: 16 0 16 16
|
||||
@@ -44,16 +44,16 @@ ButtonBox < UICheckBox
|
||||
size: 106 24
|
||||
text-offset: 0 0
|
||||
text-align: center
|
||||
image-source: /core_styles/images/button.png
|
||||
image-source: /core_styles/styles/images/button.png
|
||||
image-color: white
|
||||
image-border: 5
|
||||
|
||||
$hover !disabled:
|
||||
image-source: /core_styles/images/button_hover.png
|
||||
image-source: /core_styles/styles/images/button_hover.png
|
||||
|
||||
$checked:
|
||||
text-offset: 1 1
|
||||
image-source: /core_styles/images/button_down.png
|
||||
image-source: /core_styles/styles/images/button_down.png
|
||||
|
||||
$disabled:
|
||||
color: #f0ad4d88
|
||||
|
@@ -14,14 +14,14 @@ ComboBoxPopupMenuButton < UIButton
|
||||
color: #555555
|
||||
|
||||
ComboBoxPopupMenuSeparator < UIWidget
|
||||
image-source: /core_styles/images/combobox.png
|
||||
image-source: /core_styles/styles/images/combobox.png
|
||||
image-repeated: true
|
||||
image-clip: 1 59 89 1
|
||||
height: 1
|
||||
phantom: true
|
||||
|
||||
ComboBoxPopupMenu < UIPopupMenu
|
||||
image-source: /core_styles/images/combobox.png
|
||||
image-source: /core_styles/styles/images/combobox.png
|
||||
image-clip: 0 60 89 20
|
||||
image-border: 1
|
||||
image-border-top: 0
|
||||
@@ -33,7 +33,7 @@ ComboBox < UIComboBox
|
||||
size: 86 20
|
||||
text-offset: 3 0
|
||||
text-align: left
|
||||
image-source: /core_styles/images/combobox.png
|
||||
image-source: /core_styles/styles/images/combobox.png
|
||||
image-border: 1
|
||||
image-border-right: 17
|
||||
image-clip: 0 0 89 20
|
||||
|
@@ -1,8 +1,5 @@
|
||||
Creature < UICreature
|
||||
size: 80 80
|
||||
padding: 1
|
||||
image-source: /core_styles/images/panel_flat.png
|
||||
image-source: /core_styles/styles/images/panel_flat.png
|
||||
image-border: 1
|
||||
|
||||
UIWidget
|
||||
id: lala
|
||||
|
BIN
modules/core_styles/styles/images/button.png
Normal file
After Width: | Height: | Size: 825 B |
BIN
modules/core_styles/styles/images/button_down.png
Normal file
After Width: | Height: | Size: 833 B |
BIN
modules/core_styles/styles/images/button_hover.png
Normal file
After Width: | Height: | Size: 859 B |
BIN
modules/core_styles/styles/images/checkbox.png
Normal file
After Width: | Height: | Size: 548 B |
BIN
modules/core_styles/styles/images/colorbox.png
Normal file
After Width: | Height: | Size: 262 B |
BIN
modules/core_styles/styles/images/combobox.png
Normal file
After Width: | Height: | Size: 457 B |
BIN
modules/core_styles/styles/images/container_bg.png
Normal file
After Width: | Height: | Size: 34 KiB |
BIN
modules/core_styles/styles/images/horizontal_separator.png
Normal file
After Width: | Height: | Size: 151 B |
BIN
modules/core_styles/styles/images/horizotal_separator.png
Normal file
After Width: | Height: | Size: 152 B |
BIN
modules/core_styles/styles/images/item.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
modules/core_styles/styles/images/menu.png
Normal file
After Width: | Height: | Size: 262 B |
BIN
modules/core_styles/styles/images/menubox.png
Normal file
After Width: | Height: | Size: 241 B |
BIN
modules/core_styles/styles/images/panel_flat.png
Normal file
After Width: | Height: | Size: 179 B |
BIN
modules/core_styles/styles/images/progressbar.png
Normal file
After Width: | Height: | Size: 400 B |
BIN
modules/core_styles/styles/images/tabbutton.png
Normal file
After Width: | Height: | Size: 415 B |
BIN
modules/core_styles/styles/images/window.png
Normal file
After Width: | Height: | Size: 35 KiB |
@@ -1,5 +1,5 @@
|
||||
Item < UIItem
|
||||
size: 34 34
|
||||
image-source: /core_styles/images/item.png
|
||||
image-source: /core_styles/styles/images/item.png
|
||||
font: verdana-11px-rounded
|
||||
border-color: white
|
||||
|
@@ -5,8 +5,6 @@ Label < UILabel
|
||||
$disabled:
|
||||
color: #aaaaaa88
|
||||
|
||||
LargerLabel < Label
|
||||
|
||||
GameLabel < UILabel
|
||||
font: verdana-11px-antialised
|
||||
color: #aaaaaa
|
||||
|
@@ -3,7 +3,7 @@ LineEdit < UILineEdit
|
||||
color: #aaaaaa
|
||||
size: 86 20
|
||||
text-margin: 3
|
||||
image-source: /core_styles/images/panel_flat.png
|
||||
image-source: /core_styles/styles/images/panel_flat.png
|
||||
image-border: 1
|
||||
|
||||
$disabled:
|
||||
|
@@ -2,4 +2,4 @@ TextList < UIWidget
|
||||
layout: verticalBox
|
||||
border-width: 1
|
||||
border-color: #1d222b
|
||||
background-color: #222833
|
||||
background-color: #222833
|
||||
|
@@ -2,23 +2,5 @@ Panel < UIWidget
|
||||
phantom: true
|
||||
|
||||
FlatPanel < Panel
|
||||
image-source: /core_styles/images/panel_flat.png
|
||||
image-source: /core_styles/styles/images/panel_flat.png
|
||||
image-border: 1
|
||||
|
||||
TopPanel < Panel
|
||||
height: 36
|
||||
image-source: /core_styles/images/top_panel.png
|
||||
image-repeated: true
|
||||
|
||||
InterfacePanel < UIMiniWindowContainer
|
||||
image-source: /core_styles/images/interface_panel.png
|
||||
image-border: 4
|
||||
|
||||
InterfacePanel2 < Panel
|
||||
image-source: /core_styles/images/interface_panel2.png
|
||||
image-border: 4
|
||||
|
||||
Map < UIMap
|
||||
padding: 4
|
||||
image-source: /core_styles/images/map_panel.png
|
||||
image-border: 4
|
||||
|
@@ -17,7 +17,7 @@ PopupMenuButton < UIButton
|
||||
PopupMenuSeparator < UIWidget
|
||||
margin-left: 2
|
||||
margin-right: 2
|
||||
image-source: /core_styles/images/menubox.png
|
||||
image-source: /core_styles/styles/images/menubox.png
|
||||
image-border-left: 1
|
||||
image-border-right: 1
|
||||
image-clip: 0 0 32 2
|
||||
@@ -26,7 +26,7 @@ PopupMenuSeparator < UIWidget
|
||||
|
||||
PopupMenu < UIPopupMenu
|
||||
width: 50
|
||||
image-source: /core_styles/images/menubox.png
|
||||
image-source: /core_styles/styles/images/menubox.png
|
||||
image-border: 3
|
||||
padding-top: 3
|
||||
padding-bottom: 3
|
||||
|
@@ -2,6 +2,6 @@ ProgressBar < UIProgressBar
|
||||
height: 16
|
||||
background-color: red
|
||||
border: 1 black
|
||||
image: /core_styles/images/progressbar.png
|
||||
image: /core_styles/styles/images/progressbar.png
|
||||
image-border: 1
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
HorizontalSeparator < UIWidget
|
||||
image-source: /core_styles/images/horizontal_separator.png
|
||||
image-source: /core_styles/styles/images/horizontal_separator.png
|
||||
image-border-top: 2
|
||||
height: 2
|
||||
phantom: true
|
||||
|
@@ -3,7 +3,7 @@ SpinBox < UISpinBox
|
||||
color: #aaaaaa
|
||||
size: 86 20
|
||||
text-margin: 3
|
||||
image-source: /core_styles/images/panel_flat.png
|
||||
image-source: /core_styles/styles/images/panel_flat.png
|
||||
image-border: 1
|
||||
|
||||
$disabled:
|
||||
|
@@ -2,7 +2,7 @@ TabBar < UITabBar
|
||||
TabBarPanel < Panel
|
||||
TabBarButton < UIButton
|
||||
size: 20 20
|
||||
image-source: /core_styles/images/tabbutton.png
|
||||
image-source: /core_styles/styles/images/tabbutton.png
|
||||
image-color: white
|
||||
image-clip: 0 0 20 20
|
||||
image-border: 2
|
||||
|
@@ -5,7 +5,7 @@ Window < UIWindow
|
||||
color: white
|
||||
text-offset: 0 2
|
||||
text-align: top
|
||||
image-source: /core_styles/images/window.png
|
||||
image-source: /core_styles/styles/images/window.png
|
||||
image-border: 4
|
||||
image-border-top: 20
|
||||
opacity: 1
|
||||
@@ -35,7 +35,7 @@ MiniWindow < UIMiniWindow
|
||||
margin-left: 6
|
||||
margin-right: 6
|
||||
move-policy: free updated
|
||||
image-source: /core_styles/images/mini_window.png
|
||||
image-source: /core_styles/styles/images/mini_window.png
|
||||
image-border: 4
|
||||
image-border-top: 23
|
||||
padding: 25 8 2 8
|
||||
|