From d837bbbbaf94ed4776a88e81e18633a03ef3be2e Mon Sep 17 00:00:00 2001 From: micha-bbg Date: Wed, 9 Nov 2011 01:02:27 +0000 Subject: [PATCH] Mute-Zap switch channel list - Mute-Zap Icon remove from the channel list - Moved Mute-Zap switch in the Misc Settings menu - Mute function restored in the channel list git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1840 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/channellist.cpp | 37 +++++++++++------------------------ src/gui/channellist.h | 1 - src/gui/miscsettings_menu.cpp | 5 +++-- src/neutrino.cpp | 2 ++ src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/settings.h | 1 + 9 files changed, 21 insertions(+), 29 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7c357ee7b..6e5c3eaab 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -237,6 +237,7 @@ channellist.foot_off aus channellist.head Alle Kanäle channellist.history Verlauf channellist.make_hdlist Erzeuge "HD"- Bouquet +channellist.new_zap_mode Quickzap in Liste channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(MENU-Taste -> Service) channellist.provs Anbieter channellist.recording_not_possible Aufnahme nicht möglich! diff --git a/data/locale/english.locale b/data/locale/english.locale index 207e3166b..c64aabba6 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -237,6 +237,7 @@ channellist.foot_off off channellist.head All Services channellist.history History channellist.make_hdlist Create list of HD channels +channellist.new_zap_mode Quickzap in list channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service) channellist.provs Providers channellist.recording_not_possible Recording not possible! diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 716c9191a..2bedd62bf 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -104,7 +104,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl this->historyMode = phistoryMode; vlist = _vlist; selected_chid = 0; - this->new_mode_active = false; footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar //printf("************ NEW LIST %s : %x\n", name.c_str(), this);fflush(stdout); } @@ -468,7 +467,6 @@ int CChannelList::show() return res; } - this->new_mode_active = 0; int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); width = w_max (((g_settings.channellist_extended)?(frameBuffer->getScreenWidth() / 20 * (fw+6)):(frameBuffer->getScreenWidth() / 20 * (fw+5))), 100); height = h_max ((frameBuffer->getScreenHeight() / 20 * 16), (frameBuffer->getScreenHeight() / 20 * 2)); @@ -489,9 +487,6 @@ int CChannelList::show() frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &icol_h); theight = std::max(theight, icol_h); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &icol_w, &icol_h); - theight = std::max(theight, icol_h); - fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight(); if (fheight == 0) fheight = 1; /* avoid crash on invalid font */ @@ -644,7 +639,7 @@ int CChannelList::show() selected=0; liststart = (selected/listmaxshow)*listmaxshow; paint(); - if(this->new_mode_active && SameTP()) { + if(g_settings.channellist_new_zap_mode && SameTP()) { actzap = true; zapTo(selected); } @@ -653,7 +648,7 @@ int CChannelList::show() selected=chanlist.size()-1; liststart = (selected/listmaxshow)*listmaxshow; paint(); - if(this->new_mode_active && SameTP()) { + if(g_settings.channellist_new_zap_mode && SameTP()) { actzap = true; zapTo(selected); } @@ -682,7 +677,7 @@ int CChannelList::show() showChannelLogo(); } - if(this->new_mode_active && SameTP()) { + if(g_settings.channellist_new_zap_mode && SameTP()) { actzap = true; zapTo(selected); } @@ -714,7 +709,7 @@ int CChannelList::show() showChannelLogo(); } - if(this->new_mode_active && SameTP()) { + if(g_settings.channellist_new_zap_mode && SameTP()) { actzap = true; zapTo(selected); } @@ -771,11 +766,6 @@ int CChannelList::show() loop=false; } } - else if ( msg == CRCInput::RC_spkr ) { - this->new_mode_active = (this->new_mode_active ? 0 : 1); - paintHead(); - showChannelLogo(); - } else if (CRCInput::isNumeric(msg) && (this->historyMode || g_settings.sms_channel)) { if (this->historyMode) { //numeric zap switch (msg) { @@ -907,7 +897,6 @@ int CChannelList::show() printf("CChannelList:: bouquetList->exec res %d\n", res); } CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - this->new_mode_active = 0; if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode()) return -1; @@ -1160,11 +1149,11 @@ void CChannelList::zapTo(int pos, bool /* forceStoreToLastChannels */) if (bouquetList != NULL) { CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id); } - if(this->new_mode_active) + if(g_settings.channellist_new_zap_mode) selected_in_new_mode = pos; } - if(!this->new_mode_active) { + if(!g_settings.channellist_new_zap_mode) { selected = pos; #if 0 /* TODO lastChList.store also called in adjustToChannelID, which is called @@ -2054,26 +2043,22 @@ void CChannelList::paintHead() timestr_len = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(timestr, true); // UTF-8 } - int iw1, iw2, iw3, ih = 0; - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iw1, &ih); + int iw1, iw2, ih = 0; + frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_INFO, &iw1, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &iw2, &ih); - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &iw3, &ih); // head frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);//round - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x + width - iw1 - 4, y, theight); //y+ 5 ); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_INFO, x + width - iw1 - 4, y, theight); //y+ 5 ); frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, x + width - iw1 - iw2 - 8, y, theight);//y + 5); // icon for bouquet list button - frameBuffer->paintIcon(this->new_mode_active ? - NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE : NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE, - x + width - iw1 - iw2 - iw3 - 12, y, theight); if (gotTime) { - g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + width - iw1 - iw2 - iw3 - 16 -timestr_len, + g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + width - iw1 - iw2 - 16 -timestr_len, y+theight, timestr_len, timestr, COL_MENUHEAD, 0, true); // UTF-8 timestr_len += 4; } - timestr_len += iw1 + iw2 + iw3 + 16; + timestr_len += iw1 + iw2 + 16; logo_off = timestr_len + 4; g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+0, width - timestr_len, name, COL_MENUHEAD, 0, true); // UTF-8 } diff --git a/src/gui/channellist.h b/src/gui/channellist.h index fb90c5334..10f1e6dc5 100644 --- a/src/gui/channellist.h +++ b/src/gui/channellist.h @@ -80,7 +80,6 @@ private: bool displayNext; int info_height; - bool new_mode_active; int ChannelList_Rec; void paintDetails(int index); diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 54ef10f2e..a1cd53318 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -304,8 +304,9 @@ void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist) { ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST); - ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST, &g_settings.make_hd_list, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST , &g_settings.make_hd_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE , &g_settings.zap_cycle , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_NEW_ZAP_MODE, &g_settings.channellist_new_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true )); } #ifdef CPU_FREQ diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 543de75f2..8272de1cb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -703,6 +703,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.channellist_epgtext_align_right = configfile.getBool("channellist_epgtext_align_right" , false); g_settings.channellist_extended = configfile.getBool("channellist_extended" , true); g_settings.channellist_foot = configfile.getInt32("channellist_foot" , 1);//default next Event + g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 0); //screen configuration g_settings.screen_xres = configfile.getInt32("screen_xres", 100); @@ -1244,6 +1245,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setBool("channellist_epgtext_align_right", g_settings.channellist_epgtext_align_right); configfile.setBool("channellist_extended" , g_settings.channellist_extended); configfile.setInt32("channellist_foot" , g_settings.channellist_foot); + configfile.setInt32("channellist_new_zap_mode", g_settings.channellist_new_zap_mode); configfile.setString( "repeat_blocker", g_settings.repeat_blocker ); configfile.setString( "repeat_genericblocker", g_settings.repeat_genericblocker ); configfile.setInt32("remote_control_hardware", g_settings.remote_control_hardware); diff --git a/src/system/locals.h b/src/system/locals.h index 28f139a90..3ce2a7da3 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -264,6 +264,7 @@ typedef enum LOCALE_CHANNELLIST_HEAD, LOCALE_CHANNELLIST_HISTORY, LOCALE_CHANNELLIST_MAKE_HDLIST, + LOCALE_CHANNELLIST_NEW_ZAP_MODE, LOCALE_CHANNELLIST_NONEFOUND, LOCALE_CHANNELLIST_PROVS, LOCALE_CHANNELLIST_RECORDING_NOT_POSSIBLE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e9cc39fc2..75e0197a3 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -264,6 +264,7 @@ const char * locale_real_names[] = "channellist.head", "channellist.history", "channellist.make_hdlist", + "channellist.new_zap_mode", "channellist.nonefound", "channellist.provs", "channellist.recording_not_possible", diff --git a/src/system/settings.h b/src/system/settings.h index a0ce201bf..6ccead768 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -326,6 +326,7 @@ struct SNeutrinoSettings int channellist_epgtext_align_right; int channellist_extended; int channellist_foot; + int channellist_new_zap_mode; char repeat_blocker[4]; char repeat_genericblocker[4];