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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 880115fa98
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-25 (Fri, 25 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-25 16:28:39 +01:00
parent 6cd0730eb2 ce3c73ee12
commit 4df1487cd9
31 changed files with 1636 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/gui/widget/menue.cpp
View File

@@ -59,7 +59,7 @@ CMenuForwarder * const GenericMenuNext = &CGenericMenuNext;
CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const IconName, const char * const IconName_Info_right, bool IsStatic)
{
active = Active;
active = current_active = Active;
directKey = DirectKey;
isStatic = IsStatic;
@@ -89,6 +89,7 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
selected_iconName = NULL;
height = 0;
actObserv = NULL;
parent_widget = NULL;
}
void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
@@ -104,7 +105,7 @@ void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
void CMenuItem::setActive(const bool Active)
{
active = Active;
active = current_active = Active;
/* used gets set by the addItem() function. This is for disabling
machine-specific options by just not calling the addItem() function.
Without this, the changeNotifiers would become machine-dependent. */
@@ -112,6 +113,48 @@ void CMenuItem::setActive(const bool Active)
paint();
}
bool CMenuItem::initModeCondition(const int& stb_mode)
{
if (CNeutrinoApp::getInstance()->getMode() == stb_mode){
active = false;
marked = false;
if (parent_widget)
if (!isSelectable())
parent_widget->initSelectable();
return true;
}
printf("\033[33m[CMenuItem] [%s - %d] missmatching stb mode condition %d\033[0m\n", __func__, __LINE__, stb_mode);
return false;
}
void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
{
int stb_mode = CNeutrinoApp::getInstance()->getMode();
if (condition & DCOND_MODE_TS){
if (stb_mode == CNeutrinoApp::mode_ts)
if (initModeCondition(stb_mode))
return;
}
if (condition & DCOND_MODE_RADIO){
if (stb_mode == CNeutrinoApp::mode_radio)
if (initModeCondition(stb_mode))
return;
}
if (condition & DCOND_MODE_TV){
if (stb_mode == CNeutrinoApp::mode_tv)
if (initModeCondition(stb_mode))
return;
}
active = current_active;
if (parent_widget){
if (!isSelectable())
parent_widget->initSelectable();
}
}
void CMenuItem::setMarked(const bool Marked)
{
marked = Marked;
@@ -297,6 +340,9 @@ void CMenuItem::paintItemButton(const bool select_mode, int item_height, const c
//get data of number icon and paint
if (icon_name && *icon_name)
{
if (!active)
icon_name = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
frameBuffer->getIconSize(icon_name, &icon_w, &icon_h);
if (/*active &&*/ icon_w>0 && icon_h>0 && icon_space_x >= icon_w)
@@ -605,6 +651,7 @@ void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected)
menuItem->isUsed();
items.push_back(menuItem);
menuItem->setParentWidget(this);
}
void CMenuWidget::resetWidget(bool delete_items)
@@ -668,12 +715,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
neutrino_msg_data_t data;
bool bAllowRepeatLR = false;
CVFD::MODES oldLcdMode = CVFD::getInstance()->getMode();
int pos = 0;
if (selected > 0 && selected < (int)items.size())
pos = selected;
else
selected = -1;
exit_pressed = false;
frameBuffer->Lock();
@@ -693,21 +735,22 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
}
}
/* make sure we start with a selectable item... */
while (pos < (int)items.size()) {
if (items[pos]->isSelectable())
break;
pos++;
}
checkHints();
if(savescreen) {
calcSize();
saveScreen();
}
/* make sure we start with a selectable item... */
initSelectable();
paint();
frameBuffer->blit();
int pos = selected;
int retval = menu_return::RETURN_REPAINT;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
@@ -1131,6 +1174,22 @@ void CMenuWidget::calcSize()
setMenuPos(full_width);
}
void CMenuWidget::initSelectable()
{
int pos = 0;
if (selected > 0 && selected < (int)items.size())
pos = selected;
else
selected = -1;
while (pos < (int)items.size()) {
if (items[pos]->isSelectable())
break;
pos++;
}
selected = pos;
}
void CMenuWidget::paint()
{
calcSize();
@@ -1217,16 +1276,16 @@ void CMenuWidget::paintItems()
* different height and this might leave artifacts otherwise after changing pages */
frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0);
}
int ypos=item_start_y;
for (int count = 0; count < (int)items.size(); count++)
{
CMenuItem* item = items[count];
item->OnPaintItem();
if ((count >= page_start[current_page]) &&
(count < page_start[current_page + 1]))
{
item->init(x, ypos, width, iconOffset);
if (item->isSelectable() && selected == -1)
selected = count;
@@ -2123,7 +2182,8 @@ std::string CMenuForwarder::getOption(void)
int CMenuForwarder::paint(bool selected)
{
std::string option_name = getOption();
std::string option_name = getOption();
fb_pixel_t bgcol = 0;
if (jumpTarget)
bgcol = jumpTarget->getColor();
@@ -2136,7 +2196,7 @@ int CMenuForwarder::paint(bool selected)
//caption
paintItemCaption(selected, option_name.c_str(), bgcol);
return y+ height;
}