From de30c9b122b037e82628cc6337c076d063e4cb91 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 4 May 2015 22:41:31 +0200 Subject: [PATCH] osd_setup: try to bring more structure in infoviewer setup Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ca5d85986e81a340df1c29d9a89bde54719a0ea4 Author: vanhofen Date: 2015-05-04 (Mon, 04 May 2015) Origin message was: ------------------ - osd_setup: try to bring more structure in infoviewer setup ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 24 ++++----- data/locale/english.locale | 22 ++++----- data/locale/nederlands.locale | 16 +++--- src/gui/osd_setup.cpp | 92 +++++++++++++++++++---------------- src/gui/osd_setup.h | 1 + src/system/locals.h | 2 +- src/system/locals_intern.h | 2 +- 7 files changed, 85 insertions(+), 74 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1d56d08ae..541855774 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -718,7 +718,7 @@ hdd_set_recdir Diesen Datenträger für die Aufnahme nutzen? hdd_settings Laufwerke hdd_sleep Ausschalten nach... hdd_slow Langsam -hdd_statfs Füllstands-Abfrage +hdd_statfs Füllstandsabfrage hdd_statfs_always immer hdd_statfs_recording nur während Aufnahme hdd_umount Aushängen @@ -1005,7 +1005,7 @@ menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol o menu.hint_infobar_dd Zeigt ein Dolby Digital Icon bei Verfügbarkeit menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speicherplatz menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar -menu.hint_infobar_logo Logo- und Signal-Optionen +menu.hint_infobar_logo Logo-, Kanalnummer- und Signal-Anzeige; Optionen in [Klammern] erscheinen in der kleinen Infobox menu.hint_infobar_logo_dir Wählen Sie das Verzeichnis für die Senderlogos menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen menu.hint_infobar_radiotext Zeigt Radiotext in einen Fenster, wenn verfügbar @@ -1424,23 +1424,23 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mode Diskret -miscsettings.infobar_disp_0 Kein Logo -miscsettings.infobar_disp_1 Logo in der Nummernbox -miscsettings.infobar_disp_2 Logo/Kanalnummer -miscsettings.infobar_disp_3 Logo+Kanalname/Signalbalken -miscsettings.infobar_disp_4 Logo+Kanalname/Kanalnummer -miscsettings.infobar_disp_5 Logo/Signalbalken -miscsettings.infobar_disp_6 Logo+Kanalnummer/Signalbalken -miscsettings.infobar_disp_log Logo +miscsettings.infobar_disp Logo-Anzeige +miscsettings.infobar_disp_0 Kanalname [Kanalnummer] +miscsettings.infobar_disp_1 Kanalnummer, Kanalname [Logo] +miscsettings.infobar_disp_2 Logo [Kanalnummer] +miscsettings.infobar_disp_3 Logo, Kanalname [Signalbalken] +miscsettings.infobar_disp_4 Logo, Kanalname [Kanalnummer] +miscsettings.infobar_disp_5 Logo [Signalbalken] +miscsettings.infobar_disp_6 Kanalnummer, Logo [Signalbalken] miscsettings.infobar_gradient_bottom Farbverlauf unten miscsettings.infobar_gradient_top Farbverlauf oben -miscsettings.infobar_logo_hdd_dir Logo-Verz. +miscsettings.infobar_logo_hdd_dir Logo-Verzeichnis miscsettings.infobar_sat_display Kabel-/Satellitenanbieter miscsettings.infobar_show Info bei EPG Änderungen miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen miscsettings.infobar_show_res Auflösung anzeigen miscsettings.infobar_show_res_simple einfach -miscsettings.infobar_show_sysfs_hdd Füllstandanzeige (sysFS & hdd) +miscsettings.infobar_show_sysfs_hdd Füllstandsanzeige (SysFS und HDD) miscsettings.infobar_show_tuner Aktiven Tuner anzeigen miscsettings.infoclock Uhr miscsettings.progressbar Fortschrittsbalken diff --git a/data/locale/english.locale b/data/locale/english.locale index 06aea2d90..6f6dcd567 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1005,7 +1005,7 @@ menu.hint_infobar_casys On: display all with colored active, mini: single\nlocke menu.hint_infobar_dd Show DD icon menu.hint_infobar_filesys Show flash and HDD used space levels menu.hint_infobar_fonts Change infobar font sizes -menu.hint_infobar_logo Logo / signal options +menu.hint_infobar_logo Logo, channelnumber and signal display; Options in [brackets] will be displayed in small infobox menu.hint_infobar_logo_dir Select directory to search for channels logo menu.hint_infobar_on_epg Show infobar on current EPG event change menu.hint_infobar_radiotext Show radiotext window @@ -1424,23 +1424,23 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet -miscsettings.infobar_disp_0 without Logo -miscsettings.infobar_disp_1 Logo in number box -miscsettings.infobar_disp_2 Logo+channel number -miscsettings.infobar_disp_3 Logo+channel name+signal -miscsettings.infobar_disp_4 Logo+channel name/number -miscsettings.infobar_disp_5 Logo+signal -miscsettings.infobar_disp_6 Logo+channel number+signal -miscsettings.infobar_disp_log Logo +miscsettings.infobar_disp Logo display +miscsettings.infobar_disp_0 Channelname [Channelnumber] +miscsettings.infobar_disp_1 Channelnumber, Channelname [Logo] +miscsettings.infobar_disp_2 Logo [Channelnumber] +miscsettings.infobar_disp_3 Logo, Channelname [Signal] +miscsettings.infobar_disp_4 Logo, Channelname [Channelnumber] +miscsettings.infobar_disp_5 Logo [Signal] +miscsettings.infobar_disp_6 Channelnumber, Logo [Signal] miscsettings.infobar_gradient_bottom Gradient bottom miscsettings.infobar_gradient_top Gradient top -miscsettings.infobar_logo_hdd_dir Logo dir +miscsettings.infobar_logo_hdd_dir Logo directory miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_show show Info on EPG change miscsettings.infobar_show_dd_available show DD availability miscsettings.infobar_show_res show resolution on infobar miscsettings.infobar_show_res_simple simple -miscsettings.infobar_show_sysfs_hdd Fill level (sysFS & hdd) +miscsettings.infobar_show_sysfs_hdd Fill level (SysFS and HDD) miscsettings.infobar_show_tuner Display active tuner miscsettings.infoclock Clock miscsettings.progressbar Progressbar diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 9900e0e75..0a5bf6e68 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -1391,14 +1391,14 @@ miscsettings.infobar Infobalk miscsettings.infobar_casystem_display CA-System weergeven miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet -miscsettings.infobar_disp_0 Zonder Logo -miscsettings.infobar_disp_1 Logo in nummerbox -miscsettings.infobar_disp_2 Logo + kanaalnummer -miscsettings.infobar_disp_3 Logo + kanaalnaam + signaal -miscsettings.infobar_disp_4 Logo + kanaalnaam/nummer -miscsettings.infobar_disp_5 Logo + signaal -miscsettings.infobar_disp_6 Logo + kanaalnummer + signaal -miscsettings.infobar_disp_log Logo +miscsettings.infobar_disp Logo display +miscsettings.infobar_disp_0 Kanaalnaam [Kanaalnummer] +miscsettings.infobar_disp_1 Kanaalnummer, Kanaalnaam [Logo] +miscsettings.infobar_disp_2 Logo [Kanaalnummer] +miscsettings.infobar_disp_3 Logo, Kanaalnaam [Signaal] +miscsettings.infobar_disp_4 Logo, Kanaalnaam [Kanaalnummer] +miscsettings.infobar_disp_5 Logo [Signaal] +miscsettings.infobar_disp_6 Kanaalnummer, Logo [Signaal] miscsettings.infobar_logo_hdd_dir Logo directory miscsettings.infobar_sat_display Satelliet weergeven op de infobalk miscsettings.infobar_show show Info wanneer EPG verandert diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index db86c5618..cecf7275e 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -75,6 +75,7 @@ COsdSetup::COsdSetup(bool wizard_mode) colorInfoclockNotifier = NULL; screensaverNotifier = NULL; channellistNotifier = NULL; + infobarHddNotifier = NULL; osd_menu = NULL; submenu_menus = NULL; mfFontFile = NULL; @@ -637,6 +638,7 @@ int COsdSetup::showOsdSetup() delete colorInfoclockNotifier; delete screensaverNotifier; delete channellistNotifier; + delete infobarHddNotifier; delete osd_menu; return res; } @@ -949,53 +951,55 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) { menu_infobar->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR); + infobarHddNotifier = new COnOffNotifier(); + CMenuOptionChooser * mc; + CMenuForwarder * mf; + + // show on epg change + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG); + menu_infobar->addItem(mc); + + // radiotext + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT); + menu_infobar->addItem(mc); + + menu_infobar->addItem(GenericMenuSeparator); + + // display options + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO); + menu_infobar->addItem(mc); + + // logo directory + mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); + mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); + menu_infobar->addItem(mf); + + // satellite/cable provider + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_SAT); + menu_infobar->addItem(mc); + + menu_infobar->addItem(GenericMenuSeparator); // CA system mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, INFOBAR_CASYSTEM_MODE_OPTIONS, INFOBAR_CASYSTEM_MODE_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS); menu_infobar->addItem(mc); - // logo - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO); - menu_infobar->addItem(mc); - - // logo directory - CMenuForwarder * mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); - mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); - menu_infobar->addItem(mf); - - // satellite - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_SAT); - menu_infobar->addItem(mc); - - //infobar position - CMenuOptionChooser *infobar_position; - infobar_position = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true); - infobar_position->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION); - menu_infobar->addItem(infobar_position); - - // flash/hdd progress - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + // flash/hdd statfs + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, infobarHddNotifier); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_FILESYS); menu_infobar->addItem(mc); - // hdd update - mc = new CMenuOptionChooser(LOCALE_HDD_STATFS, &g_settings.hdd_statfs_mode, HDD_STATFS_OPTIONS, HDD_STATFS_OPTION_COUNT, true); + // hdd statfs update + mc = new CMenuOptionChooser(LOCALE_HDD_STATFS, &g_settings.hdd_statfs_mode, HDD_STATFS_OPTIONS, HDD_STATFS_OPTION_COUNT, g_settings.infobar_show_sysfs_hdd); mc->setHint("", LOCALE_MENU_HINT_HDD_STATFS); menu_infobar->addItem(mc); - - // resolution - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RES); - menu_infobar->addItem(mc); - - // DD icon - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, &g_settings.infobar_show_dd_available, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_DD); - menu_infobar->addItem(mc); + infobarHddNotifier->addItem(mc); // tuner icon bool mc_active = false; @@ -1011,14 +1015,20 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->setHint("", LOCALE_MENU_HINT_INFOBAR_TUNER); menu_infobar->addItem(mc); - // show on epg change - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG); + // resolution + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RES); menu_infobar->addItem(mc); - // radiotext - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT); + // DD icon + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, &g_settings.infobar_show_dd_available, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_DD); + menu_infobar->addItem(mc); + + menu_infobar->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR)); + // progressbar position + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION); menu_infobar->addItem(mc); } diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 924dfb872..69346b551 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -56,6 +56,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver COnOffNotifier* colorInfoclockNotifier; COnOffNotifier* screensaverNotifier; COnOffNotifier* channellistNotifier; + COnOffNotifier* infobarHddNotifier; int width; bool is_wizard; diff --git a/src/system/locals.h b/src/system/locals.h index 67764653a..bc08bbe5b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1451,6 +1451,7 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, + LOCALE_MISCSETTINGS_INFOBAR_DISP, LOCALE_MISCSETTINGS_INFOBAR_DISP_0, LOCALE_MISCSETTINGS_INFOBAR_DISP_1, LOCALE_MISCSETTINGS_INFOBAR_DISP_2, @@ -1458,7 +1459,6 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_DISP_4, LOCALE_MISCSETTINGS_INFOBAR_DISP_5, LOCALE_MISCSETTINGS_INFOBAR_DISP_6, - LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BOTTOM, LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_TOP, LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 433604eee..04745e306 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1451,6 +1451,7 @@ const char * locale_real_names[] = "miscsettings.infobar_casystem_display", "miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mode", + "miscsettings.infobar_disp", "miscsettings.infobar_disp_0", "miscsettings.infobar_disp_1", "miscsettings.infobar_disp_2", @@ -1458,7 +1459,6 @@ const char * locale_real_names[] = "miscsettings.infobar_disp_4", "miscsettings.infobar_disp_5", "miscsettings.infobar_disp_6", - "miscsettings.infobar_disp_log", "miscsettings.infobar_gradient_bottom", "miscsettings.infobar_gradient_top", "miscsettings.infobar_logo_hdd_dir",