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

drop explicit CMenuForwarder icon assignments

Browse Source 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
This commit is contained in:
martii
2014-02-22 19:02:29 +01:00
committed by [CST] Focus
parent 0973d86ff9
commit 69f917f16d
30 changed files with 242 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/record_setup.cpp
View File

@@ -180,7 +180,7 @@ int CRecordSetup::showRecordSetup()
recordingSettings->addIntroItems(LOCALE_MAINSETTINGS_RECORDING);
#if 0
//apply settings
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_SETUPNOW, true, NULL, this, "recording", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_SETUPNOW, true, NULL, this, "recording", CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_RECORD_APPLY);
recordingSettings->addItem(mf);
recordingSettings->addItem(GenericMenuSeparatorLine);
@@ -193,12 +193,12 @@ int CRecordSetup::showRecordSetup()
if (g_settings.easymenu) {
//timeshift
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT);
recordingSettings->addItem(mf);
//timersettings
mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_green);
mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER);
recordingSettings->addItem(mf);
}
@@ -207,7 +207,7 @@ int CRecordSetup::showRecordSetup()
//record dir
CMenuForwarder* fRecDir;
if (g_settings.easymenu)
fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir", CRCInput::RC_yellow);
else
fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir");
fRecDir->setHint("", LOCALE_MENU_HINT_RECORD_DIR);
@@ -215,7 +215,7 @@ int CRecordSetup::showRecordSetup()
CMenuOptionChooser* channel_rec_dir;
if (g_settings.easymenu)
channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_blue);
else
channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
channel_rec_dir->setHint("", LOCALE_MENU_HINT_RECORD_CHANDIR);
@@ -256,12 +256,12 @@ int CRecordSetup::showRecordSetup()
if (!g_settings.easymenu) {
//timeshift
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green);
mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT);
recordingSettings->addItem(mf);
//timersettings
mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow);
mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER);
recordingSettings->addItem(mf);
}
@@ -271,7 +271,7 @@ int CRecordSetup::showRecordSetup()
if (!g_settings.easymenu) {
//audiosettings
showRecordAudioSetup(&recordingaAudioSettings);
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS);
recordingSettings->addItem(mf);