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

Merge branch 'check/pu-cc' into master

Browse Source 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-06 11:21:55 +02:00
parent 655b50b603 27812f2df1
commit 7254e280e3
76 changed files with 4450 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/filebrowser.cpp
View File

@@ -38,6 +38,7 @@
#include <global.h>
#include <neutrino.h>
#include <driver/screen_max.h>
#include <unistd.h>
#include <stdio.h>
@@ -375,11 +376,9 @@ void CFileBrowser::commonInit()
selected = 0;
selections.clear();
x = g_settings.screen_StartX + 20;
y = g_settings.screen_StartY + 20;
width = (g_settings.screen_EndX - g_settings.screen_StartX - 40);
height = (g_settings.screen_EndY - g_settings.screen_StartY - 40);
width = frameBuffer->getScreenWidthRel();
height = frameBuffer->getScreenHeightRel();
x = getScreenStartX(width);
theight = fnt_title->getHeight();
fheight = fnt_item->getHeight();
@@ -392,6 +391,7 @@ void CFileBrowser::commonInit()
//recalc height
height = theight + listmaxshow * fheight + 2 * foheight;
y = getScreenStartY(height);
m_SMSKeyInput.setTimeout(SMSKEY_TIMEOUT);