r2942 - in trunk/data/qcsrc/menu-div0test: . item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Nov 12 18:03:05 EST 2007
Author: div0
Date: 2007-11-12 18:03:04 -0500 (Mon, 12 Nov 2007)
New Revision: 2942
Added:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_quit.c
Modified:
trunk/data/qcsrc/menu-div0test/classes.c
trunk/data/qcsrc/menu-div0test/item/nexposee.c
trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
trunk/data/qcsrc/menu-div0test/skin.qh
Log:
add "quit" dialog; tune nexposee a bit
Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c 2007-11-12 15:56:24 UTC (rev 2941)
+++ trunk/data/qcsrc/menu-div0test/classes.c 2007-11-12 23:03:04 UTC (rev 2942)
@@ -41,3 +41,4 @@
#include "nexuiz/listbox.c"
#include "nexuiz/serverlist.c"
#include "nexuiz/inputbox.c"
+#include "nexuiz/dialog_quit.c"
Modified: trunk/data/qcsrc/menu-div0test/item/nexposee.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/nexposee.c 2007-11-12 15:56:24 UTC (rev 2941)
+++ trunk/data/qcsrc/menu-div0test/item/nexposee.c 2007-11-12 23:03:04 UTC (rev 2942)
@@ -70,7 +70,7 @@
entity e, e2;
vector emins, emaxs, e2mins, e2maxs;
- for(scale = 0.7;; scale *= 0.9)
+ for(scale = 0.7;; scale *= 0.99)
{
for(e = me.firstChild; e; e = e.nextSibling)
{
@@ -104,7 +104,7 @@
:have_overlap
}
- scale *= 0.9;
+ scale *= 0.95;
for(e = me.firstChild; e; e = e.nextSibling)
{
e.Nexposee_smallOrigin = (e.Nexposee_initialOrigin - e.Nexposee_scaleCenter) * scale + e.Nexposee_scaleCenter;
Added: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_quit.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_quit.c (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_quit.c 2007-11-12 23:03:04 UTC (rev 2942)
@@ -0,0 +1,25 @@
+#ifdef INTERFACE
+CLASS(NexuizQuitDialog) EXTENDS(NexuizDialog)
+ METHOD(NexuizQuitDialog, fill, void(entity))
+ ATTRIB(NexuizQuitDialog, title, string, "Quit")
+ ATTRIB(NexuizQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT)
+ ATTRIB(NexuizQuitDialog, intendedWidth, float, 0.5)
+ ATTRIB(NexuizQuitDialog, rows, float, 3)
+ ATTRIB(NexuizQuitDialog, columns, float, 2)
+ENDCLASS(NexuizQuitDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void fillNexuizQuitDialog(entity me)
+{
+ entity e;
+ me.TR(me);
+ me.TD(me, 1, 2, makeNexuizTextLabel(0.5, "Are you sure you want to quit?"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizCommandButton("Yes", '1 0 0', "quit", 0));
+ me.TD(me, 1, 1, e = makeNexuizButton("No", '0 1 0'));
+ e.onClick = Dialog_Close;
+ e.onClickEntity = me;
+}
+#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2007-11-12 15:56:24 UTC (rev 2941)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2007-11-12 23:03:04 UTC (rev 2942)
@@ -16,75 +16,30 @@
void configureMainWindowMainWindow(entity me)
{
- entity dlg, n, i, b, c, mc, t1, t2, t3;
+ entity n, i;
n = spawnNexuizNexposee();
+ i = spawnNexuizSettingsDialog();
+ i.configureDialog(i);
+ n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
+ n.setNexposee(n, i, '0.1 0.9 0', 0.5, 0.8);
+
+ i = spawnNexuizMultiplayerDialog();
+ i.configureDialog(i);
+ n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
+ n.setNexposee(n, i, '0.9 0.5 0', 0.5, 0.8);
+
+ i = spawnNexuizQuitDialog();
+ i.configureDialog(i);
+ n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
+ n.setNexposee(n, i, '0.9 1.2 0', 0.5, 0.8);
me.addItem(me, n, '0 0 0', '1 1 0', 1);
i = spawnNexuizTeamSelectDialog();
i.configureDialog(i);
me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
- i = spawnImage();
- i.configureImage(i, "gfx/0.tga");
- n.addItem(n, i, '0.4 0.45 0', '0.2 0.1 0', 1);
- n.setNexposee(n, i, '0.5 0.5 0', 0.5, 0.8);
-
- c = spawnInputContainer();
-
- i = spawnImage();
- i.configureImage(i, "gfx/0.tga");
- c.addItem(c, i, '0 0 0', '1 1 0', 1);
-
- mc = spawnModalController();
- b = spawnButton();
- b.configureButton(b, "1!", 12, "qcsrc/menu-div0test/basebutton");
- c.addItem(c, b, '0 0 0', '0.2 0.2 0', 1);
- i = spawnButton();
- i.configureButton(i, "Do not press this button!", 12, "qcsrc/menu-div0test/basebutton"); // click n gently with a chainsaw
- i.onClick = DemoButton_Click; i.onClickEntity = dlg;
- mc.addTab(mc, i, b);
- t1 = i;
-
- b = spawnButton();
- b.configureButton(b, "2!", 12, "qcsrc/menu-div0test/basebutton");
- c.addItem(c, b, '0.2 0 0', '0.2 0.2 0', 1);
- i = spawnButton();
- i.configureButton(i, "Close", 12, "qcsrc/menu-div0test/basebutton"); // click n plenty
- i.onClick = ExposeeCloseButton_Click; i.onClickEntity = n;
- mc.addTab(mc, i, b);
- t2 = i;
-
- b = spawnButton();
- b.configureButton(b, "3!", 12, "qcsrc/menu-div0test/basebutton");
- c.addItem(c, b, '0.4 0 0', '0.2 0.2 0', 1);
- i = spawnButton();
- i.configureButton(i, "Close", 12, "qcsrc/menu-div0test/basebutton"); // click n plenty
- i.onClick = ExposeeCloseButton_Click; i.onClickEntity = n;
- mc.addTab(mc, i, b);
- t3 = i;
- c.addItem(c, mc, '0 0.2 0', '1 0.8 0', 1);
-
- n.addItem(n, c, '0.03 0.06 0', '0.9 0.9 0', 0.5);
- n.setNexposee(n, c, '0.1 0.2 0', 0.5, 0.8);
-
- i = spawnNexuizSettingsDialog();
- i.configureDialog(i);
- n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
- n.setNexposee(n, i, '0.95 0.8 0', 0.5, 0.8);
-
- i = spawnNexuizMultiplayerDialog();
- i.configureDialog(i);
- n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
- n.setNexposee(n, i, '0.99 0.1 0', 0.5, 0.8);
-
- i = spawnImage();
- i.configureImage(i, "gfx/4.tga");
- n.addItem(n, i, '0.01 0.09 0', '0.9 0.9 0', 1);
- n.setNexposee(n, i, '0.1 0.9 0', 0.5, 0.8);
-
me.initializeDialog(me, n);
-
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/skin.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin.qh 2007-11-12 15:56:24 UTC (rev 2941)
+++ trunk/data/qcsrc/menu-div0test/skin.qh 2007-11-12 23:03:04 UTC (rev 2942)
@@ -28,6 +28,7 @@
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 string SKINGFX_SLIDER = "qcsrc/menu-div0test/baseslider";
const vector SKINCOLOR_SLIDER_N = '1 1 1';
More information about the nexuiz-commits
mailing list