From: Samual Lenks Date: Sun, 26 Jan 2014 02:54:55 +0000 (-0500) Subject: Use a more consistent way to handle buttons on the bottom of dialogs X-Git-Tag: xonotic-v0.8.0~139^2~1^2~33 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=d5d861641b0c708c3e148a601af553eef82ff9eb;p=xonotic%2Fxonotic-data.pk3dir.git Use a more consistent way to handle buttons on the bottom of dialogs --- diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt index 3d57ff885..30cdbb809 100755 --- a/gfx/menu/luminos/skinvalues.txt +++ b/gfx/menu/luminos/skinvalues.txt @@ -23,7 +23,7 @@ MARGIN_COLORPICKER '0 0 0' // uses "border" images // uses "closebutton" images MARGIN_TOP 8 -MARGIN_BOTTOM 12 +MARGIN_BOTTOM 16 MARGIN_LEFT 16 MARGIN_RIGHT 16 MARGIN_COLUMNS 4 diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt index 99d8209a5..00a026300 100644 --- a/gfx/menu/wickedx/skinvalues.txt +++ b/gfx/menu/wickedx/skinvalues.txt @@ -23,7 +23,7 @@ MARGIN_COLORPICKER '0 0 0' // uses "border" images // uses "closebutton" images MARGIN_TOP 8 -MARGIN_BOTTOM 12 +MARGIN_BOTTOM 16 MARGIN_LEFT 16 MARGIN_RIGHT 16 MARGIN_COLUMNS 4 diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt index b9e99d777..0b377aff2 100644 --- a/gfx/menu/xaw/skinvalues.txt +++ b/gfx/menu/xaw/skinvalues.txt @@ -117,7 +117,7 @@ COLOR_CVARLIST_CONTROLS '1 0 0' // uses "border" images // uses "closebutton" images MARGIN_TOP 8 -MARGIN_BOTTOM 12 +MARGIN_BOTTOM 16 MARGIN_LEFT 16 MARGIN_RIGHT 16 MARGIN_COLUMNS 4 diff --git a/qcsrc/menu/xonotic/dialog_settings.c b/qcsrc/menu/xonotic/dialog_settings.c index a992e8059..f7003b44d 100644 --- a/qcsrc/menu/xonotic/dialog_settings.c +++ b/qcsrc/menu/xonotic/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(XonoticSettingsDialog) EXTENDS(XonoticDialog) ATTRIB(XonoticSettingsDialog, title, string, _("Settings")) ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(XonoticSettingsDialog, rows, float, 18) + ATTRIB(XonoticSettingsDialog, rows, float, 17) ATTRIB(XonoticSettingsDialog, columns, float, 6) ENDCLASS(XonoticSettingsDialog) #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 6985fe352..d2596e63f 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, 15.5) + ATTRIB(XonoticAudioSettingsTab, rows, float, 14.5) ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticAudioSettingsTab) entity makeXonoticAudioSettingsTab(); @@ -158,7 +158,7 @@ void XonoticAudioSettingsTab_fill(entity me) if(cvar("developer")) me.TD(me, 1, 3, makeXonoticCheckBox(0, "showsound", _("Debug info about sounds"))); - me.gotoRC(me, me.rows - 1.25, 0); + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "snd_restart; snd_attenuation_method_$menu_snd_attenuation_method; sendcvar cl_hitsound; sendcvar cl_autotaunt; sendcvar cl_voice_directional; sendcvar cl_voice_directional_taunt_attenuation", COMMANDBUTTON_APPLY)); } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 44e769f9f..16d364425 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, 15.5) + ATTRIB(XonoticEffectsSettingsTab, rows, float, 14.5) ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticEffectsSettingsTab) entity makeXonoticEffectsSettingsTab(); @@ -47,7 +47,7 @@ void XonoticEffectsSettingsTab_fill(entity me) if(cvar("developer")) me.TD(me, 1, 5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Ultimate")), '0.5 0 0', "exec effects-ultimate.cfg", 0)); - me.gotoRC(me, 1.5, 0); + me.gotoRC(me, 1.25, 0); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Geometry detail:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("r_subdivisions_tolerance")); e.addValue(e, ZCTX(_("DET^Lowest")), "16"); @@ -147,7 +147,7 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 2, e = makeXonoticSlider(1, 20, 1, "cl_decals_time")); setDependent(e, "cl_decals", 1, 1); - me.gotoRC(me, 1.5, 3.2); me.setFirstColumn(me, me.currentColumn); + me.gotoRC(me, 1.25, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "r_coronas", "0", _("No dynamic lighting"))); me.TR(me); me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "gl_flashblend", string_null, _("Fake corona lighting"))); @@ -196,7 +196,7 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 2, e = makeXonoticParticlesSlider()); setDependent(e, "cl_particles", 1, 1); - me.gotoRC(me, me.rows - 1.25, 0); + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c index 8def19656..b75c1ac49 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.c +++ b/qcsrc/menu/xonotic/dialog_settings_game.c @@ -3,7 +3,7 @@ CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameSettingsTab, fill, void(entity)) ATTRIB(XonoticGameSettingsTab, title, string, _("Game")) ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameSettingsTab, rows, float, 15.5) + ATTRIB(XonoticGameSettingsTab, rows, float, 14.5) ATTRIB(XonoticGameSettingsTab, columns, float, 6.5) ENDCLASS(XonoticGameSettingsTab) entity makeXonoticGameSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c index 0455dc01e..3e164c11f 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c @@ -5,7 +5,7 @@ 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, rows, float, 13) ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameCrosshairSettingsTab) entity makeXonoticGameCrosshairSettingsTab(); @@ -67,7 +67,6 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) setDependent(e, "crosshair_enabled", 1, 2); me.TD(me, 1, 1.9, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha")); setDependent(e, "crosshair_enabled", 1, 2); - me.TR(me); me.TR(me); me.TDempty(me, 0.1); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair color:"))); @@ -116,7 +115,6 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_dot_alpha")); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); - me.TR(me); me.TR(me); me.TDempty(me, 0.1); me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Dot color:"))); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.c b/qcsrc/menu/xonotic/dialog_settings_game_hud.c index 5444d7c36..f37b2f28c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.c @@ -5,7 +5,7 @@ CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD")) ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameHUDSettingsTab, rows, float, 14) + ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13) ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameHUDSettingsTab) entity makeXonoticGameHUDSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.c b/qcsrc/menu/xonotic/dialog_settings_game_messages.c index 840d00f4b..e4fb5cffe 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.c @@ -5,7 +5,7 @@ CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages")) ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameMessageSettingsTab, rows, float, 14) + ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13) ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity, NULL) ENDCLASS(XonoticGameMessageSettingsTab) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.c b/qcsrc/menu/xonotic/dialog_settings_game_model.c index 9b6c435eb..c16408acb 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_model.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.c @@ -5,7 +5,7 @@ CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameModelSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model")) ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameModelSettingsTab, rows, float, 14) + ATTRIB(XonoticGameModelSettingsTab, rows, float, 13) ATTRIB(XonoticGameModelSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameModelSettingsTab) entity makeXonoticGameModelSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.c b/qcsrc/menu/xonotic/dialog_settings_game_view.c index 7c5299d88..88588e560 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.c @@ -5,7 +5,7 @@ CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameViewSettingsTab, title, string, _("View")) ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameViewSettingsTab, rows, float, 14) + ATTRIB(XonoticGameViewSettingsTab, rows, float, 13) ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameViewSettingsTab) entity makeXonoticGameViewSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.c b/qcsrc/menu/xonotic/dialog_settings_game_weapons.c index 067fe8ff2..a6b450d5a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.c @@ -5,7 +5,7 @@ CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity)) ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons")) ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 14) + ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13) ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6) ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity, NULL) ENDCLASS(XonoticGameWeaponsSettingsTab) @@ -36,8 +36,8 @@ void XonoticGameWeaponsSettingsTab_fill(entity me) e.alpha = 0.5; me.TR(me); me.TDempty(me, 0.25); - me.TD(me, 11, 2.5, e = me.weaponsList = makeXonoticWeaponsList()); - me.gotoRC(me, 12, 0.25); + me.TD(me, 10, 2.5, e = me.weaponsList = makeXonoticWeaponsList()); + me.gotoRC(me, 11, 0.25); me.TD(me, 1, 1.25, e = makeXonoticButton(_("Up"), '0 0 0')); e.onClick = WeaponsList_MoveUp_Click; e.onClickEntity = me.weaponsList; diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 7158a0ec4..917a92044 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, 15.5) + ATTRIB(XonoticInputSettingsTab, rows, float, 14.5) ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space ENDCLASS(XonoticInputSettingsTab) entity makeXonoticInputSettingsTab(); @@ -96,7 +96,7 @@ void XonoticInputSettingsTab_fill(entity me) } - me.gotoRC(me, me.rows - 1.25, 0); + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_movement_track_canjump", COMMANDBUTTON_APPLY)); } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index 87c9b1677..98e8a5e1d 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, 15.5) + ATTRIB(XonoticMiscSettingsTab, rows, float, 14.5) 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 d7ddcdfa2..c8dc2c175 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, 15.5) + ATTRIB(XonoticUserSettingsTab, rows, float, 14.5) ATTRIB(XonoticUserSettingsTab, columns, float, 5) ENDCLASS(XonoticUserSettingsTab) entity makeXonoticUserSettingsTab(); @@ -94,7 +94,7 @@ void XonoticUserSettingsTab_fill(entity me) me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uid2name", _("Allow player statistics to use your nickname"))); setDependent(e, "cl_allow_uidtracking", 1, 1); - me.gotoRC(me, me.rows - 2, 2.6); + me.gotoRC(me, me.rows - 1, 2.6); me.TD(me, 1, 2, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY)); } diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c index fe600ed07..a4e843413 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, 15.5) + ATTRIB(XonoticVideoSettingsTab, rows, float, 14.5) ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space ATTRIB(XonoticVideoSettingsTab, name, string, "videosettings") ENDCLASS(XonoticVideoSettingsTab) @@ -139,7 +139,7 @@ void XonoticVideoSettingsTab_fill(entity me) setDependent(e, "vid_gl20", 1, 1); } - me.gotoRC(me, me.rows - 1.25, 0); + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "vid_width $_menu_vid_width; vid_height $_menu_vid_height; vid_pixelheight $_menu_vid_pixelheight; vid_desktopfullscreen $_menu_vid_desktopfullscreen; menu_cmd update_conwidths_before_vid_restart; vid_restart; menu_cmd sync", COMMANDBUTTON_APPLY)); } #endif