mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-02-22 19:02:29 +01:00
committed by [CST] Focus
parent 12fcc7c961
commit 99f9745c97
30 changed files with 242 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/eventlist.cpp
View File

@@ -1341,15 +1341,15 @@ int CEventFinderMenu::showMenu(void)
CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red);
CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++));
m_search_channelname_mf = new CMenuForwarder("", *m_search_list != CNeutrinoEventList::SEARCH_LIST_ALL, m_search_channelname, this, "#2", CRCInput::convertDigitToKey(shortcut++));
CMenuOptionChooser* mo1 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG, m_search_epg_item, SEARCH_EPG_OPTIONS, SEARCH_EPG_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "#1", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "#1", CRCInput::RC_green);
CMenuWidget searchMenu(LOCALE_EVENTFINDER_HEAD, NEUTRINO_ICON_FEATURES, 40);
CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_EVENTFINDER_HISTORY, true, NULL, this, "#history", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_EVENTFINDER_HISTORY, true, NULL, this, "#history", CRCInput::RC_yellow);
CMenuOptionNumberChooser* moc1 = new CMenuOptionNumberChooser(LOCALE_EVENTFINDER_MAX_HISTORY, &g_settings.epg_search_history_max, true, 0, 50, NULL);
searchMenu.addItem(GenericMenuSeparatorLine);