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 remote-tracking branch 'check/next-cc'

Browse Source 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-05-10 10:06:47 +02:00
parent bc39e4cdb6 0c34433d23
commit 083bc55347
213 changed files with 11183 additions and 4823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,9 +190,6 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
bool selected = select_mode;
bool icon_painted = false;
int w = 0;
int h = 0;
std::string icon_name = iconName;
int icon_w = 0;
int icon_h = 0;
@@ -223,11 +220,9 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
//get data of number icon and paint
if (!icon_name.empty())
{
frameBuffer->getIconSize(icon_name.c_str(), &w, &h);
icon_w = w;
icon_h = h;
if (active && icon_w>0 && icon_h>0)
frameBuffer->getIconSize(icon_name.c_str(), &icon_w, &icon_h);
if (active && icon_w>0 && icon_h>0 && icon_space_x >= icon_w)
{
icon_x = icon_space_mid - (icon_w/2);
@@ -248,9 +243,7 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
//get data of number right info icon and paint
if (!iconName_Info_right.empty())
{
frameBuffer->getIconSize(iconName_Info_right.c_str(), &w, &h);
icon_w = w;
icon_h = h;
frameBuffer->getIconSize(iconName_Info_right.c_str(), &icon_w, &icon_h);
if (active && icon_w>0 && icon_h>0)
{
@@ -663,6 +656,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if(hasItem() && selected > -1 && (int)items.size() > selected) {
//exec this item...
CMenuItem* item = items[selected];
if (!item->isSelectable())
break;
item->msg = msg;
fader.Stop();
int rv = item->exec( this );
@@ -975,9 +970,7 @@ void CMenuWidget::setMenuPos(const int& menu_width)
}
void CMenuWidget::paintItems()
{
int item_height=height-(item_start_y-y);
{
//Item not currently on screen
if (selected >= 0)
{
@@ -990,10 +983,13 @@ void CMenuWidget::paintItems()
// Scrollbar
if(total_pages>1)
{
int item_height=height-(item_start_y-y);
frameBuffer->paintBoxRel(x+ width,item_start_y, 15, item_height, COL_MENUCONTENT_PLUS_1, RADIUS_MIN);
frameBuffer->paintBoxRel(x+ width +2, item_start_y+ 2+ current_page*(item_height-4)/total_pages, 11, (item_height-4)/total_pages, COL_MENUCONTENT_PLUS_3, RADIUS_MIN);
if(current_page==total_pages-1){
frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0);
}
}
frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0);
int ypos=item_start_y;
for (unsigned int count = 0; count < items.size(); count++)
{
@@ -1092,11 +1088,6 @@ void CMenuWidget::paintHint(int pos)
if (pos < 0 && !hint_painted)
return;
int rad = RADIUS_LARGE;
int xpos = x - ConnectLineBox_Width;
int ypos2 = y + height + rad + SHADOW_OFFSET + INFO_BOX_Y_OFFSET;
int iwidth = width+sb_width;
#if 0
if (hint_painted) {
/* clear detailsline line */
@@ -1129,7 +1120,7 @@ void CMenuWidget::paintHint(int pos)
}
if (pos < 0)
return;
CMenuItem* item = items[pos];
if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) {
@@ -1152,6 +1143,10 @@ void CMenuWidget::paintHint(int pos)
return;
int iheight = item->getHeight();
int rad = RADIUS_LARGE;
int xpos = x - ConnectLineBox_Width;
int ypos2 = y + height + rad + SHADOW_OFFSET + INFO_BOX_Y_OFFSET;
int iwidth = width+sb_width;
//init details line and infobox dimensions
int ypos1 = item->getYPosition();
@@ -1814,6 +1809,15 @@ void CMenuForwarderNonLocalized::setText(const char * const Text)
int CMenuForwarderNonLocalized::getWidth(void)
{
int tw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(the_text, true);
const char * option_text = NULL;
if (option)
option_text = option;
else if (option_string)
option_text = option_string->c_str();
if (option_text != NULL)
tw += 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(option_text, true);
return tw;
}
//-------------------------------------------------------------------------------------------------------------------------------
@@ -1862,9 +1866,8 @@ int CMenuSeparator::getWidth(void)
int CMenuSeparator::paint(bool selected)
{
int height;
int height = getHeight();
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
height = getHeight();
if ((type & SUB_HEAD))
{
@@ -1885,8 +1888,7 @@ int CMenuSeparator::paint(bool selected)
}
if ((type & STRING))
{
const char * l_text;
l_text = getString();
const char * l_text = getString();
if (text != NONEXISTANT_LOCALE || strlen(l_text) != 0)
{