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

move infoicons-setup from ni-menu to miscsettings-menu

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d2193126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move infoicons-setup from ni-menu to miscsettings-menu

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:30:35 +02:00
parent f657208a1d
commit c69e624170
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -936,7 +936,7 @@ infoicons_flag_name4 Benutzerdefiniert
infoicons_flag_name5 Benutzerdefiniert
infoicons_flag_name6 Benutzerdefiniert
infoicons_flag_name7 Benutzerdefiniert
infoicons_head Infoicons Einstellungen
infoicons_head Infoicons
infoicons_infoviewer mit Infoviewer
infoicons_modeicon Infoicons
infoicons_msg_start Infoicons werden gestartet

2
data/locale/english.locale
View File

@@ -935,7 +935,7 @@ infoicons_flag_name4 Custom
infoicons_flag_name5 Custom
infoicons_flag_name6 Custom
infoicons_flag_name7 Custom
infoicons_head Infoicons Settings
infoicons_head Infoicons
infoicons_infoviewer with Infoviewer
infoicons_modeicon Infoicons
infoicons_msg_start starting Infoicons

7
src/gui/miscsettings_menu.cpp
View File

@@ -39,6 +39,7 @@
#include <gui/miscsettings_menu.h>
#include <gui/cec_setup.h>
#include <gui/filebrowser.h>
#include <gui/infoicons_setup.h>
#include <gui/keybind_setup.h>
#include <gui/plugins.h>
#include <gui/sleeptimer.h>
@@ -296,6 +297,12 @@ int CMiscMenue::showMiscSettingsMenu()
misc_menue.addItem( new CMenuForwarder("CPU", true, NULL, &misc_menue_cpu, NULL, CRCInput::RC_5));
#endif /*CPU_FREQ*/
// Infoicons Setup
CInfoIconsSetup infoicons_setup;
mf = new CMenuForwarder(LOCALE_INFOICONS_HEAD, true, NULL, &infoicons_setup, NULL, CRCInput::RC_6);
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_INFOICONS_HEAD);
misc_menue.addItem(mf);
int res = misc_menue.exec(NULL, "");
delete fanNotifier;

7
src/gui/ni_menu.cpp
View File

@@ -36,7 +36,6 @@
#include <mymenu.h>
#include <neutrino_menue.h>
#include <gui/infoicons_setup.h>
#include <gui/lcd4l_setup.h>
#include <gui/netfs_setup.h>
#include <gui/plugins_hide.h>
@@ -258,12 +257,6 @@ int CNIMenu::show()
// --- Special settings ---
ni_menu->addItem(new CMenuSeparator(CMenuSeparator::ALIGN_CENTER | CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_NIMENU_HEAD_SPECIAL));
// Infoicons Setup
CInfoIconsSetup infoicons_setup;
mf = new CMenuForwarder(LOCALE_INFOICONS_HEAD, true, NULL, &infoicons_setup, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_INFOICONS_HEAD);
ni_menu->addItem(mf);
// NetFS Setup
CNETFSSetup netfs_setup;
mf = new CMenuForwarder(LOCALE_NETFS_MENU_MAIN_HEAD, true, NULL, &netfs_setup, NULL, CRCInput::convertDigitToKey(shortcut++));