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...
@@ -3,11 +3,16 @@ Module
|
||||
description: Contains ui styles used by other modules
|
||||
author: OTClient team
|
||||
website: https://github.com/edubart/otclient
|
||||
reloadable: true
|
||||
autoload: true
|
||||
autoload-antecedence: 20
|
||||
autoload-priority: 20
|
||||
|
||||
@onLoad: |
|
||||
importFont 'fonts/verdana-11px-antialised'
|
||||
importFont 'fonts/verdana-11px-monochrome'
|
||||
importFont 'fonts/verdana-11px-rounded'
|
||||
importFont 'fonts/terminus-14px-bold'
|
||||
setDefaultFont 'verdana-11px-antialised'
|
||||
|
||||
onLoad: |
|
||||
importStyle 'styles/buttons.otui'
|
||||
importStyle 'styles/labels.otui'
|
||||
importStyle 'styles/panels.otui'
|
||||
|
||||
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 266 B |
8
modules/core_styles/fonts/terminus-14px-bold.otfont
Normal file
@@ -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
|
||||
|
||||
BIN
modules/core_styles/fonts/terminus-14px-bold.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
8
modules/core_styles/fonts/verdana-11px-antialised.otfont
Normal file
@@ -0,0 +1,8 @@
|
||||
Font
|
||||
name: verdana-11px-antialised
|
||||
texture: verdana-11px-antialised.png
|
||||
height: 14
|
||||
glyph-size: 16 16
|
||||
|
||||
glyph-widths:
|
||||
32: 4
|
||||
BIN
modules/core_styles/fonts/verdana-11px-antialised.png
Normal file
|
After Width: | Height: | Size: 9.8 KiB |
8
modules/core_styles/fonts/verdana-11px-monochrome.otfont
Normal file
@@ -0,0 +1,8 @@
|
||||
Font
|
||||
name: verdana-11px-monochrome
|
||||
texture: verdana-11px-monochrome.png
|
||||
height: 14
|
||||
glyph-size: 16 16
|
||||
|
||||
glyph-widths:
|
||||
32: 2
|
||||
BIN
modules/core_styles/fonts/verdana-11px-monochrome.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
232
modules/core_styles/fonts/verdana-11px-rounded.otfont
Normal file
@@ -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
|
||||
BIN
modules/core_styles/fonts/verdana-11px-rounded.png
Normal file
|
After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 696 B |
|
Before Width: | Height: | Size: 331 B |
|
Before Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 426 B |
|
Before Width: | Height: | Size: 4.3 KiB |
@@ -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
|
||||
|
||||
|
Before Width: | Height: | Size: 825 B After Width: | Height: | Size: 825 B |
|
Before Width: | Height: | Size: 833 B After Width: | Height: | Size: 833 B |
|
Before Width: | Height: | Size: 859 B After Width: | Height: | Size: 859 B |
|
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 548 B |
|
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 457 B |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 152 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 241 B After Width: | Height: | Size: 241 B |
|
Before Width: | Height: | Size: 179 B After Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 400 B |
|
Before Width: | Height: | Size: 415 B After Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 35 KiB 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
|
||||
|
||||