From 9135a4701b33e9d98e8a3b62e133413d22f31384 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 24 Apr 2012 23:16:31 +0200 Subject: [PATCH] Add "Set selected as default menu track" button --- defaultXonotic.cfg | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c | 6 +++++- qcsrc/menu/xonotic/soundlist.c | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 9503286d1..d319c3582 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1402,7 +1402,7 @@ cd remap $g_cdtracks_remaplist set sv_intermission_cdtrack "" set g_cdtracks_dontusebydefault "rising-of-the-phoenix" -set menu_cdtrack "rising-of-the-phoenix" +seta menu_cdtrack "rising-of-the-phoenix" // maxidle (in seconds): kick players idle for more than that amount of time set sv_maxidle 0 diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c index b2f72bca1..00eec6ebe 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c @@ -41,7 +41,7 @@ void XonoticMusicPlayerTab_fill(entity me) me.TR(me); me.TD(me, me.rows - 4, me.columns, soundList); - me.gotoRC(me, me.rows - 1, 0); + me.gotoRC(me, me.rows - 2, 0); me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Stop")), '0 0 0')); e.onClick = StopSound_Click; e.onClickEntity = soundList; @@ -57,5 +57,9 @@ void XonoticMusicPlayerTab_fill(entity me) me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Next")), '0 0 0')); e.onClick = NextSound_Click; e.onClickEntity = soundList; + me.TR(me); + me.TD(me, 1, me.columns, e = makeXonoticButton(_("Set selected as default menu track"), '0 0 0')); + e.onClick = SoundList_Menu_Track_Change; + e.onClickEntity = soundList; } #endif diff --git a/qcsrc/menu/xonotic/soundlist.c b/qcsrc/menu/xonotic/soundlist.c index 32a35e341..bb733a7df 100644 --- a/qcsrc/menu/xonotic/soundlist.c +++ b/qcsrc/menu/xonotic/soundlist.c @@ -34,6 +34,7 @@ void PauseSound_Click(entity btn, entity me); void PrevSound_Click(entity btn, entity me); void NextSound_Click(entity btn, entity me); void SoundList_Filter_Change(entity box, entity me); +void SoundList_Menu_Track_Change(entity box, entity me); #endif #ifdef IMPLEMENTATION @@ -132,6 +133,11 @@ void XonoticSoundList_showNotify(entity me) me.getSounds(me); } +void SoundList_Menu_Track_Change(entity box, entity me) +{ + cvar_set("menu_cdtrack", me.soundName(me,me.selectedItem)); +} + void SoundList_Filter_Change(entity box, entity me) { if(me.filterString) -- 2.39.2