From 80f47013a38ec035d43880059a55d11a6835db23 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 16 Dec 2018 02:15:58 +0100 Subject: [PATCH] use new edit icon in several headers Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a96e1d3ccd8b80998d5d4f1022d7dac4da707ff7 Author: vanhofen Date: 2018-12-16 (Sun, 16 Dec 2018) Origin message was: ------------------ - use new edit icon in several headers ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_bouquets.cpp | 2 +- src/gui/channellist.cpp | 2 +- src/gui/widget/keyboard_input.cpp | 6 +++--- src/gui/widget/stringinput.cpp | 2 +- src/gui/widget/stringinput_ext.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 55ee0af45..93ae8f835 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -137,7 +137,7 @@ void CBEBouquetWidget::paintItems() void CBEBouquetWidget::paintHead() { - CBEGlobals::paintHead(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), NEUTRINO_ICON_SETTINGS); + CBEGlobals::paintHead(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), NEUTRINO_ICON_EDIT); } const struct button_label CBEBouquetWidgetButtons[] = diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 4c99d55e2..ba78a5a91 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2239,7 +2239,7 @@ void CChannelList::paintHead() (bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)) header->setIcon(NEUTRINO_ICON_LOCK); else - header->setIcon(NULL); + header->setIcon(edit_state ? NEUTRINO_ICON_EDIT : NULL); std::string header_txt = !edit_state ? name : std::string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name; fb_pixel_t header_txt_col = (edit_state ? COL_RED : COL_MENUHEAD_TEXT); diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index cc17fbf3d..bd07fcba8 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -185,7 +185,7 @@ CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value, valueString = Value; inputSize = Size; - iconfile = Icon ? Icon : ""; + iconfile = Icon ? Icon : NEUTRINO_ICON_EDIT; observ = Observ; hint_1 = Hint_1; @@ -208,7 +208,7 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int valueString = Value; inputSize = Size; - iconfile = Icon ? Icon : ""; + iconfile = Icon ? Icon : NEUTRINO_ICON_EDIT; observ = Observ; hint_1 = Hint_1; @@ -231,7 +231,7 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int valueString = Value; inputSize = Size; - iconfile = Icon ? Icon : ""; + iconfile = Icon ? Icon : NEUTRINO_ICON_EDIT; observ = Observ; hint_1 = NONEXISTANT_LOCALE; diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index bced32cce..75384abd3 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -88,7 +88,7 @@ void CStringInput::init(const std::string &Name, std::string *Value, int Size, c hint_1 = Hint_1; hint_2 = Hint_2; validchars = Valid_Chars; - iconfile = Icon ? Icon : ""; + iconfile = Icon ? Icon : NEUTRINO_ICON_EDIT; observ = Observ; diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index aa11a805f..452b13eab 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -327,7 +327,7 @@ void CExtendedInput::hide() void CExtendedInput::paint() { - CComponentsHeader header(x, y, width, hheight, g_Locale->getText(name)); + CComponentsHeader header(x, y, width, hheight, g_Locale->getText(name), NEUTRINO_ICON_EDIT); header.paint(CC_SAVE_SCREEN_NO); frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);