From 83576a96eb57ccb26e2db63b07a2ef0056d730b0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 11 Apr 2018 23:58:16 +0200 Subject: [PATCH] Icons: change check markers, rename to dialog on/off, add update marker Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1ebe774077508a1154551d2e1848d8d11a283dbd Author: Thilo Graf Date: 2018-04-11 (Wed, 11 Apr 2018) --- data/icons/status/markers/Makefile.am | 7 ++++--- data/icons/status/markers/marker_dialog_off.png | Bin 0 -> 147 bytes .../{checkmark.png => marker_dialog_ok.png} | Bin .../status/markers/marker_update_available.png | Bin 0 -> 295 bytes data/icons/status/markers/warning.png | Bin 206 -> 0 bytes src/gui/adzap.cpp | 4 ++-- src/gui/opkg_manager.cpp | 6 +++--- src/gui/update.cpp | 2 +- src/gui/widget/icons.h | 16 +++++++++++----- 9 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 data/icons/status/markers/marker_dialog_off.png rename data/icons/status/markers/{checkmark.png => marker_dialog_ok.png} (100%) create mode 100644 data/icons/status/markers/marker_update_available.png delete mode 100644 data/icons/status/markers/warning.png diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am index 05fc5ab04..b4c5ac801 100644 --- a/data/icons/status/markers/Makefile.am +++ b/data/icons/status/markers/Makefile.am @@ -1,8 +1,9 @@ installdir = $(ICONSDIR) install_DATA = \ - checkmark.png \ important.png \ + marker_dialog_off.png \ + marker_dialog_ok.png \ marker_epg.png \ marker_hidden.png \ marker_lock.png \ @@ -16,7 +17,7 @@ install_DATA = \ marker_timeshift.png \ marker_timeshift_gray.png \ marker_tv.png \ + marker_update_available.png \ marker_zap.png \ mounted.png \ - not_mounted.png \ - warning.png + not_mounted.png diff --git a/data/icons/status/markers/marker_dialog_off.png b/data/icons/status/markers/marker_dialog_off.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6cd3c038f0e72b9f35f2b9a0a17e9427d4f18a GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mqC8z3Lp07Gy?BuKfC5KrqItoG zRXxk+KKq`KbP0l+XkK=R-Ap literal 0 HcmV?d00001 diff --git a/data/icons/status/markers/checkmark.png b/data/icons/status/markers/marker_dialog_ok.png similarity index 100% rename from data/icons/status/markers/checkmark.png rename to data/icons/status/markers/marker_dialog_ok.png diff --git a/data/icons/status/markers/marker_update_available.png b/data/icons/status/markers/marker_update_available.png new file mode 100644 index 0000000000000000000000000000000000000000..5eb4f094946a5a357ff1439da79e2362f2df6bbb GIT binary patch literal 295 zcmV+?0oeYDP)zu9i?@afdp;@h zw6$t-mX+-8-8XTYcEjp2(^<{EyfZ>4HuCWBIxhR)S=P{TW8dTu#*T84OW~J_0setMarked(selected); - forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_CHECKMARK : NULL; + forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; } nc->setMarked(false); g_settings.adzap_zapBackPeriod *= 60; @@ -340,7 +340,7 @@ void CAdZapMenu::ShowMenu() bool selected = g_settings.adzap_zapBackPeriod == 60 * shortcut; forwarders[shortcut - 1] = new CMenuForwarder(minute, true, NULL, this, actionKey, CRCInput::convertDigitToKey(shortcut)); forwarders[shortcut - 1]->setMarked(selected); - forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_CHECKMARK : NULL; + forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; forwarders[shortcut - 1]->setHint(NEUTRINO_ICON_HINT_ADZAP, ""); menu->addItem(forwarders[shortcut - 1], selected); minute = LOCALE_ADZAP_MINUTES; diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index ecf5f091c..bb8624b6f 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -5,7 +5,7 @@ OPKG-Manager Class for Neutrino-GUI Implementation: - Copyright (C) 2012-2015 T. Graf 'dbt' + Copyright (C) 2012-2018 T. Graf 'dbt' www.dbox2-tuning.net Adaptions: @@ -433,10 +433,10 @@ void COPKGManager::updateMenu() it->second.forwarder->iconName_Info_right = ""; it->second.forwarder->setActive(true); if (it->second.upgradable) { - it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_WARNING; + it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_MARKER_UPDATE_AVAILABLE; upgradesAvailable = true; } else if (it->second.installed) { - it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_CHECKMARK; + it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_MARKER_DIALOG_OK; it->second.forwarder->setActive(expert_mode); } } diff --git a/src/gui/update.cpp b/src/gui/update.cpp index fb775a2ef..c05ccb53d 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -675,7 +675,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) bool active = !strcmp(c, to_string(i).c_str()); std::string m_title = "Partition " + to_string(i); mf = new CMenuForwarder(m_title, true, NULL, selector, to_string(i).c_str(), CRCInput::convertDigitToKey(i)); - mf->iconName_Info_right = active ? NEUTRINO_ICON_CHECKMARK : NULL; + mf->iconName_Info_right = active ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; m.addItem(mf, active); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 2b90dbd95..d33519dfd 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -76,6 +76,11 @@ #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray" +#define NEUTRINO_ICON_BUTTON_OPTION_ON_ACTIVE "btn_option_on_active" +#define NEUTRINO_ICON_BUTTON_OPTION_ON_INACTIVE "btn_option_on_inactive" +#define NEUTRINO_ICON_BUTTON_OPTION_OFF_ACTIVE "btn_option_off_active" +#define NEUTRINO_ICON_BUTTON_OPTION_OFF_INACTIVE "btn_option_off_inactive" + /* headers */ #define NEUTRINO_ICON_BLUE "icon_blue" #define NEUTRINO_ICON_GREEN "icon_green" @@ -287,15 +292,16 @@ #define NEUTRINO_ICON_STAR_ON "star-on" #define NEUTRINO_ICON_STAR_OFF "star-off" -#define NEUTRINO_ICON_STARS_BG "stars_bg" //NI -#define NEUTRINO_ICON_STARS "stars" //NI +#define NEUTRINO_ICON_STARS_BG "stars_bg" +#define NEUTRINO_ICON_STARS "stars" #define NEUTRINO_ICON_IMDB "imdb" #define NEUTRINO_ICON_TMDB "tmdb" -/* opkg manager */ -#define NEUTRINO_ICON_CHECKMARK "checkmark" -#define NEUTRINO_ICON_WARNING "warning" +/* status */ +#define NEUTRINO_ICON_MARKER_DIALOG_OK "marker_dialog_ok" +#define NEUTRINO_ICON_MARKER_DIALOG_OFF "marker_dialog_off" +#define NEUTRINO_ICON_MARKER_UPDATE_AVAILABLE "marker_update_available.png" //NI #define NEUTRINO_ICON_HINT_IMAGELOGO "hint_imagelogo"