mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
parent bbb5a87825 f37e0a9b0f
commit 8822421c6b
122 changed files with 5543 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/personalize.cpp
View File

@@ -632,7 +632,7 @@ int CPersonalizeGui::ShowMenuOptions(const int& widget)
//found observer item and if found, then define 'this' as observer for current option chooser and run changeNotify
bool is_observer = isObserver(v_item[i].widget, v_item[i].menuItem) ? true : false;
CChangeObserver* observer = is_observer ? this : NULL;
CMenuOptionChooser * opt = new CMenuOptionChooser(name, p_mode, PERSONALIZE_MODE_OPTIONS, PERSONALIZE_MODE_MAX, v_item[i].menuItem->current_active, observer);
CMenuOptionChooser * opt = new CMenuOptionChooser(name, p_mode, PERSONALIZE_MODE_OPTIONS, PERSONALIZE_MODE_MAX, v_item[i].menuItem->current_active || is_observer, observer);
if (is_observer)
changeNotify(name, (void*)p_mode);
@@ -978,6 +978,9 @@ void CPersonalizeGui::addPersonalizedItems()
sigc::slot0<void> sl = sigc::bind<0>(sigc::mem_fun1(v_item[i].menuItem, &CMenuForwarder::disableByCondition), v_item[i].condition);
v_item[i].menuItem->OnPaintItem.connect(sl);
v_item[i].default_selected = false;
//value of current_active for personalized item must have value of current settings state here!
v_item[i].menuItem->current_active = (p_mode || i_mode);
}
//add item if it's set to visible or pin protected and allow to add an forwarder as next