mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* gui/update_menue.cpp: add menu hints

Browse Source
This commit is contained in:
micha-bbg
2012-08-11 00:49:56 +02:00
parent bb4682125f
commit 569725ff44
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/locale/deutsch.locale
View File

@@ -1024,6 +1024,11 @@ menu.hint_shutdown_rcdelay Aktiviert den Deep-Standby, wenn der Powerknopf\nlän
menu.hint_shutdown_real Aktivieren des Soft-Standby-Modus, wenn diese Option\ndeaktiviert ist, geht die Box in den Deep-Standby
menu.hint_sleeptimer Zeitschaltuhr auf Ihrer Box aktivieren.\nDie Box geht dann in den Standby-Modus
menu.hint_soft_restart Neustarten von Neutrino-HD ohne zu Rebooten
menu.hint_softupdate_check Im Internet oder lokal nach verfügbaren Updates suchen
menu.hint_softupdate_expert Einzelne Partitionen aus dem Flash lesen / in den Flash schreiben
menu.hint_softupdate_expert_read Einzelne Partitionen (U-Boot, Splash, Kernel, SystemFS) aus dem Flash lesen
menu.hint_softupdate_expert_write Einzelne Partitionen (Splash, Kernel, SystemFS) in den Flash schreiben
menu.hint_softupdate_settings Den Updatemodus, das lokale Verzeichnis und die Konfigurationsdatei festlegen
menu.hint_start_tostandby Aktiviert den Standby-Modus nach dem starten der Box
menu.hint_streaminfo Aktuelle Sender-Informationen: PIDs, SNR-Verhältnis\nBitrate grafisch
menu.hint_subchannel_pos Hier können Sie die Anzeigeposition der Untertitel auswählen

5
data/locale/english.locale
View File

@@ -1024,6 +1024,11 @@ menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more th
menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby
menu.hint_sleeptimer Set timer to put your box\nin sleep mode
menu.hint_soft_restart Restart Neutrino-HD without reboot
menu.hint_softupdate_check In the Internet or local check for available updates
menu.hint_softupdate_expert Separate partitions from the flash read / write to the flash
menu.hint_softupdate_expert_read Separate partitions (U-Boot, Splash, Kernel, SystemFS) from the flash read
menu.hint_softupdate_expert_write Separate partitions (Splash, Kernel, SystemFS) write to the flash
menu.hint_softupdate_settings Update mode, the local directory and the configuration file to set
menu.hint_start_tostandby Enter standby mode after boot
menu.hint_streaminfo Current channel info: pids, signal and noise ratio\nBitrate graphs
menu.hint_subchannel_pos Select subchannels menu position

19
src/gui/update_menue.cpp
View File

@@ -75,6 +75,7 @@ int CSoftwareUpdate::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
int CSoftwareUpdate::showSoftwareUpdate()
/* shows the menue and options for software update */
{
CMenuForwarder * mf;
CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE);
softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE);
@@ -83,18 +84,23 @@ int CSoftwareUpdate::showSoftwareUpdate()
CFlashUpdate flash;
neutrino_locale_t up_text = (g_settings.softupdate_mode == 0) ? LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL : LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET;
update_item = new CMenuForwarder(up_text, true, NULL, &flash, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK);
softUpdate.addItem(update_item);
//settings
CUpdateSettings update_settings(update_item);
softUpdate.addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
softUpdate.addItem(mf);
softUpdate.addItem(GenericMenuSeparatorLine);
//expert-functions
CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT);
showSoftwareUpdateExpert(&mtdexpert);
softUpdate.addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
softUpdate.addItem(mf);
int res = softUpdate.exec (NULL, "");
return res;
@@ -103,8 +109,13 @@ int CSoftwareUpdate::showSoftwareUpdate()
/* shows experts-functions to read/write to the mtd */
void CSoftwareUpdate::showSoftwareUpdateExpert(CMenuWidget *w_mtd_expert)
{
CMenuForwarder * mf;
w_mtd_expert->addIntroItems();
w_mtd_expert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED));
w_mtd_expert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ);
w_mtd_expert->addItem(mf);
mf = new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE);
w_mtd_expert->addItem(mf);
}

5
src/system/locals.h
View File

@@ -1051,6 +1051,11 @@ typedef enum
LOCALE_MENU_HINT_SHUTDOWN_REAL,
LOCALE_MENU_HINT_SLEEPTIMER,
LOCALE_MENU_HINT_SOFT_RESTART,
LOCALE_MENU_HINT_SOFTUPDATE_CHECK,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE,
LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS,
LOCALE_MENU_HINT_START_TOSTANDBY,
LOCALE_MENU_HINT_STREAMINFO,
LOCALE_MENU_HINT_SUBCHANNEL_POS,

5
src/system/locals_intern.h
View File

@@ -1051,6 +1051,11 @@ const char * locale_real_names[] =
"menu.hint_shutdown_real",
"menu.hint_sleeptimer",
"menu.hint_soft_restart",
"menu.hint_softupdate_check",
"menu.hint_softupdate_expert",
"menu.hint_softupdate_expert_read",
"menu.hint_softupdate_expert_write",
"menu.hint_softupdate_settings",
"menu.hint_start_tostandby",
"menu.hint_streaminfo",
"menu.hint_subchannel_pos",