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

revert cd5fd9dab3

Browse Source 
use an easier solution, based up neutrino-mp
This commit is contained in:
Thilo Graf
2014-01-26 20:30:41 +01:00
parent 06408a8325
commit bcf4e4fbf9
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -121,14 +121,12 @@ void CBEBouquetWidget::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((Bouquets->size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow);
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
int sbs= (selected/listmaxshow);
//scrollbar
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
}
void CBEBouquetWidget::paintHead()

4
src/gui/bookmarkmanager.cpp
View File

@@ -36,6 +36,7 @@
#include <system/settings.h>
#include <driver/screen_max.h>
#include <gui/components/cc.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/hintbox.h>
@@ -456,9 +457,8 @@ void CBookmarkManager::paint()
int sbc= ((bookmarks.size()- 1)/ listmaxshow)+ 1;
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
}
paintFoot();

4
src/gui/bouquetlist.cpp
View File

@@ -50,6 +50,7 @@
#include <driver/screen_max.h>
#include <driver/rcinput.h>
#include <driver/fade.h>
#include <daemonc/remotecontrol.h>
#include <system/settings.h>
@@ -634,8 +635,7 @@ void CBouquetList::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((bsize - 1)/ listmaxshow)+ 1; /* bsize is > 0, so sbc is also > 0 */
int sbh = ((sb - 4) * 1024) / sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
}

9
src/gui/eventlist.cpp
View File

@@ -32,6 +32,7 @@
#include <neutrino.h>
#include <gui/eventlist.h>
#include <gui/epgplus.h>
#include <gui/timerlist.h>
#include <gui/user_menue.h>
@@ -48,6 +49,7 @@
#include <driver/screen_max.h>
#include <driver/fade.h>
#include <zapit/client/zapittools.h>
#include <zapit/zapit.h>
#include <daemonc/remotecontrol.h>
@@ -918,13 +920,11 @@ void CNeutrinoEventList::paint(t_channel_id channel_id)
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((evtlist.size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow);
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
}
@@ -969,6 +969,7 @@ void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
buttons[btn_cnt].locale = LOCALE_EVENTFINDER_SEARCH; // search button
btn_cnt++;
}
// Button: Timer Channelswitch
if ((uint) g_settings.key_channelList_addremind != CRCInput::RC_nokey) {
if (!g_settings.minimode) {

7
src/gui/pictureviewer.cpp
View File

@@ -64,6 +64,7 @@
#include <gui/widget/stringinput.h>
#include <driver/screen_max.h>
#include <system/settings.h>
#include <algorithm>
@@ -757,13 +758,11 @@ void CPictureViewerGui::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((playlist.size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow);
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
paintFoot();
paintInfo();

9
src/gui/timerlist.cpp
View File

@@ -47,8 +47,10 @@
#include <driver/fade.h>
#include <driver/record.h>
#include <gui/channellist.h>
#include <gui/color.h>
#include <gui/eventlist.h>
#include <gui/filebrowser.h>
#include <gui/infoviewer.h>
@@ -376,7 +378,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
parent->hide();
const char *action_str = "RecDir1";
if(chooserDir(timerlist[selected].recordingDir, true, action_str, sizeof(timerlist[selected].recordingDir)-1)) {
printf("[%s] new %s dir %s\n",__FILE__, action_str, timerlist[selected].recordingDir);
printf("[timerlist] new %s dir %s\n", action_str, timerlist[selected].recordingDir);
}
return menu_return::RETURN_REPAINT;
}
@@ -384,7 +386,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
parent->hide();
const char *action_str = "RecDir2";
if(chooserDir(timerNew.recordingDir, true, action_str, sizeof(timerNew.recordingDir)-1)) {
printf("[%s] new %s dir %s\n",__FILE__, action_str, timerNew.recordingDir);
printf("[timerlist] new %s dir %s\n", action_str, timerNew.recordingDir);
}
return menu_return::RETURN_REPAINT;
}
@@ -917,9 +919,8 @@ void CTimerList::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((timerlist.size()- 1)/ listmaxshow)+ 1;
int sbh = ((sb - 4) * 1024) / sbc;
frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
}
paintFoot();