merge neutrino-mp menu/buttons/icons changes, (C) martii

Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-07-17 14:32:44 +04:00
parent d56a3733e9
commit 5ee14dabdd
48 changed files with 1285 additions and 970 deletions

View File

@@ -125,7 +125,7 @@ int CAudioPlayerSetup::showAudioPlayerSetup()
mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST);
audioplayerSetup->addItem(mc);
CMenuOptionNumberChooser *cc = new CMenuOptionNumberChooser(LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT, &g_settings.audioplayer_screensaver, true, 0, 999, NULL, 0, 0, LOCALE_OPTIONS_OFF);
CMenuOptionNumberChooser *cc = new CMenuOptionNumberChooser(LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT, &g_settings.audioplayer_screensaver, true, 0, 999, NULL, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
cc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE));
cc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER);
audioplayerSetup->addItem(cc);