Merge DropDownButtons

This commit is contained in:
Paul Chote
2011-05-17 20:44:48 +12:00
parent 58e3a1f41e
commit 42d8722cbc
9 changed files with 175 additions and 183 deletions

View File

@@ -67,7 +67,7 @@ Container@SERVER_LOBBY:
Width:150
Height:25
MaxLength:16
CncDropDownButton@COLOR:
DropDownButton@COLOR:
Id:COLOR
Width:80
Height:25
@@ -80,7 +80,7 @@ Container@SERVER_LOBBY:
Y:6
Width:PARENT_RIGHT-35
Height:PARENT_BOTTOM-12
CncDropDownButton@FACTION:
DropDownButton@FACTION:
Id:FACTION
Width:130
Height:25
@@ -100,7 +100,7 @@ Container@SERVER_LOBBY:
Height:25
X:40
Y:0
CncDropDownButton@TEAM:
DropDownButton@TEAM:
Id:TEAM
Text:Team
Width:48
@@ -234,7 +234,7 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
CncDropDownButton@NAME:
DropDownButton@NAME:
Id:NAME
Text:Name
Width:150

View File

@@ -40,7 +40,7 @@ Container@SETTINGS_PANEL:
Width:205
Height:25
MaxLength:16
CncDropDownButton@COLOR:
DropDownButton@COLOR:
Id:COLOR_DROPDOWN
X:275
Y:40
@@ -106,7 +106,7 @@ Container@SETTINGS_PANEL:
Height:25
Align:Right
Text:Mode:
CncDropDownButton@MODE_DROPDOWN:
DropDownButton@MODE_DROPDOWN:
Id:MODE_DROPDOWN
X:425
Y:40
@@ -256,7 +256,7 @@ Container@SETTINGS_PANEL:
Font:Regular
Text:Middle-Mouse Scrolling:
Align:Right
CncDropDownButton@MOUSE_SCROLL:
DropDownButton@MOUSE_SCROLL:
Id:MOUSE_SCROLL
X:180
Y:180
@@ -272,7 +272,7 @@ Container@SETTINGS_PANEL:
# Font:Regular
# Text:Multitouch Scrolling:
# Align:Right
# CncDropDownButton@MULTITOUCH_SCROLL:
# DropDownButton@MULTITOUCH_SCROLL:
# Id:MULTITOUCH_SCROLL
# X:180
# Y:210
@@ -303,7 +303,7 @@ Container@SETTINGS_PANEL:
Font:Regular
Text:Group Addition Modifier:
Align:Right
CncDropDownButton@GROUPADD_MODIFIER:
DropDownButton@GROUPADD_MODIFIER:
Id:GROUPADD_MODIFIER
X:540
Y:65