mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-10 07:08:28 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -73,10 +73,7 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
|
||||
else
|
||||
setIconName();
|
||||
|
||||
if (IconName_Info_right && *IconName_Info_right)
|
||||
iconName_Info_right = IconName_Info_right;
|
||||
else
|
||||
iconName_Info_right = NULL;
|
||||
setInfoIconRight(IconName_Info_right);
|
||||
|
||||
hintIcon = NULL;
|
||||
|
||||
@@ -162,6 +159,13 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
|
||||
}
|
||||
}
|
||||
|
||||
void CMenuItem::setInfoIconRight(const char * const IconName_Info_right){
|
||||
if (IconName_Info_right && *IconName_Info_right)
|
||||
iconName_Info_right = IconName_Info_right;
|
||||
else
|
||||
iconName_Info_right = NULL;
|
||||
}
|
||||
|
||||
void CMenuItem::setMarked(const bool Marked)
|
||||
{
|
||||
marked = Marked;
|
||||
|
Reference in New Issue
Block a user