diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 06d41aaf3..949532a37 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -676,7 +676,6 @@ ledcontroler.off LED1 & LED2 aus ledcontroler.on.all LED1 & LED2 an ledcontroler.on.led1 LED1 an ledcontroler.on.led2 LED2 an -logo_hdd_dir Logo Verz. mainmenu.audioplayer Audioplayer mainmenu.clearsectionsd Lösche EPG Cache mainmenu.games Spiele @@ -758,6 +757,7 @@ miscsettings.infobar_disp_3 Logo+Kanalname/Signalbalken miscsettings.infobar_disp_4 Logo+Kanalname/Kanalnummer miscsettings.infobar_disp_5 Logo/Signalbalken miscsettings.infobar_disp_log Logo +miscsettings.infobar_logo_hdd_dir Logo Verz. miscsettings.infobar_sat_display Kabel-/Satellitenanbieter miscsettings.infobar_show Info bei EPG Änderungen miscsettings.infobar_show_res Auflösung anzeigen diff --git a/data/locale/english.locale b/data/locale/english.locale index ae0513299..c3ba2bad4 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -676,7 +676,6 @@ ledcontroler.off Led1 & Led2 off ledcontroler.on.all Led1 & Led2 on ledcontroler.on.led1 Led1 on ledcontroler.on.led2 Led2 on -logo_hdd_dir Logo dir mainmenu.audioplayer Audioplayer mainmenu.clearsectionsd Clear EPG Cache mainmenu.games Games @@ -758,6 +757,7 @@ miscsettings.infobar_disp_3 Logo 3 miscsettings.infobar_disp_4 Logo 4 miscsettings.infobar_disp_5 Logo 5 miscsettings.infobar_disp_log Logo +miscsettings.infobar_logo_hdd_dir Logo dir miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_show show Info on EPG change miscsettings.infobar_show_res show resolution on infobar diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index a0acad18a..0b67276f4 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -89,13 +89,6 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey) if(chooserDir(g_settings.plugin_hdd_dir, false, action_str)) g_PluginList->loadPlugins(); - return menu_return::RETURN_REPAINT; - } - else if(actionKey == "logo_dir") - { - const char *action_str = "logo"; - chooserDir(g_settings.logo_hdd_dir, false, action_str); - return menu_return::RETURN_REPAINT; } #ifdef ONE_KEY_PLUGIN @@ -248,7 +241,6 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTOR_SWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); ms_general->addItem(new CMenuForwarder(LOCALE_PLUGINS_HDD_DIR, true, g_settings.plugin_hdd_dir, this, "plugin_dir")); - ms_general->addItem(new CMenuForwarder(LOCALE_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir")); #ifdef ONE_KEY_PLUGIN ms_general->addItem(new CMenuForwarder(LOCALE_EXTRA_KEY_PLUGIN, true, g_settings.onekey_plugin,this,"onekeyplugin")); #endif /*ONE_KEY_PLUGIN*/ diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index bd084ff89..b48fb401d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -162,6 +162,11 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) CNeutrinoApp::getInstance()->SetupTiming(); return menu_return::RETURN_REPAINT; } + else if(actionKey=="logo_dir") { + const char *action_str = "logo"; + chooserDir(g_settings.logo_hdd_dir, false, action_str); + return menu_return::RETURN_REPAINT; + } showOsdSetup(); @@ -559,8 +564,8 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) menu_infobar->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, INFOBAR_CASYSTEM_MODE_OPTIONS, INFOBAR_CASYSTEM_MODE_OPTION_COUNT, true)); - menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true)); + menu_infobar->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir")); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); diff --git a/src/system/locals.h b/src/system/locals.h index 8b82225c9..332a0a1af 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -703,7 +703,6 @@ typedef enum LOCALE_LEDCONTROLER_ON_ALL, LOCALE_LEDCONTROLER_ON_LED1, LOCALE_LEDCONTROLER_ON_LED2, - LOCALE_LOGO_HDD_DIR, LOCALE_MAINMENU_AUDIOPLAYER, LOCALE_MAINMENU_CLEARSECTIONSD, LOCALE_MAINMENU_GAMES, @@ -785,6 +784,7 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_DISP_4, LOCALE_MISCSETTINGS_INFOBAR_DISP_5, LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, + LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_SHOW, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index b78c54b33..af0004fe1 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -703,7 +703,6 @@ const char * locale_real_names[] = "ledcontroler.on.all", "ledcontroler.on.led1", "ledcontroler.on.led2", - "logo_hdd_dir", "mainmenu.audioplayer", "mainmenu.clearsectionsd", "mainmenu.games", @@ -785,6 +784,7 @@ const char * locale_real_names[] = "miscsettings.infobar_disp_4", "miscsettings.infobar_disp_5", "miscsettings.infobar_disp_log", + "miscsettings.infobar_logo_hdd_dir", "miscsettings.infobar_sat_display", "miscsettings.infobar_show", "miscsettings.infobar_show_res",