From a21964ee843289b0e924567b8c87cec7d90416b5 Mon Sep 17 00:00:00 2001 From: Samual Date: Sat, 14 Jan 2012 17:55:22 -0500 Subject: [PATCH] Create the "view settings" dialog --- qcsrc/menu/classes.c | 1 + qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c | 4 ++-- qcsrc/menu/xonotic/mainwindow.c | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c index 428a9020b..0be24e5ea 100644 --- a/qcsrc/menu/classes.c +++ b/qcsrc/menu/classes.c @@ -79,6 +79,7 @@ #include "xonotic/dialog_singleplayer_winner.c" #include "xonotic/dialog_credits.c" #include "xonotic/credits.c" +#include "xonotic/dialog_multiplayer_playersetup_view.c" #include "xonotic/dialog_multiplayer_playersetup_weapons.c" #include "xonotic/weaponslist.c" #include "xonotic/dialog_multiplayer_demo.c" diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index c70eb159d..69539a408 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -160,8 +160,8 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TR(me); me.TDempty(me, 0.5); me.TD(me, 1, 2, e = makeXonoticButton(_("View settings"), '0 0 0')); - e.onClick = HUDSetup_Join_Click; - e.onClickEntity = me; + e.onClick = DialogOpenButton_Click; + e.onClickEntity = main.viewDialog; // TODO: show fov and other settings with text here me.TR(me); me.TDempty(me, 0.5); diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c index 15c9a2e0c..4f762b618 100644 --- a/qcsrc/menu/xonotic/mainwindow.c +++ b/qcsrc/menu/xonotic/mainwindow.c @@ -11,6 +11,7 @@ CLASS(MainWindow) EXTENDS(ModalController) ATTRIB(MainWindow, winnerDialog, entity, NULL) ATTRIB(MainWindow, serverInfoDialog, entity, NULL) ATTRIB(MainWindow, cvarsDialog, entity, NULL) + ATTRIB(MainWindow, viewDialog, entity, NULL) ATTRIB(MainWindow, mainNexposee, entity, NULL) ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND) ATTRIB(MainWindow, dialogToShow, entity, NULL) @@ -156,6 +157,10 @@ void MainWindow_configureMainWindow(entity me) me.cvarsDialog = i = spawnXonoticCvarsDialog(); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + + me.viewDialog = i = spawnXonoticViewDialog(); + i.configureDialog(i); + me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); me.mainNexposee = n = spawnXonoticNexposee(); /* -- 2.39.2