From 399bf6de89c361387e57aadcf225d1ece3c5bca6 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 25 Feb 2011 23:41:54 +0200 Subject: [PATCH] Lengthen menu. Will be needed for a future change. --- data/qcsrc/menu/voret/dialog_settings.c | 2 +- data/qcsrc/menu/voret/dialog_settings_audio.c | 2 +- data/qcsrc/menu/voret/dialog_settings_effects.c | 5 +++-- data/qcsrc/menu/voret/dialog_settings_input.c | 2 +- data/qcsrc/menu/voret/dialog_settings_misc.c | 2 +- data/qcsrc/menu/voret/dialog_settings_network.c | 2 +- data/qcsrc/menu/voret/dialog_settings_video.c | 3 ++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/menu/voret/dialog_settings.c b/data/qcsrc/menu/voret/dialog_settings.c index e3802e1e..dc0595be 100644 --- a/data/qcsrc/menu/voret/dialog_settings.c +++ b/data/qcsrc/menu/voret/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(VoretSettingsDialog) EXTENDS(VoretDialog) ATTRIB(VoretSettingsDialog, title, string, "Settings") ATTRIB(VoretSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(VoretSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(VoretSettingsDialog, rows, float, 19) + ATTRIB(VoretSettingsDialog, rows, float, 22) ATTRIB(VoretSettingsDialog, columns, float, 6) ENDCLASS(VoretSettingsDialog) #endif diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c index 2d42e814..2b057062 100644 --- a/data/qcsrc/menu/voret/dialog_settings_audio.c +++ b/data/qcsrc/menu/voret/dialog_settings_audio.c @@ -3,7 +3,7 @@ CLASS(VoretAudioSettingsTab) EXTENDS(VoretTab) METHOD(VoretAudioSettingsTab, fill, void(entity)) ATTRIB(VoretAudioSettingsTab, title, string, "Audio") ATTRIB(VoretAudioSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretAudioSettingsTab, rows, float, 17) + ATTRIB(VoretAudioSettingsTab, rows, float, 20) ATTRIB(VoretAudioSettingsTab, columns, float, 6.5) ENDCLASS(VoretAudioSettingsTab) entity makeVoretAudioSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 7d3bcf1e..33f045c2 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -3,7 +3,7 @@ CLASS(VoretEffectsSettingsTab) EXTENDS(VoretTab) METHOD(VoretEffectsSettingsTab, fill, void(entity)) ATTRIB(VoretEffectsSettingsTab, title, string, "Effects") ATTRIB(VoretEffectsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretEffectsSettingsTab, rows, float, 17) + ATTRIB(VoretEffectsSettingsTab, rows, float, 20) ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5) ENDCLASS(VoretEffectsSettingsTab) entity makeVoretEffectsSettingsTab(); @@ -135,6 +135,7 @@ void fillVoretEffectsSettingsTab(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "* may heavily reduce performance")); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretRadioButton(1, string_null, string_null, "No dynamic lighting")); me.TR(me); @@ -162,7 +163,7 @@ void fillVoretEffectsSettingsTab(entity me) me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom")); setDependent(e, "r_hdr", 0, 0); me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)")); - + me.TR(me); me.TR(me); s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur"); me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, s, "Motion blur:")); diff --git a/data/qcsrc/menu/voret/dialog_settings_input.c b/data/qcsrc/menu/voret/dialog_settings_input.c index 048a68bd..a58b613d 100644 --- a/data/qcsrc/menu/voret/dialog_settings_input.c +++ b/data/qcsrc/menu/voret/dialog_settings_input.c @@ -3,7 +3,7 @@ CLASS(VoretInputSettingsTab) EXTENDS(VoretTab) METHOD(VoretInputSettingsTab, fill, void(entity)) ATTRIB(VoretInputSettingsTab, title, string, "Input") ATTRIB(VoretInputSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretInputSettingsTab, rows, float, 17) + ATTRIB(VoretInputSettingsTab, rows, float, 20) ATTRIB(VoretInputSettingsTab, columns, float, 6.5) ENDCLASS(VoretInputSettingsTab) entity makeVoretInputSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_misc.c b/data/qcsrc/menu/voret/dialog_settings_misc.c index 33af4958..0f646e2b 100644 --- a/data/qcsrc/menu/voret/dialog_settings_misc.c +++ b/data/qcsrc/menu/voret/dialog_settings_misc.c @@ -3,7 +3,7 @@ CLASS(VoretMiscSettingsTab) EXTENDS(VoretTab) METHOD(VoretMiscSettingsTab, fill, void(entity)) ATTRIB(VoretMiscSettingsTab, title, string, "Misc") ATTRIB(VoretMiscSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretMiscSettingsTab, rows, float, 17) + ATTRIB(VoretMiscSettingsTab, rows, float, 20) ATTRIB(VoretMiscSettingsTab, columns, float, 6.5) ENDCLASS(VoretMiscSettingsTab) entity makeVoretMiscSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_network.c b/data/qcsrc/menu/voret/dialog_settings_network.c index 2d7ce2aa..4b76e7cc 100644 --- a/data/qcsrc/menu/voret/dialog_settings_network.c +++ b/data/qcsrc/menu/voret/dialog_settings_network.c @@ -3,7 +3,7 @@ CLASS(VoretNetworkSettingsTab) EXTENDS(VoretTab) METHOD(VoretNetworkSettingsTab, fill, void(entity)) ATTRIB(VoretNetworkSettingsTab, title, string, "Network") ATTRIB(VoretNetworkSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretNetworkSettingsTab, rows, float, 17) + ATTRIB(VoretNetworkSettingsTab, rows, float, 20) ATTRIB(VoretNetworkSettingsTab, columns, float, 6.5) ENDCLASS(VoretNetworkSettingsTab) entity makeVoretNetworkSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index aa1ee53f..8a32214e 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -3,7 +3,7 @@ CLASS(VoretVideoSettingsTab) EXTENDS(VoretTab) METHOD(VoretVideoSettingsTab, fill, void(entity)) ATTRIB(VoretVideoSettingsTab, title, string, "Video") ATTRIB(VoretVideoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretVideoSettingsTab, rows, float, 17) + ATTRIB(VoretVideoSettingsTab, rows, float, 20) ATTRIB(VoretVideoSettingsTab, columns, float, 6.5) ATTRIB(VoretVideoSettingsTab, name, string, "videosettings") ENDCLASS(VoretVideoSettingsTab) @@ -93,6 +93,7 @@ void fillVoretVideoSettingsTab(entity me) setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 2, e = makeVoretSlider(0.5, 2.0, 0.05, "r_glsl_saturation")); setDependent(e, "vid_gl20", 1, 1); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_glslgamma", "Use GLSL to handle color control")); setDependent(e, "vid_gl20", 1, 1); -- 2.39.2