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

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent d1f005b956 072ac5a089
commit a112e8fb49
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/streaminfo2.cpp
View File

@@ -887,7 +887,6 @@ void CStreamInfo2::showSNR ()
{
if (signalbox == NULL){
signalbox = new CSignalBox(x + 10, yypos, 240, 50, frontend);
signalbox->setScaleWidth(60); /*%*/
signalbox->setColorBody(COL_MENUHEAD_PLUS_0);
signalbox->setTextColor(COL_INFOBAR_TEXT);
signalbox->doPaintBg(true);