r5543 - in trunk/data/qcsrc/menu: . nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 15 08:19:54 EST 2009
Author: m0rfar
Date: 2009-01-15 08:19:53 -0500 (Thu, 15 Jan 2009)
New Revision: 5543
Added:
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_demo.c
Removed:
trunk/data/qcsrc/menu/nexuiz/dialog_settings_demo.c
Modified:
trunk/data/qcsrc/menu/classes.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings.c
Log:
moved demos tab to multiplayer dialog
Modified: trunk/data/qcsrc/menu/classes.c
===================================================================
--- trunk/data/qcsrc/menu/classes.c 2009-01-15 11:31:22 UTC (rev 5542)
+++ trunk/data/qcsrc/menu/classes.c 2009-01-15 13:19:53 UTC (rev 5543)
@@ -72,6 +72,6 @@
#include "nexuiz/dialog_multiplayer_playersetup_weapons.c"
#include "nexuiz/weaponslist.c"
#include "nexuiz/dialog_multiplayer_playersetup_radar.c"
-#include "nexuiz/dialog_settings_demo.c"
+#include "nexuiz/dialog_multiplayer_demo.c"
#include "nexuiz/demolist.c"
#include "nexuiz/colorpicker.c"
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c 2009-01-15 11:31:22 UTC (rev 5542)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer.c 2009-01-15 13:19:53 UTC (rev 5543)
@@ -19,9 +19,11 @@
setDependentStringNotEqual(e, "_cl_name", "Player");
me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Create", makeNexuizServerCreateTab()));
setDependentStringNotEqual(e, "_cl_name", "Player");
+ me.TD(me, 1, 1, mc.makeTabButton(mc, "Demos", makeNexuizDemoBrowserTab()));
me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Player Setup", makeNexuizPlayerSettingsTab()));
if(cvar_string("_cl_name") == "Player")
e.onClick(e, e.onClickEntity); // lol animation
+
me.TR(me);
me.TR(me);
me.TD(me, me.rows - 2, me.columns, mc);
Copied: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_demo.c (from rev 5542, trunk/data/qcsrc/menu/nexuiz/dialog_settings_demo.c)
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_demo.c (rev 0)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_demo.c 2009-01-15 13:19:53 UTC (rev 5543)
@@ -0,0 +1,50 @@
+#ifdef INTERFACE
+CLASS(NexuizDemoBrowserTab) EXTENDS(NexuizTab)
+ METHOD(NexuizDemoBrowserTab, fill, void(entity))
+ ATTRIB(NexuizDemoBrowserTab, title, string, "Demo")
+ ATTRIB(NexuizDemoBrowserTab, intendedWidth, float, 0.9)
+ ATTRIB(NexuizDemoBrowserTab, rows, float, 22)
+ ATTRIB(NexuizDemoBrowserTab, columns, float, 6.5)
+ ATTRIB(NexuizDemoBrowserTab, name, string, "DemoBroswer")
+ENDCLASS(NexuizDemoBrowserTab)
+entity makeNexuizDemoBrowserTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeNexuizDemoBrowserTab()
+{
+ entity me;
+ me = spawnNexuizDemoBrowserTab();
+ me.configureDialog(me);
+ return me;
+}
+void fillNexuizDemoBrowserTab(entity me)
+{
+ entity e;
+ entity btn;
+ entity dlist;
+
+ me.TR(me);
+ me.TD(me, 1, me.columns, e = makeNexuizCheckBox(0, "cl_autodemo", "Record demos while playing"));
+ me.TR(me);
+ dlist = makeNexuizDemoList();
+ me.TR(me);
+ me.TD(me, 1, 0.5, e = makeNexuizTextLabel(0, "Filter:"));
+ me.TD(me, 1, 0.5, btn = makeNexuizButton("Clear", '0 0 0'));
+ btn.onClick = InputBox_Clear_Click;
+ me.TD(me, 1, me.columns - 1, e = makeNexuizInputBox(0, string_null));
+ e.onChange = DemoList_Filter_Change;
+ e.onChangeEntity = dlist;
+ btn.onClickEntity = e;
+ dlist.controlledTextbox = e;
+ me.TR(me);
+ me.TD(me, me.rows - 4, me.columns, dlist);
+ me.gotoRC(me, me.rows - 1, 0);
+ me.TD(me, 1, me.columns / 2, e = makeNexuizButton("Timedemo", '0 0 0'));
+ e.onClick = TimeDemo_Click;
+ e.onClickEntity = dlist;
+ me.TD(me, 1, me.columns / 2, e = makeNexuizButton("Play", '0 0 0'));
+ e.onClick = StartDemo_Click;
+ e.onClickEntity = dlist;
+}
+#endif
Property changes on: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_demo.c
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings.c 2009-01-15 11:31:22 UTC (rev 5542)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings.c 2009-01-15 13:19:53 UTC (rev 5543)
@@ -19,7 +19,6 @@
me.TD(me, 1, 1, mc.makeTabButton(mc, "Video", makeNexuizVideoSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Effects", makeNexuizEffectsSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Audio", makeNexuizAudioSettingsTab()));
- me.TD(me, 1, 1, mc.makeTabButton(mc, "Demos", makeNexuizDemoSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Misc", makeNexuizMiscSettingsTab()));
me.TR(me);
me.TR(me);
Deleted: trunk/data/qcsrc/menu/nexuiz/dialog_settings_demo.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_demo.c 2009-01-15 11:31:22 UTC (rev 5542)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_demo.c 2009-01-15 13:19:53 UTC (rev 5543)
@@ -1,50 +0,0 @@
-#ifdef INTERFACE
-CLASS(NexuizDemoSettingsTab) EXTENDS(NexuizTab)
- METHOD(NexuizDemoSettingsTab, fill, void(entity))
- ATTRIB(NexuizDemoSettingsTab, title, string, "Demo")
- ATTRIB(NexuizDemoSettingsTab, intendedWidth, float, 0.9)
- ATTRIB(NexuizDemoSettingsTab, rows, float, 17)
- ATTRIB(NexuizDemoSettingsTab, columns, float, 6.5)
- ATTRIB(NexuizDemoSettingsTab, name, string, "DemoBroswer")
-ENDCLASS(NexuizDemoSettingsTab)
-entity makeNexuizDemoSettingsTab();
-#endif
-
-#ifdef IMPLEMENTATION
-entity makeNexuizDemoSettingsTab()
-{
- entity me;
- me = spawnNexuizDemoSettingsTab();
- me.configureDialog(me);
- return me;
-}
-void fillNexuizDemoSettingsTab(entity me)
-{
- entity e;
- entity btn;
- entity dlist;
-
- me.TR(me);
- me.TD(me, 1, me.columns, e = makeNexuizCheckBox(0, "cl_autodemo", "Record demos while playing"));
- me.TR(me);
- dlist = makeNexuizDemoList();
- me.TR(me);
- me.TD(me, 1, 0.5, e = makeNexuizTextLabel(0, "Filter:"));
- me.TD(me, 1, 0.5, btn = makeNexuizButton("Clear", '0 0 0'));
- btn.onClick = InputBox_Clear_Click;
- me.TD(me, 1, me.columns - 1, e = makeNexuizInputBox(0, string_null));
- e.onChange = DemoList_Filter_Change;
- e.onChangeEntity = dlist;
- btn.onClickEntity = e;
- dlist.controlledTextbox = e;
- me.TR(me);
- me.TD(me, me.rows - 4, me.columns, dlist);
- me.gotoRC(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns / 2, e = makeNexuizButton("Timedemo", '0 0 0'));
- e.onClick = TimeDemo_Click;
- e.onClickEntity = dlist;
- me.TD(me, 1, me.columns / 2, e = makeNexuizButton("Play", '0 0 0'));
- e.onClick = StartDemo_Click;
- e.onClickEntity = dlist;
-}
-#endif
More information about the nexuiz-commits
mailing list