diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 57c34d6f3..effcf4ad6 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -377,6 +377,7 @@ colormenusetup.menucontent_inactive Fensterinhalt deaktiviert colormenusetup.menucontent_selected Fensterinhalt selektiert colormenusetup.menufoot Fußleiste colormenusetup.menuhead Titelleiste +colorsetup.save Speichern colorstatusbar.text Infobar colorthememenu.head Theme auswählen colorthememenu.head2 Themes laden diff --git a/data/locale/english.locale b/data/locale/english.locale index f2a74b900..2029e509f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -377,6 +377,7 @@ colormenusetup.menucontent_inactive Content inactive colormenusetup.menucontent_selected Content selected colormenusetup.menufoot Footer colormenusetup.menuhead Header +colorsetup.save Save colorstatusbar.text Infobar colorthememenu.head Select theme colorthememenu.head2 Load themes diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index 162a93b51..2f65ca6ce 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -292,7 +292,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) void CColorChooser::hide() { - frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW); + frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + header_height + OFFSET_SHADOW); } void CColorChooser::paint() @@ -301,10 +301,16 @@ void CColorChooser::paint() header.enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT); header.paint(CC_SAVE_SCREEN_NO); - PaintBoxRel(x, y + header_height, width, height - header_height, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM, CC_SHADOW_ON); + + PaintBoxRel(x, y + header_height, width, height - header_height, COL_MENUCONTENT_PLUS_0, RADIUS_NONE, CORNER_NONE, CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT); for (int i = 0; i < VALUES; i++) paintSlider(x, y + header_height + OFFSET_INNER_SMALL + i*item_height, value[i], colorchooser_names[i], icon_names[i], (i == 0)); + + CComponentsFooter footer(x, y + height, width , 0, CComponentsFooter::CC_BTN_LEFT | CComponentsFooter::CC_BTN_UP | CComponentsFooter::CC_BTN_DOWN | CComponentsFooter::CC_BTN_RIGHT); + footer.setButtonLabel(NEUTRINO_ICON_BUTTON_OKAY, LOCALE_COLORSETUP_SAVE, width/3); + footer.enableShadow(CC_SHADOW_ON); + footer.paint(CC_SAVE_SCREEN_NO); } void CColorChooser::paintSlider(int px, int py, unsigned char *spos, const neutrino_locale_t text, const char * const iconname, const bool selected) diff --git a/src/system/locals.h b/src/system/locals.h index 8d8d568ad..535d0d536 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -404,6 +404,7 @@ typedef enum LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED, LOCALE_COLORMENUSETUP_MENUFOOT, LOCALE_COLORMENUSETUP_MENUHEAD, + LOCALE_COLORSETUP_SAVE, LOCALE_COLORSTATUSBAR_TEXT, LOCALE_COLORTHEMEMENU_HEAD, LOCALE_COLORTHEMEMENU_HEAD2, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index de0053376..001b0333f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -404,6 +404,7 @@ const char * locale_real_names[] = "colormenusetup.menucontent_selected", "colormenusetup.menufoot", "colormenusetup.menuhead", + "colorsetup.save", "colorstatusbar.text", "colorthememenu.head", "colorthememenu.head2",