X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_audio.qc;h=af8faddacecceb7a6fa9531152b26fd09a8c1bc9;hp=81624fdef0ddaf4e4aa8b461ff3189c4d60fbc0c;hb=61a847dbaab291d205cc9684b6d1a6e9bdad6375;hpb=845401fd312c66c059aaee1772ac5d79555ab4fc diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index 81624fdef0..af8faddace 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@ -1,10 +1,12 @@ -#ifdef INTERFACE -CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab) +#ifndef DIALOG_SETTINGS_AUDIO_H +#define DIALOG_SETTINGS_AUDIO_H +#include "tab.qc" +CLASS(XonoticAudioSettingsTab, 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, columns, float, 6.2) // added extra .2 for center space + ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity, NULL) ENDCLASS(XonoticAudioSettingsTab) entity makeXonoticAudioSettingsTab(); #endif @@ -13,7 +15,7 @@ entity makeXonoticAudioSettingsTab(); entity makeXonoticAudioSettingsTab() { entity me; - me = spawnXonoticAudioSettingsTab(); + me = NEW(XonoticAudioSettingsTab); me.configureDialog(me); return me; } @@ -136,7 +138,10 @@ void XonoticAudioSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 3, makeXonoticCheckBox(0, "con_chatsound", _("Chat message sound"))); me.TR(me); - me.TD(me, 1, 3, makeXonoticCheckBoxEx(2, 0, "menu_sounds", _("Menu sounds"))); + me.hiddenMenuSoundsSlider = makeXonoticSlider(1, 1, 1, "menu_sounds"); + me.TD(me, 1, 1.2, makeXonoticSliderCheckBox(0, 1, me.hiddenMenuSoundsSlider, _("Menu sounds"))); + me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(2, 0, me.hiddenMenuSoundsSlider, _("Focus sounds"))); + setDependent(e, "menu_sounds", 1, 2); me.TR(me); me.TR(me); me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Time announcer:")));