diff --git a/src/gui/components/cc_frm_slider.cpp b/src/gui/components/cc_frm_slider.cpp index e697f24ba..29f06fefb 100644 --- a/src/gui/components/cc_frm_slider.cpp +++ b/src/gui/components/cc_frm_slider.cpp @@ -59,8 +59,8 @@ CComponentsSlider::CComponentsSlider( const int& x_pos, const int& y_pos, const csl_body_obj = NULL; csl_slider_obj = NULL; - csl_body_icon = NEUTRINO_ICON_VOLUMEBODY; - csl_slider_icon =NEUTRINO_ICON_VOLUMESLIDER2; + csl_body_icon = NEUTRINO_ICON_SLIDER_BODY; + csl_slider_icon =NEUTRINO_ICON_SLIDER_INACTIVE; initCCSlItems(); initParent(parent); diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index 5a4faf130..bee59edb0 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -38,10 +38,10 @@ static const char * const icon_names[VALUES] = { - NEUTRINO_ICON_VOLUMESLIDER2RED, - NEUTRINO_ICON_VOLUMESLIDER2GREEN, - NEUTRINO_ICON_VOLUMESLIDER2BLUE, - NEUTRINO_ICON_VOLUMESLIDER2ALPHA + NEUTRINO_ICON_SLIDER_RED, + NEUTRINO_ICON_SLIDER_GREEN, + NEUTRINO_ICON_SLIDER_BLUE, + NEUTRINO_ICON_SLIDER_ALPHA }; static const neutrino_locale_t colorchooser_names[VALUES] = @@ -71,7 +71,7 @@ CColorChooser::CColorChooser(const neutrino_locale_t Name, unsigned char *R, uns // assuming all sliders have same dimensions int dummy; - frameBuffer->getIconSize(NEUTRINO_ICON_VOLUMESLIDER2ALPHA, &slider_width, &dummy); + frameBuffer->getIconSize(NEUTRINO_ICON_SLIDER_ALPHA, &slider_width, &dummy); bar_width = frameBuffer->scale2Res(150); /* @@ -295,13 +295,13 @@ void CColorChooser::paintSlider(int px, int py, unsigned char *spos, const neutr frameBuffer->paintBoxRel(px + text_width + 2*OFFSET_INNER_MID, py, bar_full, item_height, COL_MENUCONTENT_PLUS_0); // paint bar /* - NEUTRINO_ICON_VOLUMEBODY should be scaled to bar_width. + NEUTRINO_ICON_SLIDER_BODY should be scaled to bar_width. So long we paint a simple frame. This is more save on higher resolutions. */ - //frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + text_width + 2*OFFSET_INNER_MID + bar_offset, py, item_height); + //frameBuffer->paintIcon(NEUTRINO_ICON_SLIDER_BODY, px + text_width + 2*OFFSET_INNER_MID + bar_offset, py, item_height); frameBuffer->paintBoxFrame(px + text_width + 2*OFFSET_INNER_MID + bar_offset, py + item_height/3, bar_width, item_height/3, 1, COL_FRAME_PLUS_0); // paint slider - frameBuffer->paintIcon(selected ? iconname : NEUTRINO_ICON_VOLUMESLIDER2, px + text_width + 2*OFFSET_INNER_MID + ((*spos)*bar_width / 100), py, item_height); + frameBuffer->paintIcon(selected ? iconname : NEUTRINO_ICON_SLIDER_INACTIVE, px + text_width + 2*OFFSET_INNER_MID + ((*spos)*bar_width / 100), py, item_height); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px + OFFSET_INNER_MID, py + item_height, text_width, g_Locale->getText(text), COL_MENUCONTENT_TEXT); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index e9c5903f2..fd9807547 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -129,12 +129,6 @@ #define NEUTRINO_ICON_UPDATE "softupdate" #define NEUTRINO_ICON_UPNP "upnp" #define NEUTRINO_ICON_VIDEO "video" -#define NEUTRINO_ICON_VOLUMEBODY "volumebody" -#define NEUTRINO_ICON_VOLUMESLIDER2 "volumeslider2" -#define NEUTRINO_ICON_VOLUMESLIDER2ALPHA "volumeslider2alpha" -#define NEUTRINO_ICON_VOLUMESLIDER2BLUE "volumeslider2blue" -#define NEUTRINO_ICON_VOLUMESLIDER2GREEN "volumeslider2green" -#define NEUTRINO_ICON_VOLUMESLIDER2RED "volumeslider2red" #define NEUTRINO_ICON_VTXT "vtxt" #define NEUTRINO_ICON_VTXT_GREY "vtxt_gray" #define NEUTRINO_ICON_PARTITION "partition" @@ -182,6 +176,13 @@ #define DUMMY_ICON "dummy" +/* sliders */ +#define NEUTRINO_ICON_SLIDER_BODY "volumebody" +#define NEUTRINO_ICON_SLIDER_INACTIVE "volumeslider2" +#define NEUTRINO_ICON_SLIDER_RED "volumeslider2red" +#define NEUTRINO_ICON_SLIDER_GREEN "volumeslider2green" +#define NEUTRINO_ICON_SLIDER_BLUE "volumeslider2blue" +#define NEUTRINO_ICON_SLIDER_ALPHA "volumeslider2alpha" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray" diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 0a6a4d61e..a0b0d24ff 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -289,7 +289,7 @@ void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height, // assuming all sliders have same dimensions int slider_width, dummy; - frameBuffer->getIconSize(NEUTRINO_ICON_VOLUMESLIDER2ALPHA, &slider_width, &dummy); + frameBuffer->getIconSize(NEUTRINO_ICON_SLIDER_ALPHA, &slider_width, &dummy); int bar_width = frameBuffer->scale2Res(100); /* @@ -324,7 +324,7 @@ void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height, // paint bar frameBuffer->paintBoxFrame(bar_x + bar_offset, y + item_height/3, bar_width, item_height/3, 1, COL_MENUCONTENT_TEXT); // paint slider - frameBuffer->paintIcon(select_mode ? NEUTRINO_ICON_VOLUMESLIDER2ALPHA : NEUTRINO_ICON_VOLUMESLIDER2, bar_x + (optionV*bar_width / factor), y, item_height); + frameBuffer->paintIcon(select_mode ? NEUTRINO_ICON_SLIDER_ALPHA : NEUTRINO_ICON_SLIDER_INACTIVE, bar_x + (optionV*bar_width / factor), y, item_height); } void CMenuItem::paintItemButton(const bool select_mode, int item_height, const char * const icon_Name)