diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 6626f4747..141bf8498 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -248,6 +248,7 @@ channellist.reset_all Entferne Markierung "Neu" für alle Kanäle channellist.reset_flags Entferne Kanal-Markierung "Neu" channellist.sats Satelliten channellist.show_channellogo Senderlogos zeigen +channellist.show_channelnumber Kanalnummern zeigen channellist.since seit channellist.start Start ci.clock CI Takt (Mhz) @@ -842,6 +843,7 @@ menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste. +menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste. menu.hint_channels Kanalliste öffnen menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte menu.hint_clock_background Lassen Sie die Uhr mit Hintergrund anzeigen diff --git a/data/locale/english.locale b/data/locale/english.locale index 6c7d5e749..e577feb52 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -247,7 +247,8 @@ channellist.remember Last used channellist.reset_all Reset 'new' flag for all channels channellist.reset_flags Reset 'new' channel flag channellist.sats Satellites -channellist.show_channellogo Show channellogos +channellist.show_channellogo Show channel logos +channellist.show_channelnumber Show channel numbers channellist.since since channellist.start starts ci.clock CI clock (Mhz) @@ -841,7 +842,8 @@ menu.hint_channellist_foot Show additional information\nin bottom box menu.hint_channellist_mode Use the selected channel list mode on startup if last mode is TV menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio menu.hint_channellist_setup Configure channel list GUI options -menu.hint_channellist_show_channellogo Show channellogos in channel list +menu.hint_channellist_show_channellogo Show channel logos in channel list +menu.hint_channellist_show_channelnumber Show channel number in channel list menu.hint_channels Open channel list menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card menu.hint_clock_background Show clock with theme's background color diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 97365f813..051670ba0 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2023,9 +2023,12 @@ void CChannelList::paintItem(int pos, const bool firstpaint) int icon_space = r_icon_w+s_icon_w; - //number - int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp); - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight); + //channel numbers + if (g_settings.channellist_show_numbers) { + int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp); + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight); + } else + numwidth = -5; int l=0; if (this->historyMode) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 4e4c47966..49e96e938 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -991,6 +991,11 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); menu_chanlist->addItem(mc); + + //show numbers + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER); + menu_chanlist->addItem(mc); } //eventlist diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ad2f48e53..7e9ef1cd6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -673,6 +673,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat g_settings.channellist_numeric_adjust = configfile.getInt32("channellist_numeric_adjust", 0); g_settings.channellist_show_channellogo = configfile.getInt32("channellist_show_channellogo", 1); + g_settings.channellist_show_numbers = configfile.getInt32("channellist_show_numbers", 1); //screen configuration g_settings.screen_xres = configfile.getInt32("screen_xres", 100); @@ -1175,6 +1176,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("channellist_sort_mode", g_settings.channellist_sort_mode); configfile.setInt32("channellist_numeric_adjust", g_settings.channellist_numeric_adjust); configfile.setInt32("channellist_show_channellogo", g_settings.channellist_show_channellogo); + configfile.setInt32("channellist_show_numbers", g_settings.channellist_show_numbers); //screen configuration configfile.setInt32( "screen_xres", g_settings.screen_xres); diff --git a/src/system/locals.h b/src/system/locals.h index 791067675..cb9befd0e 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -275,6 +275,7 @@ typedef enum LOCALE_CHANNELLIST_RESET_FLAGS, LOCALE_CHANNELLIST_SATS, LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, + LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, LOCALE_CHANNELLIST_SINCE, LOCALE_CHANNELLIST_START, LOCALE_CI_CLOCK, @@ -869,6 +870,7 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_MODE_RADIO, LOCALE_MENU_HINT_CHANNELLIST_SETUP, LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO, + LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER, LOCALE_MENU_HINT_CHANNELS, LOCALE_MENU_HINT_CI, LOCALE_MENU_HINT_CLOCK_BACKGROUND, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a0200ec2f..5d29c4560 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -275,6 +275,7 @@ const char * locale_real_names[] = "channellist.reset_flags", "channellist.sats", "channellist.show_channellogo", + "channellist.show_channelnumber", "channellist.since", "channellist.start", "ci.clock", @@ -869,6 +870,7 @@ const char * locale_real_names[] = "menu.hint_channellist_mode_radio", "menu.hint_channellist_setup", "menu.hint_channellist_show_channellogo", + "menu.hint_channellist_show_channelnumber", "menu.hint_channels", "menu.hint_ci", "menu.hint_clock_background", diff --git a/src/system/settings.h b/src/system/settings.h index 31fd4bc64..72d09b4f4 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -493,6 +493,7 @@ struct SNeutrinoSettings int channellist_sort_mode; int channellist_numeric_adjust; int channellist_show_channellogo; + int channellist_show_numbers; int repeat_blocker; int repeat_genericblocker; #define LONGKEYPRESS_OFF 499