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

Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'

Browse Source 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-03 10:43:14 +01:00
parent 9ca9f9c6f8 9d1444a8df
commit 58ca3266e7
123 changed files with 1901 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,10 +491,14 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
}
}
#if 0
GenericMenuBack->setHint("", NONEXISTANT_LOCALE);
#endif
checkHints();
#if 0
if (has_hints)
GenericMenuBack->setHint(NEUTRINO_ICON_HINT_BACK, LOCALE_MENU_HINT_BACK);
#endif
if(savescreen) {
calcSize();
@@ -761,8 +765,9 @@ void CMenuWidget::hide()
restoreScreen();//FIXME
else {
frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height);
paintHint(-1);
//paintHint(-1);
}
paintHint(-1);
frameBuffer->blit();
/* setActive() paints item for hidden parent menu, if called from child menu */
@@ -882,13 +887,12 @@ void CMenuWidget::calcSize()
if(total_pages > 1)
sb_width=15;
full_width = /*ConnectLineBox_Width+*/width+sb_width+SHADOW_OFFSET;
full_height = height+RADIUS_LARGE+SHADOW_OFFSET*2 /*+hint_height+INFO_BOX_Y_OFFSET*/;
/* 2 times ConnectLineBox_Width for symmetry */
full_width = ConnectLineBox_Width * 2 + width + sb_width + SHADOW_OFFSET;
full_height = height+RADIUS_LARGE+SHADOW_OFFSET*2+hint_height+INFO_BOX_Y_OFFSET;
if (full_width > (int)frameBuffer->getScreenWidth())
if (full_width + 2 * ConnectLineBox_Width > (int)frameBuffer->getScreenWidth())
{
width -= (full_width - frameBuffer->getScreenWidth());
/* subtract the additional connectlineboxwidth we added above */
width = frameBuffer->getScreenWidth() - 2 * ConnectLineBox_Width - sb_width - SHADOW_OFFSET;
full_width = frameBuffer->getScreenWidth() - ConnectLineBox_Width;
}
@@ -1051,14 +1055,14 @@ void CMenuWidget::saveScreen()
background = new fb_pixel_t [full_width * full_height];
if(background)
frameBuffer->SaveScreen(x-ConnectLineBox_Width, y, full_width, full_height, background);
frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height, background);
}
void CMenuWidget::restoreScreen()
{
if(background) {
if(savescreen)
frameBuffer->RestoreScreen(x-ConnectLineBox_Width, y, full_width, full_height, background);
frameBuffer->RestoreScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height, background);
}
}
@@ -1087,12 +1091,22 @@ void CMenuWidget::paintHint(int pos)
if (hint_painted) {
/* clear detailsline line */
if (details_line != NULL)
details_line->restore();
// TODO CComponents::hide with param restore ? or auto (if it have saved screens) ?
if (details_line != NULL) {
if (savescreen)
details_line->restore();
else
details_line->hide();
}
/* clear info box */
if (info_box != NULL)
if (pos == -1)
info_box->restore();
if (info_box != NULL) {
if (pos == -1) {
if (savescreen)
info_box->restore();
else
info_box->hide();
}
}
hint_painted = false;
}
if (pos < 0)
@@ -1102,8 +1116,12 @@ void CMenuWidget::paintHint(int pos)
//printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText(item->hint));
if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) {
if (info_box != NULL)
info_box->restore();
if (info_box != NULL) {
if (savescreen)
info_box->restore();
else
info_box->hide();
}
return;
}
@@ -1126,7 +1144,7 @@ void CMenuWidget::paintHint(int pos)
details_line->setYPosDown(ypos2a);
details_line->setHMarkDown(markh);
}
details_line->paint();
details_line->paint(savescreen);
if (info_box == NULL)
info_box = new CComponentsInfoBox(x, ypos2, iwidth, hint_height);
@@ -1135,7 +1153,8 @@ void CMenuWidget::paintHint(int pos)
info_box->setYPos(ypos2);
info_box->setWidth(iwidth);
}
info_box->paint();
/* force full paint - menu-over i.e. option chooser with pulldown can overwrite */
info_box->paint(savescreen, true);
int offset = 10;
if (!item->hintIcon.empty()) {