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

Merge remote-tracking branch 'cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-16 12:51:04 +01:00
parent 137775e41d 82c03e117f
commit 28ab173560
31 changed files with 148 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/osd_setup.cpp
View File

@@ -255,7 +255,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if (xre != g_settings.screen_xres || yre != g_settings.screen_yres) {
printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", g_settings.screen_xres, g_settings.screen_yres);
CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT | CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT_INST | CNeutrinoFonts::FONTSETUP_DYN_FONT);
CNeutrinoApp::getInstance()->channelList->ResetModules(); //force re init of all modules
if (CNeutrinoApp::getInstance()->channelList)
CNeutrinoApp::getInstance()->channelList->ResetModules(); //force re init of all modules
}
return res;
}
@@ -1439,11 +1440,12 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
}
#endif
#define SCREENSAVER_MODE_OPTION_COUNT 2
#define SCREENSAVER_MODE_OPTION_COUNT 3
const CMenuOptionChooser::keyval SCREENSAVER_MODE_OPTIONS[SCREENSAVER_MODE_OPTION_COUNT] =
{
{ 0, LOCALE_SCREENSAVER_MODE_IMAGE },
{ 1, LOCALE_SCREENSAVER_MODE_CLOCK }
{ 1, LOCALE_SCREENSAVER_MODE_CLOCK },
{ 2, LOCALE_SCREENSAVER_MODE_CLOCK_COLOR }
};
void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver)