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

Menu position settings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@390 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-20 15:12:51 +00:00
parent 6c1ef017b7
commit 8e2b5716ae
13 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.cpp
View File

@@ -167,7 +167,6 @@ void CInfoViewer::Init()
/* after font size changes, Init() might be called multiple times */
changePB();
pbBlinkChange = g_settings.progressbar_color;
casysChange = g_settings.casystem_display;
channellogoChange = g_settings.infobar_show_channellogo;
@@ -379,11 +378,6 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
bool fadeIn = g_settings.widget_fade && (!is_visible) && showButtonBar;
if(pbBlinkChange != g_settings.progressbar_color){
pbBlinkChange = g_settings.progressbar_color;
//changePB();
}
if (casysChange != g_settings.casystem_display || channellogoChange != g_settings.infobar_show_channellogo){
casysChange = g_settings.casystem_display;
channellogoChange = g_settings.infobar_show_channellogo;

1
src/gui/infoviewer.h
View File

@@ -94,7 +94,6 @@ class CInfoViewer
int lastsnr, lastsig, lasthdd, lastvar, lasttime;
CProgressBar *snrscale, *sigscale, *hddscale, *varscale, *timescale;
bool pbBlinkChange;
void changePB();
bool casysChange;
bool channellogoChange;

14
src/gui/motorcontrol.cpp
View File

@@ -91,7 +91,6 @@ void CMotorControl::Init(void)
stepDelay = 10;
sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
pbBlinkChange = g_settings.progressbar_color;
}
int CMotorControl::exec(CMenuTarget* parent, const std::string &)
@@ -107,19 +106,6 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &)
CZapitClient::commandSetScanSatelliteList sat;
sat_iterator_t sit;
#if 0
if(pbBlinkChange != g_settings.progressbar_color){
pbBlinkChange = g_settings.progressbar_color;
if(sigscale){
delete sigscale;
sigscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT);
}
if(snrscale){
delete snrscale;
snrscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT);
}
}
#endif
sigscale->reset();
snrscale->reset();
lastsnr = lastsig = -1;

1
src/gui/motorcontrol.h
View File

@@ -67,7 +67,6 @@ class CMotorControl : public CMenuTarget
int satfindpid;
int lastsnr, lastsig;
CProgressBar *snrscale, *sigscale;
bool pbBlinkChange;
void paint();
void paintMenu(void);
void paintStatus(void);

14
src/gui/scan.cpp
View File

@@ -81,7 +81,6 @@ CScanTs::CScanTs()
sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
pbBlinkChange = g_settings.progressbar_color;
}
extern int scan_pids;
@@ -117,19 +116,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
if(scan_all)
scan_mode |= 0xFF00;
#if 0
if(pbBlinkChange != g_settings.progressbar_color){
pbBlinkChange = g_settings.progressbar_color;
if(sigscale){
delete sigscale;
sigscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT);
}
if(snrscale){
delete snrscale;
snrscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT);
}
}
#endif
sigscale->reset();
snrscale->reset();
lastsig = lastsnr = -1;

1
src/gui/scan.h
View File

@@ -66,7 +66,6 @@ class CScanTs : public CMenuTarget
uint32_t done;
int lastsnr, lastsig;
CProgressBar *snrscale, *sigscale;
bool pbBlinkChange;
void paint(bool fortest = false);
void paintLineLocale(int x, int * y, int width, const neutrino_locale_t l);

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

@@ -511,6 +511,27 @@ void CMenuWidget::paint()
else
sb_width=0;
switch(g_settings.menu_pos) {
case 0: //DEFAULT_CENTER
break;
case 1: //TOP_LEFT
y = offy + frameBuffer->getScreenY() + 10;
x = offx + frameBuffer->getScreenX() + 10;
break;
case 2: //TOP_RIGHT
y = offy + frameBuffer->getScreenY() + 10;
x = offx + frameBuffer->getScreenX() + frameBuffer->getScreenWidth() - width - sb_width - 10;
break;
case 3: //BOTTOM_LEFT
y = offy + frameBuffer->getScreenY() + frameBuffer->getScreenHeight() - height - 10;
x = offx + frameBuffer->getScreenX() + 10;
break;
case 4: //BOTTOM_RIGHT
y = offy + frameBuffer->getScreenY() + frameBuffer->getScreenHeight() - height - 10;
x = offx + frameBuffer->getScreenX() + frameBuffer->getScreenWidth() - width - sb_width - 10;
break;
}
//frameBuffer->paintBoxRel(x,y, width+sb_width,hheight, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel(x, y, width+sb_width, hheight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP); //FIXME rounded