From 9e835f5110ce47590ce1affab0b2e7123c6ad4df Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 2 Jan 2008 17:57:29 +0000 Subject: [PATCH] skin system for menu (menu_skin cvar); allow skin defined colors git-svn-id: svn://svn.icculus.org/nexuiz/trunk/data@3085 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- default.cfg | 2 + .../menu/default}/background.tga | Bin .../menu/default}/border.tga | Bin .../menu/default}/button_c.tga | Bin .../menu/default}/button_d.tga | Bin .../menu/default}/button_f.tga | Bin .../menu/default}/button_n.tga | Bin .../menu/default}/buttongray_c.tga | Bin .../menu/default}/buttongray_d.tga | Bin .../menu/default}/buttongray_f.tga | Bin .../menu/default}/buttongray_n.tga | Bin .../menu/default}/charmap.tga | Bin .../menu/default}/charmapbutton.tga | Bin .../menu/default}/checkbox_c0.tga | Bin .../menu/default}/checkbox_c1.tga | Bin .../menu/default}/checkbox_d0.tga | Bin .../menu/default}/checkbox_d1.tga | Bin .../menu/default}/checkbox_f0.tga | Bin .../menu/default}/checkbox_f1.tga | Bin .../menu/default}/checkbox_n0.tga | Bin .../menu/default}/checkbox_n1.tga | Bin .../menu/default}/checkmark.tga | Bin .../menu/default}/closebutton_c.tga | Bin .../menu/default}/closebutton_f.tga | Bin .../menu/default}/closebutton_n.tga | Bin .../menu/default}/color.tga | Bin .../menu/default}/colorbutton_c.tga | Bin .../menu/default}/colorbutton_f.tga | Bin .../menu/default}/colorbutton_n.tga | Bin .../menu/default}/crosshairbutton_c.tga | Bin .../menu/default}/crosshairbutton_f.tga | Bin .../menu/default}/crosshairbutton_n.tga | Bin .../menu/default}/cursor.tga | Bin .../menu/default}/inputbox_f.tga | Bin .../menu/default}/inputbox_n.tga | Bin .../menu/default}/radiobutton_c0.tga | Bin .../menu/default}/radiobutton_c1.tga | Bin .../menu/default}/radiobutton_d0.tga | Bin .../menu/default}/radiobutton_d1.tga | Bin .../menu/default}/radiobutton_f0.tga | Bin .../menu/default}/radiobutton_f1.tga | Bin .../menu/default}/radiobutton_n0.tga | Bin .../menu/default}/radiobutton_n1.tga | Bin .../menu/default}/scrollbar_c.tga | Bin .../menu/default}/scrollbar_f.tga | Bin .../menu/default}/scrollbar_n.tga | Bin .../menu/default}/scrollbar_s.tga | Bin gfx/menu/default/skinvalues.txt | 45 ++++++++ .../menu/default}/slider_c.tga | Bin .../menu/default}/slider_d.tga | Bin .../menu/default}/slider_f.tga | Bin .../menu/default}/slider_n.tga | Bin .../menu/default}/slider_s.tga | Bin .../xawskin => gfx/menu/xaw}/border.tga | Bin .../xawskin => gfx/menu/xaw}/button_c.tga | Bin .../xawskin => gfx/menu/xaw}/button_d.tga | Bin .../xawskin => gfx/menu/xaw}/button_f.tga | Bin .../xawskin => gfx/menu/xaw}/button_n.tga | Bin .../xawskin => gfx/menu/xaw}/buttongray_c.tga | Bin .../xawskin => gfx/menu/xaw}/buttongray_d.tga | Bin .../xawskin => gfx/menu/xaw}/buttongray_f.tga | Bin .../xawskin => gfx/menu/xaw}/buttongray_n.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_c0.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_c1.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_d0.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_d1.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_f0.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_f1.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_n0.tga | Bin .../xawskin => gfx/menu/xaw}/checkbox_n1.tga | Bin .../menu/xaw}/closebutton_c.tga | Bin .../menu/xaw}/closebutton_f.tga | Bin .../menu/xaw}/closebutton_n.tga | Bin .../xawskin => gfx/menu/xaw}/color.tga | Bin .../menu/xaw}/colorbutton_c.tga | Bin .../menu/xaw}/colorbutton_f.tga | Bin .../menu/xaw}/colorbutton_n.tga | Bin .../xawskin => gfx/menu/xaw}/cursor.tga | Bin .../xawskin => gfx/menu/xaw}/inputbox_f.tga | Bin .../xawskin => gfx/menu/xaw}/inputbox_n.tga | Bin .../menu/xaw}/radiobutton_c0.tga | Bin .../menu/xaw}/radiobutton_c1.tga | Bin .../menu/xaw}/radiobutton_d0.tga | Bin .../menu/xaw}/radiobutton_d1.tga | Bin .../menu/xaw}/radiobutton_f0.tga | Bin .../menu/xaw}/radiobutton_f1.tga | Bin .../menu/xaw}/radiobutton_n0.tga | Bin .../menu/xaw}/radiobutton_n1.tga | Bin .../xawskin => gfx/menu/xaw}/scrollbar_c.tga | Bin .../xawskin => gfx/menu/xaw}/scrollbar_f.tga | Bin .../xawskin => gfx/menu/xaw}/scrollbar_n.tga | Bin .../xawskin => gfx/menu/xaw}/scrollbar_s.tga | Bin gfx/menu/xaw/skinvalues.txt | 45 ++++++++ qcsrc/menu-div0test/menu.qc | 15 +++ qcsrc/menu-div0test/skin-customizables.inc | 76 +++++++++++++ qcsrc/menu-div0test/skin.qh | 106 ++++-------------- 96 files changed, 206 insertions(+), 83 deletions(-) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/background.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/border.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/button_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/button_d.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/button_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/button_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/buttongray_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/buttongray_d.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/buttongray_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/buttongray_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/charmap.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/charmapbutton.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_c0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_c1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_d0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_d1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_f0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_f1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_n0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkbox_n1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/checkmark.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/closebutton_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/closebutton_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/closebutton_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/color.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/colorbutton_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/colorbutton_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/colorbutton_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/crosshairbutton_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/crosshairbutton_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/crosshairbutton_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/cursor.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/inputbox_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/inputbox_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_c0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_c1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_d0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_d1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_f0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_f1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_n0.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/radiobutton_n1.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/scrollbar_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/scrollbar_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/scrollbar_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/scrollbar_s.tga (100%) create mode 100644 gfx/menu/default/skinvalues.txt rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/slider_c.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/slider_d.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/slider_f.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/slider_n.tga (100%) rename {qcsrc/menu-div0test/defaultskin => gfx/menu/default}/slider_s.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/border.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/button_c.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/button_d.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/button_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/button_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/buttongray_c.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/buttongray_d.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/buttongray_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/buttongray_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_c0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_c1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_d0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_d1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_f0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_f1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_n0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/checkbox_n1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/closebutton_c.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/closebutton_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/closebutton_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/color.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/colorbutton_c.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/colorbutton_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/colorbutton_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/cursor.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/inputbox_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/inputbox_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_c0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_c1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_d0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_d1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_f0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_f1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_n0.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/radiobutton_n1.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/scrollbar_c.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/scrollbar_f.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/scrollbar_n.tga (100%) rename {qcsrc/menu-div0test/xawskin => gfx/menu/xaw}/scrollbar_s.tga (100%) create mode 100644 gfx/menu/xaw/skinvalues.txt create mode 100644 qcsrc/menu-div0test/skin-customizables.inc diff --git a/default.cfg b/default.cfg index adc725e39..74c47655d 100644 --- a/default.cfg +++ b/default.cfg @@ -819,3 +819,5 @@ seta "userbind16_press" ""; seta "userbind16_release" ""; seta "userbind16_descr alias _userbind_call "${$1}" alias +userbind "_userbind_call userbind${1}_press" alias -userbind "_userbind_call userbind${1}_release" + +seta menu_skin "" diff --git a/qcsrc/menu-div0test/defaultskin/background.tga b/gfx/menu/default/background.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/background.tga rename to gfx/menu/default/background.tga diff --git a/qcsrc/menu-div0test/defaultskin/border.tga b/gfx/menu/default/border.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/border.tga rename to gfx/menu/default/border.tga diff --git a/qcsrc/menu-div0test/defaultskin/button_c.tga b/gfx/menu/default/button_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/button_c.tga rename to gfx/menu/default/button_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/button_d.tga b/gfx/menu/default/button_d.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/button_d.tga rename to gfx/menu/default/button_d.tga diff --git a/qcsrc/menu-div0test/defaultskin/button_f.tga b/gfx/menu/default/button_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/button_f.tga rename to gfx/menu/default/button_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/button_n.tga b/gfx/menu/default/button_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/button_n.tga rename to gfx/menu/default/button_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/buttongray_c.tga b/gfx/menu/default/buttongray_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/buttongray_c.tga rename to gfx/menu/default/buttongray_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/buttongray_d.tga b/gfx/menu/default/buttongray_d.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/buttongray_d.tga rename to gfx/menu/default/buttongray_d.tga diff --git a/qcsrc/menu-div0test/defaultskin/buttongray_f.tga b/gfx/menu/default/buttongray_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/buttongray_f.tga rename to gfx/menu/default/buttongray_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/buttongray_n.tga b/gfx/menu/default/buttongray_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/buttongray_n.tga rename to gfx/menu/default/buttongray_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/charmap.tga b/gfx/menu/default/charmap.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/charmap.tga rename to gfx/menu/default/charmap.tga diff --git a/qcsrc/menu-div0test/defaultskin/charmapbutton.tga b/gfx/menu/default/charmapbutton.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/charmapbutton.tga rename to gfx/menu/default/charmapbutton.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_c0.tga b/gfx/menu/default/checkbox_c0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_c0.tga rename to gfx/menu/default/checkbox_c0.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_c1.tga b/gfx/menu/default/checkbox_c1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_c1.tga rename to gfx/menu/default/checkbox_c1.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_d0.tga b/gfx/menu/default/checkbox_d0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_d0.tga rename to gfx/menu/default/checkbox_d0.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_d1.tga b/gfx/menu/default/checkbox_d1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_d1.tga rename to gfx/menu/default/checkbox_d1.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_f0.tga b/gfx/menu/default/checkbox_f0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_f0.tga rename to gfx/menu/default/checkbox_f0.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_f1.tga b/gfx/menu/default/checkbox_f1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_f1.tga rename to gfx/menu/default/checkbox_f1.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_n0.tga b/gfx/menu/default/checkbox_n0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_n0.tga rename to gfx/menu/default/checkbox_n0.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkbox_n1.tga b/gfx/menu/default/checkbox_n1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkbox_n1.tga rename to gfx/menu/default/checkbox_n1.tga diff --git a/qcsrc/menu-div0test/defaultskin/checkmark.tga b/gfx/menu/default/checkmark.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/checkmark.tga rename to gfx/menu/default/checkmark.tga diff --git a/qcsrc/menu-div0test/defaultskin/closebutton_c.tga b/gfx/menu/default/closebutton_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/closebutton_c.tga rename to gfx/menu/default/closebutton_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/closebutton_f.tga b/gfx/menu/default/closebutton_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/closebutton_f.tga rename to gfx/menu/default/closebutton_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/closebutton_n.tga b/gfx/menu/default/closebutton_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/closebutton_n.tga rename to gfx/menu/default/closebutton_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/color.tga b/gfx/menu/default/color.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/color.tga rename to gfx/menu/default/color.tga diff --git a/qcsrc/menu-div0test/defaultskin/colorbutton_c.tga b/gfx/menu/default/colorbutton_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/colorbutton_c.tga rename to gfx/menu/default/colorbutton_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/colorbutton_f.tga b/gfx/menu/default/colorbutton_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/colorbutton_f.tga rename to gfx/menu/default/colorbutton_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/colorbutton_n.tga b/gfx/menu/default/colorbutton_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/colorbutton_n.tga rename to gfx/menu/default/colorbutton_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/crosshairbutton_c.tga b/gfx/menu/default/crosshairbutton_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/crosshairbutton_c.tga rename to gfx/menu/default/crosshairbutton_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/crosshairbutton_f.tga b/gfx/menu/default/crosshairbutton_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/crosshairbutton_f.tga rename to gfx/menu/default/crosshairbutton_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/crosshairbutton_n.tga b/gfx/menu/default/crosshairbutton_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/crosshairbutton_n.tga rename to gfx/menu/default/crosshairbutton_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/cursor.tga b/gfx/menu/default/cursor.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/cursor.tga rename to gfx/menu/default/cursor.tga diff --git a/qcsrc/menu-div0test/defaultskin/inputbox_f.tga b/gfx/menu/default/inputbox_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/inputbox_f.tga rename to gfx/menu/default/inputbox_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/inputbox_n.tga b/gfx/menu/default/inputbox_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/inputbox_n.tga rename to gfx/menu/default/inputbox_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_c0.tga b/gfx/menu/default/radiobutton_c0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_c0.tga rename to gfx/menu/default/radiobutton_c0.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_c1.tga b/gfx/menu/default/radiobutton_c1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_c1.tga rename to gfx/menu/default/radiobutton_c1.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_d0.tga b/gfx/menu/default/radiobutton_d0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_d0.tga rename to gfx/menu/default/radiobutton_d0.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_d1.tga b/gfx/menu/default/radiobutton_d1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_d1.tga rename to gfx/menu/default/radiobutton_d1.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_f0.tga b/gfx/menu/default/radiobutton_f0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_f0.tga rename to gfx/menu/default/radiobutton_f0.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_f1.tga b/gfx/menu/default/radiobutton_f1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_f1.tga rename to gfx/menu/default/radiobutton_f1.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_n0.tga b/gfx/menu/default/radiobutton_n0.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_n0.tga rename to gfx/menu/default/radiobutton_n0.tga diff --git a/qcsrc/menu-div0test/defaultskin/radiobutton_n1.tga b/gfx/menu/default/radiobutton_n1.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/radiobutton_n1.tga rename to gfx/menu/default/radiobutton_n1.tga diff --git a/qcsrc/menu-div0test/defaultskin/scrollbar_c.tga b/gfx/menu/default/scrollbar_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/scrollbar_c.tga rename to gfx/menu/default/scrollbar_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/scrollbar_f.tga b/gfx/menu/default/scrollbar_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/scrollbar_f.tga rename to gfx/menu/default/scrollbar_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/scrollbar_n.tga b/gfx/menu/default/scrollbar_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/scrollbar_n.tga rename to gfx/menu/default/scrollbar_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/scrollbar_s.tga b/gfx/menu/default/scrollbar_s.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/scrollbar_s.tga rename to gfx/menu/default/scrollbar_s.tga diff --git a/gfx/menu/default/skinvalues.txt b/gfx/menu/default/skinvalues.txt new file mode 100644 index 000000000..5ce5cb097 --- /dev/null +++ b/gfx/menu/default/skinvalues.txt @@ -0,0 +1,45 @@ +ALPHAS_MAINMENU '0.6 0.8 0.9' +ALPHA_DISABLED 0.2 +COLOR_BUTTON_C '1 1 1' +COLOR_BUTTON_D '1 1 1' +COLOR_BUTTON_F '1 1 1' +COLOR_BUTTON_N '1 1 1' +COLOR_CHECKBOX_C '1 1 1' +COLOR_CHECKBOX_D '1 1 1' +COLOR_CHECKBOX_F '1 1 1' +COLOR_CHECKBOX_N '1 1 1' +COLOR_DIALOG_MAPINFO '0.7 0.7 1' +COLOR_DIALOG_MULTIPLAYER '0.7 0.7 1' +COLOR_DIALOG_MUTATORS '0.7 0.7 1' +COLOR_DIALOG_QUIT '1 0 0' +COLOR_DIALOG_SETTINGS '0.7 0.7 1' +COLOR_DIALOG_TEAMSELECT '1 1 1' +COLOR_DIALOG_USERBIND '0.7 0.7 1' +COLOR_INPUTBOX_F '1 1 1' +COLOR_INPUTBOX_N '1 1 1' +COLOR_MAPLIST_AUTHOR '0.4 0.4 0.7' +COLOR_MAPLIST_TITLE '1 1 1' +COLOR_RADIOBUTTON_C '1 1 1' +COLOR_RADIOBUTTON_D '1 1 1' +COLOR_RADIOBUTTON_F '1 1 1' +COLOR_RADIOBUTTON_N '1 1 1' +COLOR_SCROLLBAR_F '1 1 1' +COLOR_SCROLLBAR_N '1 1 1' +COLOR_SCROLLBAR_S '1 1 1' +COLOR_SLIDER_C '1 1 1' +COLOR_SLIDER_D '1 1 1' +COLOR_SLIDER_F '1 1 1' +COLOR_SLIDER_N '1 1 1' +COLOR_SLIDER_S '1 1 1' +FONTSIZE_NORMAL 12 +FONTSIZE_TITLE 24 +HEIGHT_NORMAL 1.5 +HEIGHT_TITLE 1.5 +MARGIN_COLUMNS 4 +MARGIN_INPUTBOX 0.02 +MARGIN_LEFT 8 +MARGIN_ROWS 4 +MARGIN_TOP 8 +TOLERANCE_SLIDER '0.2 2 0' +WIDTH_SCROLLBAR 16 +WIDTH_SLIDERTEXT 0.333333333333 diff --git a/qcsrc/menu-div0test/defaultskin/slider_c.tga b/gfx/menu/default/slider_c.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/slider_c.tga rename to gfx/menu/default/slider_c.tga diff --git a/qcsrc/menu-div0test/defaultskin/slider_d.tga b/gfx/menu/default/slider_d.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/slider_d.tga rename to gfx/menu/default/slider_d.tga diff --git a/qcsrc/menu-div0test/defaultskin/slider_f.tga b/gfx/menu/default/slider_f.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/slider_f.tga rename to gfx/menu/default/slider_f.tga diff --git a/qcsrc/menu-div0test/defaultskin/slider_n.tga b/gfx/menu/default/slider_n.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/slider_n.tga rename to gfx/menu/default/slider_n.tga diff --git a/qcsrc/menu-div0test/defaultskin/slider_s.tga b/gfx/menu/default/slider_s.tga similarity index 100% rename from qcsrc/menu-div0test/defaultskin/slider_s.tga rename to gfx/menu/default/slider_s.tga diff --git a/qcsrc/menu-div0test/xawskin/border.tga b/gfx/menu/xaw/border.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/border.tga rename to gfx/menu/xaw/border.tga diff --git a/qcsrc/menu-div0test/xawskin/button_c.tga b/gfx/menu/xaw/button_c.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/button_c.tga rename to gfx/menu/xaw/button_c.tga diff --git a/qcsrc/menu-div0test/xawskin/button_d.tga b/gfx/menu/xaw/button_d.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/button_d.tga rename to gfx/menu/xaw/button_d.tga diff --git a/qcsrc/menu-div0test/xawskin/button_f.tga b/gfx/menu/xaw/button_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/button_f.tga rename to gfx/menu/xaw/button_f.tga diff --git a/qcsrc/menu-div0test/xawskin/button_n.tga b/gfx/menu/xaw/button_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/button_n.tga rename to gfx/menu/xaw/button_n.tga diff --git a/qcsrc/menu-div0test/xawskin/buttongray_c.tga b/gfx/menu/xaw/buttongray_c.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/buttongray_c.tga rename to gfx/menu/xaw/buttongray_c.tga diff --git a/qcsrc/menu-div0test/xawskin/buttongray_d.tga b/gfx/menu/xaw/buttongray_d.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/buttongray_d.tga rename to gfx/menu/xaw/buttongray_d.tga diff --git a/qcsrc/menu-div0test/xawskin/buttongray_f.tga b/gfx/menu/xaw/buttongray_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/buttongray_f.tga rename to gfx/menu/xaw/buttongray_f.tga diff --git a/qcsrc/menu-div0test/xawskin/buttongray_n.tga b/gfx/menu/xaw/buttongray_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/buttongray_n.tga rename to gfx/menu/xaw/buttongray_n.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_c0.tga b/gfx/menu/xaw/checkbox_c0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_c0.tga rename to gfx/menu/xaw/checkbox_c0.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_c1.tga b/gfx/menu/xaw/checkbox_c1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_c1.tga rename to gfx/menu/xaw/checkbox_c1.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_d0.tga b/gfx/menu/xaw/checkbox_d0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_d0.tga rename to gfx/menu/xaw/checkbox_d0.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_d1.tga b/gfx/menu/xaw/checkbox_d1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_d1.tga rename to gfx/menu/xaw/checkbox_d1.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_f0.tga b/gfx/menu/xaw/checkbox_f0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_f0.tga rename to gfx/menu/xaw/checkbox_f0.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_f1.tga b/gfx/menu/xaw/checkbox_f1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_f1.tga rename to gfx/menu/xaw/checkbox_f1.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_n0.tga b/gfx/menu/xaw/checkbox_n0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_n0.tga rename to gfx/menu/xaw/checkbox_n0.tga diff --git a/qcsrc/menu-div0test/xawskin/checkbox_n1.tga b/gfx/menu/xaw/checkbox_n1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/checkbox_n1.tga rename to gfx/menu/xaw/checkbox_n1.tga diff --git a/qcsrc/menu-div0test/xawskin/closebutton_c.tga b/gfx/menu/xaw/closebutton_c.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/closebutton_c.tga rename to gfx/menu/xaw/closebutton_c.tga diff --git a/qcsrc/menu-div0test/xawskin/closebutton_f.tga b/gfx/menu/xaw/closebutton_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/closebutton_f.tga rename to gfx/menu/xaw/closebutton_f.tga diff --git a/qcsrc/menu-div0test/xawskin/closebutton_n.tga b/gfx/menu/xaw/closebutton_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/closebutton_n.tga rename to gfx/menu/xaw/closebutton_n.tga diff --git a/qcsrc/menu-div0test/xawskin/color.tga b/gfx/menu/xaw/color.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/color.tga rename to gfx/menu/xaw/color.tga diff --git a/qcsrc/menu-div0test/xawskin/colorbutton_c.tga b/gfx/menu/xaw/colorbutton_c.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/colorbutton_c.tga rename to gfx/menu/xaw/colorbutton_c.tga diff --git a/qcsrc/menu-div0test/xawskin/colorbutton_f.tga b/gfx/menu/xaw/colorbutton_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/colorbutton_f.tga rename to gfx/menu/xaw/colorbutton_f.tga diff --git a/qcsrc/menu-div0test/xawskin/colorbutton_n.tga b/gfx/menu/xaw/colorbutton_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/colorbutton_n.tga rename to gfx/menu/xaw/colorbutton_n.tga diff --git a/qcsrc/menu-div0test/xawskin/cursor.tga b/gfx/menu/xaw/cursor.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/cursor.tga rename to gfx/menu/xaw/cursor.tga diff --git a/qcsrc/menu-div0test/xawskin/inputbox_f.tga b/gfx/menu/xaw/inputbox_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/inputbox_f.tga rename to gfx/menu/xaw/inputbox_f.tga diff --git a/qcsrc/menu-div0test/xawskin/inputbox_n.tga b/gfx/menu/xaw/inputbox_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/inputbox_n.tga rename to gfx/menu/xaw/inputbox_n.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_c0.tga b/gfx/menu/xaw/radiobutton_c0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_c0.tga rename to gfx/menu/xaw/radiobutton_c0.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_c1.tga b/gfx/menu/xaw/radiobutton_c1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_c1.tga rename to gfx/menu/xaw/radiobutton_c1.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_d0.tga b/gfx/menu/xaw/radiobutton_d0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_d0.tga rename to gfx/menu/xaw/radiobutton_d0.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_d1.tga b/gfx/menu/xaw/radiobutton_d1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_d1.tga rename to gfx/menu/xaw/radiobutton_d1.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_f0.tga b/gfx/menu/xaw/radiobutton_f0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_f0.tga rename to gfx/menu/xaw/radiobutton_f0.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_f1.tga b/gfx/menu/xaw/radiobutton_f1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_f1.tga rename to gfx/menu/xaw/radiobutton_f1.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_n0.tga b/gfx/menu/xaw/radiobutton_n0.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_n0.tga rename to gfx/menu/xaw/radiobutton_n0.tga diff --git a/qcsrc/menu-div0test/xawskin/radiobutton_n1.tga b/gfx/menu/xaw/radiobutton_n1.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/radiobutton_n1.tga rename to gfx/menu/xaw/radiobutton_n1.tga diff --git a/qcsrc/menu-div0test/xawskin/scrollbar_c.tga b/gfx/menu/xaw/scrollbar_c.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/scrollbar_c.tga rename to gfx/menu/xaw/scrollbar_c.tga diff --git a/qcsrc/menu-div0test/xawskin/scrollbar_f.tga b/gfx/menu/xaw/scrollbar_f.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/scrollbar_f.tga rename to gfx/menu/xaw/scrollbar_f.tga diff --git a/qcsrc/menu-div0test/xawskin/scrollbar_n.tga b/gfx/menu/xaw/scrollbar_n.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/scrollbar_n.tga rename to gfx/menu/xaw/scrollbar_n.tga diff --git a/qcsrc/menu-div0test/xawskin/scrollbar_s.tga b/gfx/menu/xaw/scrollbar_s.tga similarity index 100% rename from qcsrc/menu-div0test/xawskin/scrollbar_s.tga rename to gfx/menu/xaw/scrollbar_s.tga diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt new file mode 100644 index 000000000..5ce5cb097 --- /dev/null +++ b/gfx/menu/xaw/skinvalues.txt @@ -0,0 +1,45 @@ +ALPHAS_MAINMENU '0.6 0.8 0.9' +ALPHA_DISABLED 0.2 +COLOR_BUTTON_C '1 1 1' +COLOR_BUTTON_D '1 1 1' +COLOR_BUTTON_F '1 1 1' +COLOR_BUTTON_N '1 1 1' +COLOR_CHECKBOX_C '1 1 1' +COLOR_CHECKBOX_D '1 1 1' +COLOR_CHECKBOX_F '1 1 1' +COLOR_CHECKBOX_N '1 1 1' +COLOR_DIALOG_MAPINFO '0.7 0.7 1' +COLOR_DIALOG_MULTIPLAYER '0.7 0.7 1' +COLOR_DIALOG_MUTATORS '0.7 0.7 1' +COLOR_DIALOG_QUIT '1 0 0' +COLOR_DIALOG_SETTINGS '0.7 0.7 1' +COLOR_DIALOG_TEAMSELECT '1 1 1' +COLOR_DIALOG_USERBIND '0.7 0.7 1' +COLOR_INPUTBOX_F '1 1 1' +COLOR_INPUTBOX_N '1 1 1' +COLOR_MAPLIST_AUTHOR '0.4 0.4 0.7' +COLOR_MAPLIST_TITLE '1 1 1' +COLOR_RADIOBUTTON_C '1 1 1' +COLOR_RADIOBUTTON_D '1 1 1' +COLOR_RADIOBUTTON_F '1 1 1' +COLOR_RADIOBUTTON_N '1 1 1' +COLOR_SCROLLBAR_F '1 1 1' +COLOR_SCROLLBAR_N '1 1 1' +COLOR_SCROLLBAR_S '1 1 1' +COLOR_SLIDER_C '1 1 1' +COLOR_SLIDER_D '1 1 1' +COLOR_SLIDER_F '1 1 1' +COLOR_SLIDER_N '1 1 1' +COLOR_SLIDER_S '1 1 1' +FONTSIZE_NORMAL 12 +FONTSIZE_TITLE 24 +HEIGHT_NORMAL 1.5 +HEIGHT_TITLE 1.5 +MARGIN_COLUMNS 4 +MARGIN_INPUTBOX 0.02 +MARGIN_LEFT 8 +MARGIN_ROWS 4 +MARGIN_TOP 8 +TOLERANCE_SLIDER '0.2 2 0' +WIDTH_SCROLLBAR 16 +WIDTH_SLIDERTEXT 0.333333333333 diff --git a/qcsrc/menu-div0test/menu.qc b/qcsrc/menu-div0test/menu.qc index 05c1edaa7..51ac9b7ea 100644 --- a/qcsrc/menu-div0test/menu.qc +++ b/qcsrc/menu-div0test/menu.qc @@ -24,6 +24,9 @@ void() m_init = void() m_init_delayed = { + float fh; + string s; + dprint_load(); menuLoadedMaplist = 0; @@ -34,6 +37,18 @@ void() m_init_delayed = GameCommand_Init(); + draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin")); + fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ); + if(fh < 0) + { + draw_currentSkin = "gfx/menu/default"; + fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ); + } + while((s = fgets(fh))) + if(tokenize(s) == 2) + Skin_ApplySetting(argv(0), argv(1)); + fclose(fh); + if(cvar("developer") == 42) draw_currentSkin = "qcsrc/menu-div0test/xawskin"; else diff --git a/qcsrc/menu-div0test/skin-customizables.inc b/qcsrc/menu-div0test/skin-customizables.inc new file mode 100644 index 000000000..3872feea6 --- /dev/null +++ b/qcsrc/menu-div0test/skin-customizables.inc @@ -0,0 +1,76 @@ +SKINBEGIN + SKINFLOAT(FONTSIZE_NORMAL, 12); + SKINFLOAT(HEIGHT_NORMAL, 1.5); + + SKINFLOAT(FONTSIZE_TITLE, 24); + SKINFLOAT(HEIGHT_TITLE, 1.5); + + SKINSTRING(GFX_BUTTON, "button"); + SKINVECTOR(COLOR_BUTTON_N, '1 1 1'); + SKINVECTOR(COLOR_BUTTON_C, '1 1 1'); + SKINVECTOR(COLOR_BUTTON_F, '1 1 1'); + SKINVECTOR(COLOR_BUTTON_D, '1 1 1'); + + SKINSTRING(GFX_BUTTON_GRAY, "buttongray"); + + SKINSTRING(GFX_CHECKBOX, "checkbox"); + SKINVECTOR(COLOR_CHECKBOX_N, '1 1 1'); + SKINVECTOR(COLOR_CHECKBOX_C, '1 1 1'); + SKINVECTOR(COLOR_CHECKBOX_F, '1 1 1'); + SKINVECTOR(COLOR_CHECKBOX_D, '1 1 1'); + + SKINSTRING(GFX_DIALOGBORDER, "border"); + SKINSTRING(GFX_CLOSEBUTTON, "closebutton"); + SKINFLOAT(MARGIN_TOP, 8); + SKINFLOAT(MARGIN_LEFT, 8); + SKINFLOAT(MARGIN_COLUMNS, 4); + SKINFLOAT(MARGIN_ROWS, 4); + SKINVECTOR(COLOR_DIALOG_MULTIPLAYER, '0.7 0.7 1'); + SKINVECTOR(COLOR_DIALOG_SETTINGS, '0.7 0.7 1'); + SKINVECTOR(COLOR_DIALOG_TEAMSELECT, '1 1 1'); + SKINVECTOR(COLOR_DIALOG_QUIT, '1 0 0'); + SKINVECTOR(COLOR_DIALOG_MUTATORS, '0.7 0.7 1'); + SKINVECTOR(COLOR_DIALOG_MAPINFO, '0.7 0.7 1'); + SKINVECTOR(COLOR_DIALOG_USERBIND, '0.7 0.7 1'); + + SKINSTRING(GFX_SLIDER, "slider"); + SKINVECTOR(COLOR_SLIDER_N, '1 1 1'); + SKINVECTOR(COLOR_SLIDER_C, '1 1 1'); + SKINVECTOR(COLOR_SLIDER_F, '1 1 1'); + SKINVECTOR(COLOR_SLIDER_D, '1 1 1'); + SKINVECTOR(COLOR_SLIDER_S, '1 1 1'); + SKINFLOAT(WIDTH_SLIDERTEXT, 0.333333333333); + SKINVECTOR(TOLERANCE_SLIDER, '0.2 2 0'); + + SKINSTRING(GFX_RADIOBUTTON, "radiobutton"); + SKINVECTOR(COLOR_RADIOBUTTON_N, '1 1 1'); + SKINVECTOR(COLOR_RADIOBUTTON_C, '1 1 1'); + SKINVECTOR(COLOR_RADIOBUTTON_F, '1 1 1'); + SKINVECTOR(COLOR_RADIOBUTTON_D, '1 1 1'); + + SKINSTRING(GFX_COLORBUTTON, "colorbutton"); + SKINSTRING(GFX_COLORBUTTON_COLOR, "color"); + SKINSTRING(GFX_CROSSHAIRBUTTON, "crosshairbutton"); + SKINSTRING(GFX_SCROLLBAR, "scrollbar"); + SKINVECTOR(COLOR_SCROLLBAR_N, '1 1 1'); + SKINVECTOR(COLOR_SCROLLBAR_F, '1 1 1'); + SKINVECTOR(COLOR_SCROLLBAR_S, '1 1 1'); + SKINFLOAT(WIDTH_SCROLLBAR, 16); + + SKINSTRING(GFX_INPUTBOX, "inputbox"); + SKINVECTOR(COLOR_INPUTBOX_N, '1 1 1'); + SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1'); + SKINFLOAT(MARGIN_INPUTBOX, 0.02); + + SKINVECTOR(COLOR_MAPLIST_TITLE, '1 1 1'); + SKINVECTOR(COLOR_MAPLIST_AUTHOR, '0.4 0.4 0.7'); + + SKINFLOAT(ALPHA_DISABLED, 0.2); + + SKINSTRING(GFX_CHARMAP, "charmap"); + SKINSTRING(GFX_CHARMAP_SELECTED, "charmapbutton"); + + SKINSTRING(GFX_BACKGROUND, "background"); + + SKINVECTOR(ALPHAS_MAINMENU, '0.6 0.8 0.9'); +SKINEND diff --git a/qcsrc/menu-div0test/skin.qh b/qcsrc/menu-div0test/skin.qh index 78b4db5e7..c22b027aa 100644 --- a/qcsrc/menu-div0test/skin.qh +++ b/qcsrc/menu-div0test/skin.qh @@ -1,83 +1,23 @@ -const float SKINFONTSIZE_NORMAL = 12; -const float SKINHEIGHT_NORMAL = 1.5; -const float SKINHEIGHT_NORMAL_WITHSPACING = 2; - -const float SKINFONTSIZE_TITLE = 24; -const float SKINHEIGHT_TITLE = 1.5; - -const string SKINGFX_BUTTON = "button"; -const vector SKINCOLOR_BUTTON_N = '1 1 1'; -const vector SKINCOLOR_BUTTON_C = '1 1 1'; -const vector SKINCOLOR_BUTTON_F = '1 1 1'; -const vector SKINCOLOR_BUTTON_D = '1 1 1'; - -const string SKINGFX_BUTTON_GRAY = "buttongray"; - -const string SKINGFX_CHECKBOX = "checkbox"; -const vector SKINCOLOR_CHECKBOX_N = '1 1 1'; -const vector SKINCOLOR_CHECKBOX_C = '1 1 1'; -const vector SKINCOLOR_CHECKBOX_F = '1 1 1'; -const vector SKINCOLOR_CHECKBOX_D = '1 1 1'; - -const string SKINGFX_DIALOGBORDER = "border"; -const string SKINGFX_CLOSEBUTTON = "closebutton"; -const float SKINMARGIN_TOP = 8; -const float SKINMARGIN_LEFT = 8; -const float SKINMARGIN_COLUMNS = 4; -const float SKINMARGIN_ROWS = 4; -const vector SKINCOLOR_DIALOG_MULTIPLAYER = '0.7 0.7 1'; -const vector SKINCOLOR_DIALOG_SETTINGS = '0.7 0.7 1'; -const vector SKINCOLOR_DIALOG_TEAMSELECT = '1 1 1'; -const vector SKINCOLOR_DIALOG_QUIT = '1 0 0'; -const vector SKINCOLOR_DIALOG_MUTATORS = '0.7 0.7 1'; -const vector SKINCOLOR_DIALOG_MAPINFO = '0.7 0.7 1'; -const vector SKINCOLOR_DIALOG_USERBIND = '0.7 0.7 1'; -/* ideal for xaw skin: -const vector SKINCOLOR_DIALOG_MULTIPLAYER = '1 1 1'; -const vector SKINCOLOR_DIALOG_SETTINGS = '1 1 1'; -const vector SKINCOLOR_DIALOG_TEAMSELECT = '1 1 1'; -const vector SKINCOLOR_DIALOG_QUIT = '1 1 1'; -const vector SKINCOLOR_DIALOG_MUTATORS = '1 1 1'; -const vector SKINCOLOR_DIALOG_MAPINFO = '1 1 1'; -*/ - -const string SKINGFX_SLIDER = "slider"; -const vector SKINCOLOR_SLIDER_N = '1 1 1'; -const vector SKINCOLOR_SLIDER_C = '1 1 1'; -const vector SKINCOLOR_SLIDER_F = '1 1 1'; -const vector SKINCOLOR_SLIDER_D = '1 1 1'; -const vector SKINCOLOR_SLIDER_S = '1 1 1'; -const float SKINWIDTH_SLIDERTEXT = 0.333333333333; -const vector SKINTOLERANCE_SLIDER = '0.2 2 0'; - -const string SKINGFX_RADIOBUTTON = "radiobutton"; -const vector SKINCOLOR_RADIOBUTTON_N = '1 1 1'; -const vector SKINCOLOR_RADIOBUTTON_C = '1 1 1'; -const vector SKINCOLOR_RADIOBUTTON_F = '1 1 1'; -const vector SKINCOLOR_RADIOBUTTON_D = '1 1 1'; - -const string SKINGFX_COLORBUTTON = "colorbutton"; -const string SKINGFX_COLORBUTTON_COLOR = "color"; -const string SKINGFX_CROSSHAIRBUTTON = "crosshairbutton"; -const string SKINGFX_SCROLLBAR = "scrollbar"; -const vector SKINCOLOR_SCROLLBAR_N = '1 1 1'; -const vector SKINCOLOR_SCROLLBAR_F = '1 1 1'; -const vector SKINCOLOR_SCROLLBAR_S = '1 1 1'; -const float SKINWIDTH_SCROLLBAR = 16; - -const string SKINGFX_INPUTBOX = "inputbox"; -const vector SKINCOLOR_INPUTBOX_N = '1 1 1'; -const vector SKINCOLOR_INPUTBOX_F = '1 1 1'; -const float SKINMARGIN_INPUTBOX = 0.02; - -const vector SKINCOLOR_MAPLIST_TITLE = '1 1 1'; -const vector SKINCOLOR_MAPLIST_AUTHOR = '0.4 0.4 0.7'; - -const float SKINALPHA_DISABLED = 0.2; - -const string SKINGFX_CHARMAP = "charmap"; -const string SKINGFX_CHARMAP_SELECTED = "charmapbutton"; - -const string SKINGFX_BACKGROUND = "background"; - -const vector SKINALPHAS_MAINMENU = '0.6 0.8 0.9'; +#define SKINBEGIN +#define SKINVECTOR(name,def) var vector SKIN##name = def +#define SKINFLOAT(name,def) var float SKIN##name = def +#define SKINSTRING(name,def) const string SKIN##name = def +#define SKINEND +#include "skin-customizables.inc" +#undef SKINEND +#undef SKINBEGIN +#undef SKINSTRING +#undef SKINFLOAT +#undef SKINVECTOR + +#define SKINBEGIN void Skin_ApplySetting(string key, string value) { switch(key) { +#define SKINVECTOR(name,def) case #name: SKIN##name = stov(value); break +#define SKINFLOAT(name,def) case #name: SKIN##name = stof(value); break +#define SKINSTRING(name,def) break +#define SKINEND default: print("Invalid key in skin file: ", key, "\n"); } } +#include "skin-customizables.inc" +#undef SKINEND +#undef SKINSTRING +#undef SKINFLOAT +#undef SKINVECTOR +#undef SKINBEGIN -- 2.39.2