Merge remote-tracking branch 'origin/master' into samual/combined_updates

[xonotic/xonotic-data.pk3dir.git] / gfx / menu / wickedx / skinvalues.txt

diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
old mode 100755 (executable)
new mode 100644 (file)
index d6b7197..00a0263
--- a/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
@@ -1,4 +1,4 @@
-title Default // "WickedX"
+title WickedX
 author sev
 
 // Colors: 'Red Green Blue'
@@ -23,7 +23,7 @@ MARGIN_COLORPICKER              '0 0 0'
 //   uses "border" images
 //   uses "closebutton" images
 MARGIN_TOP                      8
-MARGIN_BOTTOM                   8
+MARGIN_BOTTOM                   16
 MARGIN_LEFT                     16
 MARGIN_RIGHT                    16
 MARGIN_COLUMNS                  4
@@ -96,8 +96,8 @@ WIDTH_CREDITS                   0.5
 ALPHA_CVARLIST_SAVED            1
 ALPHA_CVARLIST_TEMPORARY        0.7    
 COLOR_CVARLIST_CHANGED          '0 0.375 0.75' 
-COLOR_CVARLIST_REVERTBUTTON     '1 0 0'
 COLOR_CVARLIST_UNCHANGED        '1 1 1'
+COLOR_CVARLIST_CONTROLS         '1 0 0'
 
 // item: list box
 COLOR_LISTBOX_SELECTED          '0.875 0.375 0'
@@ -138,6 +138,12 @@ COLOR_SERVERLIST_FAVORITE       '1 1 1'
 COLOR_SKINLIST_TITLE            '1 1 1'
 COLOR_SKINLIST_AUTHOR           '0 0.375 0.75'
 
+// item: demo list
+COLOR_DEMOLIST_SUBDIR           '0.5 0.5 0.5'
+
+// item: screenshot list
+COLOR_SCREENSHOTLIST_SUBDIR     '0.5 0.5 0.5'
+
 //------------------------------------------------------------------------------
 // Images (colors multiplied to images)
 //------------------------------------------------------------------------------
@@ -175,9 +181,14 @@ COLOR_DIALOG_USERBIND           '1 1 1'
 COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
 COLOR_DIALOG_CREDITS            '1 1 1'
 COLOR_DIALOG_WEAPONS            '1 1 1'
-COLOR_DIALOG_WAYPOINTS          '1 1 1'
+COLOR_DIALOG_VIEW               '1 1 1'
+COLOR_DIALOG_MODEL              '1 1 1'
+COLOR_DIALOG_CROSSHAIR          '1 1 1'
+COLOR_DIALOG_HUD                '1 1 1'
 COLOR_DIALOG_SERVERINFO         '1 1 1'
+COLOR_DIALOG_SCREENSHOTVIEWER   '1 1 1'
 COLOR_DIALOG_CVARS              '1 0 0'
+COLOR_DIALOG_HUDCONFIRM         '1 0 0'
 
 // item: input box
 //   uses "inputbox" images
@@ -185,6 +196,13 @@ COLOR_INPUTBOX_N                '1 1 1'
 COLOR_INPUTBOX_F                '1 1 1'
 MARGIN_INPUTBOX_CHARS           1
 
+// item: clear button
+//   uses "clearbutton" images
+OFFSET_CLEARBUTTON              -0.5
+COLOR_CLEARBUTTON_N                '1 1 1'
+COLOR_CLEARBUTTON_C                '1 1 1'
+COLOR_CLEARBUTTON_F                '1 1 1'
+
 // item: key grabber
 COLOR_KEYGRABBER_TITLES         '1 1 1'
 ALPHA_KEYGRABBER_TITLES         1