mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icons: change check markers, rename to dialog on/off, add update marker

Browse Source
This commit is contained in:
Thilo Graf
2018-04-11 16:42:22 +02:00
parent 8c5ab1b22b
commit ee0f90d083
10 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/adzap.cpp
View File

@@ -300,7 +300,7 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey)
{
bool selected = (g_settings.adzap_zapBackPeriod == 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;
}
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;

6
src/gui/opkg_manager.cpp
View File

@@ -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);
}
}

2
src/gui/update.cpp
View File

@@ -673,7 +673,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);
}

17
src/gui/widget/icons.h
View File

@@ -74,6 +74,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"
@@ -283,15 +288,15 @@
#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"
#endif /* __gui_widget_icons_h__ */