From a2bec3bb57cda596d1098806865dbb92a9356956 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 14 Oct 2013 17:37:20 -0400 Subject: [PATCH] Add view tab --- qcsrc/menu/xonotic/dialog_settings_game.c | 24 +++++----- .../xonotic/dialog_settings_game_crosshair.c | 4 +- .../menu/xonotic/dialog_settings_game_view.c | 44 +++++++++---------- qcsrc/menu/xonotic/mainwindow.c | 4 -- 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c index f5faa28c6..bdbf1ccb6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.c +++ b/qcsrc/menu/xonotic/dialog_settings_game.c @@ -21,30 +21,30 @@ entity makeXonoticGameSettingsTab() void XonoticGameSettingsTab_fill(entity me) { entity mc; - mc = makeXonoticTabController(me.rows - 3); + mc = makeXonoticTabController(me.rows - 2); me.gotoRC(me, 0.5, 0.25); //me.TD(me, 1, 1, mc.makeTabButton(mc, _("General"), makeXonoticGameCrosshairSettingsTab())); - me.TD(me, 1, 1, mc.makeTabButton(mc, _("View"), makeXonoticGameCrosshairSettingsTab())); + me.TD(me, 1, 1, mc.makeTabButton(mc, _("View"), makeXonoticGameViewSettingsTab())); me.TD(me, 1, 1, mc.makeTabButton(mc, _("Crosshair"), makeXonoticGameCrosshairSettingsTab())); me.TD(me, 1, 1, mc.makeTabButton(mc, _("HUD"), makeXonoticGameCrosshairSettingsTab())); me.TD(me, 1, 1, mc.makeTabButton(mc, _("Messages"), makeXonoticGameCrosshairSettingsTab())); me.TD(me, 1, 1, mc.makeTabButton(mc, _("Weapons"), makeXonoticGameCrosshairSettingsTab())); me.TD(me, 1, 1, mc.makeTabButton(mc, _("Playermodels"), makeXonoticGameCrosshairSettingsTab())); - me.gotoRC(me, 3, 0); - me.TD(me, me.rows - 3, me.columns, mc); + me.gotoRC(me, 2, 0); + me.TD(me, me.rows - 2, me.columns, mc); /* - //me.TD(me, 1, 2, mc.makeTabButton(mc, _("View"), makeXonoticGameViewSettingsTab())); - //me.TD(me, 1, 2, mc.makeTabButton(mc, _("General"), makeXonoticGameGeneralSettingsTab())); - me.TD(me, 1, 2, mc.makeTabButton(mc, _("Crosshair"), makeXonoticGameCrosshairSettingsTab())); - me.TR(me); - //me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Weapon"), makeXonoticGameWeaponSettingsTab())); - //me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Playermodel"), makeXonoticGamePlayermodelSettingsTab())); - //me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("HUD"), makeXonoticGameHUDSettingsTab())); - //me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Notification"), makeXonoticGameNotificationSettingsTab())); + makeXonoticGameViewSettingsTab())); + makeXonoticGameGeneralSettingsTab())); + makeXonoticGameCrosshairSettingsTab())); + + makeXonoticGameWeaponSettingsTab())); + l"), makeXonoticGamePlayermodelSettingsTab())); + makeXonoticGameHUDSettingsTab())); + on"), makeXonoticGameNotificationSettingsTab())); me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c index 093d59063..0a1875187 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c @@ -5,8 +5,8 @@ CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair")) ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 14) - ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6) + ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 15) + ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameCrosshairSettingsTab) entity makeXonoticGameCrosshairSettingsTab(); #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.c b/qcsrc/menu/xonotic/dialog_settings_game_view.c index 59a7e6e79..ef598e016 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.c @@ -1,32 +1,37 @@ #ifdef INTERFACE -CLASS(XonoticViewDialog) EXTENDS(XonoticDialog) - METHOD(XonoticViewDialog, toString, string(entity)) - METHOD(XonoticViewDialog, fill, void(entity)) - METHOD(XonoticViewDialog, showNotify, void(entity)) - ATTRIB(XonoticViewDialog, title, string, _("View settings")) - ATTRIB(XonoticViewDialog, color, vector, SKINCOLOR_DIALOG_VIEW) - ATTRIB(XonoticViewDialog, intendedWidth, float, 0.9) - ATTRIB(XonoticViewDialog, rows, float, 11) - ATTRIB(XonoticViewDialog, columns, float, 6.2) // added extra .2 for center space -ENDCLASS(XonoticViewDialog) +CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab) + //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity)) + METHOD(XonoticGameViewSettingsTab, fill, void(entity)) + METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)) + ATTRIB(XonoticGameViewSettingsTab, title, string, _("View")) + ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) + ATTRIB(XonoticGameViewSettingsTab, rows, float, 15) + ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) +ENDCLASS(XonoticGameViewSettingsTab) +entity makeXonoticGameViewSettingsTab(); #endif #ifdef IMPLEMENTATION -void XonoticViewDialog_showNotify(entity me) +void XonoticGameViewSettingsTab_showNotify(entity me) { loadAllCvars(me); } -string XonoticViewDialog_toString(entity me) +entity makeXonoticGameViewSettingsTab() { - return "hi"; // TODO: show fov and other settings with text here + entity me; + me = spawnXonoticGameViewSettingsTab(); + me.configureDialog(me); + return me; } -void XonoticViewDialog_fill(entity me) + +void XonoticGameViewSettingsTab_fill(entity me) { entity e; me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Field of view:"))); me.TD(me, 1, 2, e = makeXonoticSlider(60, 130, 5, "fov")); + me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Zoom:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_reticle")); @@ -67,9 +72,6 @@ void XonoticViewDialog_fill(entity me) me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VZOOM^Speed")))); me.TD(me, 1, 2, e = makeXonoticSlider(-1, 1, 0.2, "cl_velocityzoom")); setDependent(e, "cl_velocityzoom_type", 1, 3); - me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_clippedspectating", _("Allow passing through walls while spectating"))); me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective"))); @@ -108,10 +110,8 @@ void XonoticViewDialog_fill(entity me) me.TD(me, 1, 2, e = makeXonoticSlider(10, 50, 1, "chase_up")); setDependent(e, "chase_active", 1, 1); 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; + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_clippedspectating", _("Allow passing through walls while spectating"))); + // todo: onclick, do sendcvar if connected } #endif diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c index 94983310f..7983e0bef 100644 --- a/qcsrc/menu/xonotic/mainwindow.c +++ b/qcsrc/menu/xonotic/mainwindow.c @@ -185,10 +185,6 @@ void MainWindow_configureMainWindow(entity me) 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.weaponsDialog = i = spawnXonoticWeaponsDialog(); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); -- 2.39.2