From: Samual Lenks <samual@xonotic.org>
Date: Thu, 26 Dec 2013 01:58:05 +0000 (-0500)
Subject: Begin adding models tab like normal as well
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~43
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=37fdadcc9517c5650156240357702bac85455dfa;p=xonotic%2Fxonotic-data.pk3dir.git

Begin adding models tab like normal as well
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c
index 92245b6d5..8def19656 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game.c
@@ -30,7 +30,7 @@ void XonoticGameSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("HUD"),            makeXonoticGameHUDSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Messages"),       makeXonoticGameMessageSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Weapons"),        makeXonoticGameWeaponsSettingsTab()));
-		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Models"),         makeXonoticGameCrosshairSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Models"),         makeXonoticGameModelSettingsTab()));
 
 	me.gotoRC(me, 1.5, 0);
 		me.TD(me, me.rows - 1.5, me.columns, mc);
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.c b/qcsrc/menu/xonotic/dialog_settings_game_model.c
index d1cdade77..9b6c435eb 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.c
@@ -1,28 +1,33 @@
 #ifdef INTERFACE
-CLASS(XonoticModelDialog) EXTENDS(XonoticDialog)
-	METHOD(XonoticModelDialog, toString, string(entity))
-	METHOD(XonoticModelDialog, fill, void(entity))
-	METHOD(XonoticModelDialog, showNotify, void(entity))
-	ATTRIB(XonoticModelDialog, title, string, _("Model settings"))
-	ATTRIB(XonoticModelDialog, color, vector, SKINCOLOR_DIALOG_MODEL)
-	ATTRIB(XonoticModelDialog, intendedWidth, float, 0.5)
-	ATTRIB(XonoticModelDialog, rows, float, 7)
-	ATTRIB(XonoticModelDialog, columns, float, 3)
-ENDCLASS(XonoticModelDialog)
+CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)
+	//METHOD(XonoticGameModelSettingsTab, toString, string(entity))
+	METHOD(XonoticGameModelSettingsTab, fill, void(entity))
+	METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))
+	ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model"))
+	ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
+	ATTRIB(XonoticGameModelSettingsTab, rows, float, 14)
+	ATTRIB(XonoticGameModelSettingsTab, columns, float, 6.2)
+ENDCLASS(XonoticGameModelSettingsTab)
+entity makeXonoticGameModelSettingsTab();
 #endif
 
 #ifdef IMPLEMENTATION
-void XonoticModelDialog_showNotify(entity me)
+void XonoticGameModelSettingsTab_showNotify(entity me)
 {
 	loadAllCvars(me);
 }
-string XonoticModelDialog_toString(entity me)
+entity makeXonoticGameModelSettingsTab()
 {
-	return "hi"; // TODO: show csqc model settings like forcemyplayer and deglowing/ghosting bodies with text here
+	entity me;
+	me = spawnXonoticGameModelSettingsTab();
+	me.configureDialog(me);
+	return me;
 }
-void XonoticModelDialog_fill(entity me)
+
+void XonoticGameModelSettingsTab_fill(entity me)
 {
 	entity e;
+	//float i;
 
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Body fading:")));
@@ -41,11 +46,5 @@ void XonoticModelDialog_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayercolors", _("Force player colors to mine")));
-	me.TR(me);
-
-	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
-			e.onClick = Dialog_Close;
-			e.onClickEntity = me;
 }
 #endif
diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index e1c907036..4b9abfd8e 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -12,7 +12,6 @@ CLASS(MainWindow) EXTENDS(ModalController)
 	ATTRIB(MainWindow, cvarsDialog, entity, NULL)
 	ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL)
 	ATTRIB(MainWindow, viewDialog, entity, NULL)
-	ATTRIB(MainWindow, modelDialog, entity, NULL)
 	ATTRIB(MainWindow, hudconfirmDialog, entity, NULL)
 	ATTRIB(MainWindow, mainNexposee, entity, NULL)
 	ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
@@ -139,6 +138,10 @@ void MainWindow_configureMainWindow(entity me)
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
+	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
 
 	// dialog used by singleplayer
 	me.winnerDialog = i = spawnXonoticWinnerDialog();
@@ -169,16 +172,6 @@ void MainWindow_configureMainWindow(entity me)
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	// dialogs used by multiplayer/player setup	
-	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	me.modelDialog = i = spawnXonoticModelDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-
 	// mutator dialogs
 	i = spawnXonoticSandboxToolsDialog();
 	i.configureDialog(i);