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

Merge branch 'check/next' into master

Browse Source 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-03-07 17:10:11 +01:00
parent 9fc6c24a21 224122b004
commit c7a62999f4
12 changed files with 335 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/osd_setup.cpp
View File

@@ -994,6 +994,10 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
if((uint)g_settings.key_screenshot == CRCInput::RC_nokey)
menu_screenshot->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCREENSHOT_INFO));
CMenuForwarder * mf = new CMenuForwarder(LOCALE_SCREENSHOT_DEFDIR, true, g_settings.screenshot_dir, this, "screenshot_dir");
mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_DIR);
menu_screenshot->addItem(mf);
CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_SCREENSHOT_COUNT, &g_settings.screenshot_count, true, 1, 5, NULL);
nc->setHint("", LOCALE_MENU_HINT_SCREENSHOT_COUNT);
menu_screenshot->addItem(nc);
@@ -1002,10 +1006,6 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
mc->setHint("", LOCALE_MENU_HINT_SCREENSHOT_FORMAT);
menu_screenshot->addItem(mc);
CMenuForwarder * mf = new CMenuForwarder(LOCALE_SCREENSHOT_DEFDIR, true, g_settings.screenshot_dir, this, "screenshot_dir");
mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_DIR);
menu_screenshot->addItem(mf);
mc = new CMenuOptionChooser(LOCALE_SCREENSHOT_RES, &g_settings.screenshot_mode, SCREENSHOT_OPTIONS, SCREENSHOT_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SCREENSHOT_RES);
menu_screenshot->addItem(mc);