From: terencehill Date: Sun, 15 Aug 2010 21:35:34 +0000 (+0200) Subject: Minor cleanups: X-Git-Tag: xonotic-v0.1.0preview~341^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2cd43ce5ca2e968ecf05e3f554f59b138bd0c7a;p=xonotic%2Fxonotic-data.pk3dir.git Minor cleanups: - add ... to the Waypoints Setup button label - remove unneeded TDempty and TR - place the frequency textlabel in a more "standard" way --- diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c index 05ed89887..bd54aa219 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c @@ -163,6 +163,5 @@ void XonoticMapInfoDialog_fill(entity me) me.TD(me, 1, me.columns - 5.5, me.startButton = e = makeXonoticButton("Play", '0 0 0')); me.startButton.onClick = MapList_LoadMap; me.startButton.onClickEntity = NULL; // filled later - me.TDempty(me, 0.5); } #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index 8c75c1f46..754da256a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -151,7 +151,7 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "1.25", "Enemies")); me.TR(me); me.TDempty(me, 0.4); - me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints Setup", '0 0 0')); + me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints setup...", '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.waypointDialog; me.TDempty(me, 0.5); @@ -178,7 +178,6 @@ void XonoticPlayerSettingsTab_fill(entity me) e.addValue(e, "Lots", "0"); e.configureXonoticTextSliderValues(e); setDependent(e, "cl_gentle", 0, 0); - me.TR(me); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY)); diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 7d1f17f0f..62506a643 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -155,7 +155,8 @@ void XonoticAudioSettingsTab_fill(entity me) if(sl.value != e.savedValue) e.savedValue = 0.65; // default me.TR(me); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0.1, "Frequency:")); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Frequency:")); me.TD(me, 1, 2, sl); me.TR(me); me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index a60657c27..89c8471ca 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -73,6 +73,5 @@ void XonoticMiscSettingsTab_fill(entity me) me.TD(me, 1, 2, e = makeXonoticButton("Advanced settings...", '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.cvarsDialog; - me.TDempty(me, 0.5); } #endif