From: Samual Lenks Date: Mon, 14 Oct 2013 20:17:14 +0000 (-0400) Subject: Working game settings tab setup/spacing, as well as settings window X-Git-Tag: xonotic-v0.8.0~139^2~1^2~137 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31a614b0c2c82d32540539a0ad728ebad7df7d0f;p=xonotic%2Fxonotic-data.pk3dir.git Working game settings tab setup/spacing, as well as settings window spacing --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 7ba487f6e..e6cf3e1dc 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -979,7 +979,7 @@ seta menu_slist_showempty 1 "show servers even if they are no empty and have no seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now". // other serverlist cvars -seta menu_slist_categories 1 +seta menu_slist_categories 0 seta menu_slist_categories_onlyifmultiple 1 seta menu_slist_purethreshold 0 seta menu_slist_modimpurity 0 diff --git a/qcsrc/menu/xonotic/dialog_settings.c b/qcsrc/menu/xonotic/dialog_settings.c index 5e9b6d918..7280c9719 100644 --- a/qcsrc/menu/xonotic/dialog_settings.c +++ b/qcsrc/menu/xonotic/dialog_settings.c @@ -13,7 +13,7 @@ ENDCLASS(XonoticSettingsDialog) void XonoticSettingsDialog_fill(entity me) { entity mc; - mc = makeXonoticTabController(me.rows - 3); + mc = makeXonoticTabController(me.rows - 2); me.TR(me); me.TD(me, 1, 2, mc.makeTabButton(mc, _("Video"), makeXonoticVideoSettingsTab())); me.TD(me, 1, 2, mc.makeTabButton(mc, _("Effects"), makeXonoticEffectsSettingsTab())); @@ -24,7 +24,6 @@ void XonoticSettingsDialog_fill(entity me) me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("User"), makeXonoticUserSettingsTab())); me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Misc"), makeXonoticMiscSettingsTab())); me.TR(me); - me.TR(me); - me.TD(me, me.rows - 3, me.columns, mc); + me.TD(me, me.rows - 2, me.columns, mc); } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 4a93ed585..108b984a1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -3,7 +3,7 @@ CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticAudioSettingsTab, fill, void(entity)) ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio")) ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticAudioSettingsTab, rows, float, 16) + ATTRIB(XonoticAudioSettingsTab, rows, float, 17) ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticAudioSettingsTab) entity makeXonoticAudioSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 96c88199b..0d2c21913 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -3,7 +3,7 @@ CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticEffectsSettingsTab, fill, void(entity)) ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects")) ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticEffectsSettingsTab, rows, float, 16) + ATTRIB(XonoticEffectsSettingsTab, rows, float, 17) ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticEffectsSettingsTab) entity makeXonoticEffectsSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c index 32db6832f..f5faa28c6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.c +++ b/qcsrc/menu/xonotic/dialog_settings_game.c @@ -3,8 +3,8 @@ CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameSettingsTab, fill, void(entity)) ATTRIB(XonoticGameSettingsTab, title, string, _("Game")) ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameSettingsTab, rows, float, 16) - ATTRIB(XonoticGameSettingsTab, columns, float, 6) + ATTRIB(XonoticGameSettingsTab, rows, float, 17) + ATTRIB(XonoticGameSettingsTab, columns, float, 6.5) ENDCLASS(XonoticGameSettingsTab) entity makeXonoticGameSettingsTab(); #endif @@ -22,20 +22,32 @@ void XonoticGameSettingsTab_fill(entity me) { entity mc; mc = makeXonoticTabController(me.rows - 3); - me.TR(me); - me.TD(me, 1, 2, mc.makeTabButton(mc, _("View"), makeXonoticGameViewSettingsTab())); - me.TD(me, 1, 2, mc.makeTabButton(mc, _("General"), makeXonoticGameGeneralSettingsTab())); + + 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, _("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.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())); - 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())); + + me.TR(me); - me.TD(me, me.rows - 3, me.columns, mc); - - /*me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language"))); // also set sv_gentle me.gotoRC(me, 2, 3); me.setFirstColumn(me, me.currentColumn); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c index a18fec1c4..093d59063 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c @@ -1,26 +1,30 @@ #ifdef INTERFACE -CLASS(XonoticCrosshairDialog) EXTENDS(XonoticDialog) - METHOD(XonoticCrosshairDialog, toString, string(entity)) - METHOD(XonoticCrosshairDialog, fill, void(entity)) - METHOD(XonoticCrosshairDialog, showNotify, void(entity)) - ATTRIB(XonoticCrosshairDialog, title, string, _("Crosshair settings")) - ATTRIB(XonoticCrosshairDialog, color, vector, SKINCOLOR_DIALOG_CROSSHAIR) - ATTRIB(XonoticCrosshairDialog, intendedWidth, float, 0.5) - ATTRIB(XonoticCrosshairDialog, rows, float, 18) - ATTRIB(XonoticCrosshairDialog, columns, float, 3) -ENDCLASS(XonoticCrosshairDialog) +CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab) + //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity)) + METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity)) + 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) +ENDCLASS(XonoticGameCrosshairSettingsTab) +entity makeXonoticGameCrosshairSettingsTab(); #endif #ifdef IMPLEMENTATION -void XonoticCrosshairDialog_showNotify(entity me) +void XonoticGameCrosshairSettingsTab_showNotify(entity me) { loadAllCvars(me); } -string XonoticCrosshairDialog_toString(entity me) +entity makeXonoticGameCrosshairSettingsTab() { - return "hi"; // TODO: show status of crosshair dot and hittest and pickups and such here with text + entity me; + me = spawnXonoticGameCrosshairSettingsTab(); + me.configureDialog(me); + return me; } -void XonoticCrosshairDialog_fill(entity me) + +void XonoticGameCrosshairSettingsTab_fill(entity me) { entity e; @@ -52,7 +56,7 @@ void XonoticCrosshairDialog_fill(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Crosshair animations:"))); - me.TR(me); + /*me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "crosshair_effect_scalefade", _("Smooth effects of crosshairs"))); setDependent(e, "crosshair_enabled", 1, 2); @@ -90,6 +94,6 @@ void XonoticCrosshairDialog_fill(entity 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; + e.onClickEntity = me;*/ } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index f2a70ea02..daa8f3ff1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -3,7 +3,7 @@ CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticInputSettingsTab, fill, void(entity)) ATTRIB(XonoticInputSettingsTab, title, string, _("Input")) ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticInputSettingsTab, rows, float, 16) + ATTRIB(XonoticInputSettingsTab, rows, float, 17) ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticInputSettingsTab) entity makeXonoticInputSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index 533de8114..c14a47c9c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -3,7 +3,7 @@ CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticMiscSettingsTab, fill, void(entity)) ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc")) ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticMiscSettingsTab, rows, float, 16) + ATTRIB(XonoticMiscSettingsTab, rows, float, 17) ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2) ENDCLASS(XonoticMiscSettingsTab) entity makeXonoticMiscSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c index 44937b89d..fbd9ecf4a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.c +++ b/qcsrc/menu/xonotic/dialog_settings_user.c @@ -3,7 +3,7 @@ CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticUserSettingsTab, fill, void(entity)) ATTRIB(XonoticUserSettingsTab, title, string, _("User")) ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticUserSettingsTab, rows, float, 16) + ATTRIB(XonoticUserSettingsTab, rows, float, 17) ATTRIB(XonoticUserSettingsTab, columns, float, 5) ENDCLASS(XonoticUserSettingsTab) entity makeXonoticUserSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c index 9e064c6ac..d7e5ae2d8 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.c +++ b/qcsrc/menu/xonotic/dialog_settings_video.c @@ -3,7 +3,7 @@ CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticVideoSettingsTab, fill, void(entity)) ATTRIB(XonoticVideoSettingsTab, title, string, _("Video")) ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticVideoSettingsTab, rows, float, 16) + ATTRIB(XonoticVideoSettingsTab, rows, float, 17) ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space ATTRIB(XonoticVideoSettingsTab, name, string, "videosettings") ENDCLASS(XonoticVideoSettingsTab) diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c index a82e07458..94983310f 100644 --- a/qcsrc/menu/xonotic/mainwindow.c +++ b/qcsrc/menu/xonotic/mainwindow.c @@ -14,7 +14,6 @@ CLASS(MainWindow) EXTENDS(ModalController) ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL) ATTRIB(MainWindow, viewDialog, entity, NULL) ATTRIB(MainWindow, modelDialog, entity, NULL) - ATTRIB(MainWindow, crosshairDialog, entity, NULL) ATTRIB(MainWindow, hudDialog, entity, NULL) ATTRIB(MainWindow, hudconfirmDialog, entity, NULL) ATTRIB(MainWindow, mainNexposee, entity, NULL) @@ -173,11 +172,7 @@ void MainWindow_configureMainWindow(entity me) me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); - // dialogs used by multiplayer/player setup - me.crosshairDialog = i = spawnXonoticCrosshairDialog(); - i.configureDialog(i); - me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); - + // dialogs used by multiplayer/player setup me.hudDialog = i = spawnXonoticHUDDialog(); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);