diff --git a/data/locale/english.locale b/data/locale/english.locale index 2029e509f..8e617ae48 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1489,7 +1489,7 @@ menu.hint_progressbar_active Change color of active progress bar part menu.hint_progressbar_color Change appearance of progress bars menu.hint_progressbar_gradient Add a vertical brightness gradient to progress bars menu.hint_progressbar_infobar_position Selects the options of progressbar in the infobar -menu.hint_progressbar_passive Change color of passive progress bar part +menu.hint_progressbar_passive Change color of passive progress bar part menu.hint_progressbar_preview Use OK to change the current progressbar state menu.hint_progressbar_timescale_green Choose the green portion of colored progressbars menu.hint_progressbar_timescale_invert Select your preferred color gradient diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 4024e3090..b85c0d9e3 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2085,7 +2085,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) pb.setType(CProgressBar::PB_TIMESCALE); pb.setDesign(g_settings.theme.progressbar_design_channellist); pb.setCornerType(0); - pb.setStatusColors(COL_PROGRESSBAR_ACTIVE_PLUS_0, COL_PROGRESSBAR_PASSIVE_PLUS_0); //NI + pb.setStatusColors(COL_PROGRESSBAR_ACTIVE_PLUS_0, COL_PROGRESSBAR_PASSIVE_PLUS_0); int pb_frame = FRAME_WIDTH_NONE; if (g_settings.theme.progressbar_design_channellist == CProgressBar::PB_MONO && !g_settings.theme.progressbar_gradient) { diff --git a/src/gui/color.h b/src/gui/color.h index fc005420b..e6c0ec8f3 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -37,7 +37,7 @@ #define COL_MAXFREE 254-8*16 - 1 #define COL_NEUTRINO_TEXT 254-8*16 // 32 values? -#define COL_PROGRESSBAR 254-8*12 //NI +#define COL_PROGRESSBAR 254-8*12 #define COL_MENUFOOT 254-8*11 #define COL_INFOBAR_CASYSTEM 254-8*10 #define COL_COLORED_EVENTS_CHANNELLIST 254-8*9 @@ -76,7 +76,7 @@ #define COL_MENUCONTENTINACTIVE_PLUS_0 (COL_MENUCONTENTINACTIVE + 0) #define COL_MENUFOOT_PLUS_0 (COL_MENUFOOT + 0) #define COL_BACKGROUND_PLUS_0 (COL_BACKGROUND + 0) -#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (COL_PROGRESSBAR + 0) //NI +#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (COL_PROGRESSBAR + 0) #else #define COL_SHADOW_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 0)]) #define COL_INFOBAR_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 0)]) @@ -101,7 +101,7 @@ #define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)]) #define COL_MENUFOOT_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUFOOT + 0)]) #define COL_BACKGROUND_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_BACKGROUND + 0)]) -#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_PROGRESSBAR + 0)]) //NI +#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_PROGRESSBAR + 0)]) // text colors #define COL_COLORED_EVENTS_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 0)]) @@ -120,7 +120,7 @@ #define COL_MENUCONTENTSELECTED_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 13)]) #define COL_MENUCONTENTINACTIVE_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 14)]) #define COL_INFOCLOCK_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 15)]) -#define COL_PROGRESSBAR_ACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 16)]) //NI +#define COL_PROGRESSBAR_ACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 16)]) #endif // some wrappers to get more readability @@ -134,7 +134,7 @@ #define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 #define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE -/* //NI +/* #define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7 #define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE #define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1 diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 976670546..32fb3fac7 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1740,8 +1740,8 @@ void CInfoViewer::showSNR () sigbox = new CSignalBox(BoxStartX + sigbox_offset, y_numbox+ChanHeight/2, ChanWidth - 2*sigbox_offset, ChanHeight/2, NULL, true, NULL, "S", "Q"); sigbox->setItemName("SIGBOX"); sigbox->setTextColor(COL_INFOBAR_TEXT); - sigbox->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); //NI - sigbox->setPassiveColor(COL_PROGRESSBAR_PASSIVE_PLUS_0); //NI + sigbox->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); + sigbox->setPassiveColor(COL_PROGRESSBAR_PASSIVE_PLUS_0); sigbox->setColorBody(numbox->getColorBody()); sigbox->doPaintBg(false); sigbox->enableTboxSaveScreen(numbox->getColBodyGradientMode()); @@ -1831,8 +1831,8 @@ void CInfoViewer::display_Info(const char *current, const char *next, pb_p = pb_w; timescale->setDimensionsAll(pb_startx, pb_starty, pb_w, pb_h); - timescale->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); //NI - timescale->setPassiveColor(g_settings.infobar_progressbar ? COL_PROGRESSBAR_PASSIVE_PLUS_0 : COL_INFOBAR_PLUS_0); //NI + timescale->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); + timescale->setPassiveColor(g_settings.infobar_progressbar ? COL_PROGRESSBAR_PASSIVE_PLUS_0 : COL_INFOBAR_PLUS_0); timescale->enableShadow(!g_settings.infobar_progressbar ? CC_SHADOW_ON : CC_SHADOW_OFF, OFFSET_SHADOW/2); timescale->setValues(pb_p, pb_w); }else{ diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index a99e6ce49..b7721d4d9 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -191,8 +191,8 @@ static void set_lua_variables(lua_State *L) { "SCROLLBAR", MAGIC_COLOR | (COL_SCROLLBAR) }, { "SCROLLBAR_ACTIVE", MAGIC_COLOR | (COL_SCROLLBAR_ACTIVE) }, { "SCROLLBAR_PASSIVE", MAGIC_COLOR | (COL_SCROLLBAR_PASSIVE) }, - { "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE_PLUS_0) }, //NI - { "PROGRESSBAR_PASSIVE", MAGIC_COLOR | (COL_PROGRESSBAR_PASSIVE_PLUS_0) }, //NI + { "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE_PLUS_0) }, + { "PROGRESSBAR_PASSIVE", MAGIC_COLOR | (COL_PROGRESSBAR_PASSIVE_PLUS_0) }, { "BACKGROUND", MAGIC_COLOR | (COL_BACKGROUND) }, { "DARK_RED", MAGIC_COLOR | (COL_DARK_RED0) }, { "DARK_GREEN", MAGIC_COLOR | (COL_DARK_GREEN0) }, diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index d01d2b58f..e2119a81a 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -818,10 +818,9 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) NULL, colorSetupNotifier); CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue, &t.shadow_alpha, colorSetupNotifier); - //NI + // progress bar colors CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue, NULL, colorSetupNotifier); - //NI CColorChooser* chProgressbar_active = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, &t.progressbar_active_red, &t.progressbar_active_green, &t.progressbar_active_blue, NULL, colorSetupNotifier); @@ -997,15 +996,15 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW); menu_colors->addItem(mf); - //NI progressbar + // progressbar menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR)); - //NI - progressbar passive + // progressbar passive mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, true, NULL, chProgressbar_passive ); mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_PASSIVE); menu_colors->addItem(mf); - //NI - progressbar aktive + // progressbar active mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, true, NULL, chProgressbar_active ); mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE); menu_colors->addItem(mf); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 961e02bf9..61ee07896 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -335,7 +335,7 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32( "shadow_green", t.shadow_green ); configfile.setInt32( "shadow_blue", t.shadow_blue ); - //NI + // progressbar configfile.setInt32( "progressbar_active_red", t.progressbar_active_red ); configfile.setInt32( "progressbar_active_green", t.progressbar_active_green ); configfile.setInt32( "progressbar_active_blue", t.progressbar_active_blue ); @@ -447,7 +447,7 @@ void CThemes::getTheme(CConfigFile &configfile) t.shadow_green = configfile.getInt32( "shadow_green", 0 ); t.shadow_blue = configfile.getInt32( "shadow_blue", 0 ); - //NI + // progressbar t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 62 ); t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 62 ); t.progressbar_active_blue = configfile.getInt32( "progressbar_active_blue", 62 ); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 6057c1987..9a39e00f0 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -313,7 +313,7 @@ void CColorSetupNotifier::setPalette() convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)), convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), 8, convertSetupAlpha2Alpha(t.infobar_alpha) ); - //NI + frameBuffer->paletteGenFade(COL_PROGRESSBAR, convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue), convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), @@ -399,7 +399,7 @@ void CColorSetupNotifier::setPalette() frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15, convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue), convertSetupAlpha2Alpha(t.clock_Digit_alpha)); - //NI + // COL_PROGRESSBAR_ACTIVE frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16, convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), diff --git a/src/system/settings.h b/src/system/settings.h index aa4f44a33..bbceeb71a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -163,7 +163,6 @@ struct SNeutrinoTheme unsigned char shadow_green; unsigned char shadow_blue; - //NI unsigned char progressbar_active_red; unsigned char progressbar_active_green; unsigned char progressbar_active_blue;