mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-08 06:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'neutrino-mp/master' into pu/mp

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
This commit is contained in:
svenhoefer
2017-03-13 16:14:33 +01:00
parent 5b0faeab8c 40adaa6515
commit 8bdb16cec6
181 changed files with 6320 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/buttons.cpp
View File

@@ -29,7 +29,7 @@
#include <gui/widget/buttons.h>
#include <system/settings.h>
//#include <driver/stacktrace.h>
#include <driver/stacktrace.h>
#include <driver/fontrenderer.h>
@@ -132,7 +132,7 @@ int paintButtons( const button_label_ext * const content,
if (count > 16 || count == 0)
{
fprintf(stderr, "paintButtons does only support max 16 buttons yet (%d)\n", count);
// print_stacktrace();
print_stacktrace();
return 0;
}
if (maxwidth < 200 && show)
@@ -348,7 +348,7 @@ int paintButtons( const int &x,
fprintf(stderr, "paintButtons: maxwidth very small\n");
fprintf(stderr, " x: %d y: %d footw: %d count: %d maxw: %d footh: %d\n ",
x, y, footerwidth, count, maxwidth, footerheight);
//print_stacktrace();
print_stacktrace();
}
uint i;

6
src/gui/widget/listbox.cpp
View File

@@ -72,13 +72,11 @@ void CListBox::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
int sbc= ((getItemCount()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow);
if (sbc < 1)
sbc = 1;
int sbh= (sb- 4)/ sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs* sbh , 11, sbh, COL_SCROLLBAR_ACTIVE_PLUS_0);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0);
}
void CListBox::paintHead()

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

@@ -792,7 +792,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
paint();
break;
}
frameBuffer->blit();
continue;
}
for (unsigned int i= 0; i< items.size(); i++) {
@@ -2354,6 +2353,7 @@ bool CZapProtection::check()
hint = NONEXISTANT_LOCALE;
int res;
std::string cPIN;
char systemstr[128];
do
{
cPIN = "";
@@ -2362,10 +2362,11 @@ bool CZapProtection::check()
res = PINInput->exec(getParent(), "");
delete PINInput;
if (!access(CONFIGDIR "/pinentered.sh", X_OK)) {
std::string systemstr = CONFIGDIR "/pinentered.sh " + cPIN;
system(systemstr.c_str());
}
cPIN[4] = 0;
strcpy(systemstr, CONFIGDIR "/pinentered.sh ");
strcat(systemstr, cPIN.c_str());
system(systemstr);
hint = LOCALE_PINPROTECTION_WRONGCODE;
} while ( (cPIN != *validPIN) && !cPIN.empty() &&
( res == menu_return::RETURN_REPAINT ) &&

2
src/gui/widget/progresswindow.cpp
View File

@@ -5,6 +5,8 @@
Implementation of CComponent Window class.
Copyright (C) 2014-2017 Thilo Graf 'dbt'
Copyright (C) 2009-2013 Stefan Seyfried
License: GPL
This program is free software; you can redistribute it and/or