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

fix conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39b174c75
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-20 11:07:28 +04:00
parent f7d6d1efc9 fe432d2c0c
commit 8b4daf875c
25 changed files with 821 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/setting_helpers.cpp
View File

@@ -60,6 +60,8 @@
#include <global.h>
#include <neutrino.h>
#include <gui/widget/stringinput.h>
#include <gui/infoclock.h>
#include <driver/volume.h>
// obsolete #include <gui/streaminfo.h>
@@ -250,6 +252,10 @@ bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
frameBuffer->paletteSet();
/* recalculate volumebar */
CVolume::getInstance()->Init();
/* recalculate infoclock */
CInfoClock::getInstance()->Init();
return false;
}
@@ -325,7 +331,10 @@ bool CFontSizeNotifier::changeNotify(const neutrino_locale_t, void *)
CNeutrinoApp::getInstance()->SetupFonts();
hintBox.hide();
/* recalculate volumebar */
CVolume::getInstance()->Init();
/* recalculate infoclock */
CInfoClock::getInstance()->Init();
return true;
}