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

infoviewer: scale filesystem bars with screen width

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1083 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-01-30 12:23:55 +00:00
parent 5408966cd0
commit ca56d16908
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/infoviewer.cpp
View File

@@ -237,6 +237,7 @@ void CInfoViewer::changePB()
const short yellow_bar = 70; const short yellow_bar = 70;
const short green_bar = 100; const short green_bar = 100;
hddwidth = frameBuffer->getScreenWidth(true) * 10 / 128; /* 100 pix if screen is 1280 wide */
if (sigscale != NULL) if (sigscale != NULL)
delete sigscale; delete sigscale;
sigscale = new CProgressBar(true, bar_width, 10, red_bar, green_bar, yellow_bar); sigscale = new CProgressBar(true, bar_width, 10, red_bar, green_bar, yellow_bar);
@@ -245,10 +246,10 @@ void CInfoViewer::changePB()
snrscale = new CProgressBar(true, bar_width, 10, red_bar, green_bar, yellow_bar); snrscale = new CProgressBar(true, bar_width, 10, red_bar, green_bar, yellow_bar);
if (hddscale != NULL) if (hddscale != NULL)
delete hddscale; delete hddscale;
hddscale = new CProgressBar(true, 100, 6, 50, green_bar, 75, true); hddscale = new CProgressBar(true, hddwidth, 6, 50, green_bar, 75, true);
if (varscale != NULL) if (varscale != NULL)
delete varscale; delete varscale;
varscale = new CProgressBar(true, 100, 6, 50, green_bar, 75, true); varscale = new CProgressBar(true, hddwidth, 6, 50, green_bar, 75, true);
if (timescale != NULL) if (timescale != NULL)
delete timescale; delete timescale;
timescale = new CProgressBar(true, -1, -1, 30, green_bar, yellow_bar, true); timescale = new CProgressBar(true, -1, -1, 30, green_bar, yellow_bar, true);
@@ -1336,8 +1337,8 @@ void CInfoViewer::showSNR ()
/* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle, /* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle,
scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between
the scales */ the scales */
varscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 0:icon_crypt_width )+ icon_xres_width + 2*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?5:6)*2) - 102, varscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 0:icon_crypt_width )+ icon_xres_width + 2*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?5:6)*2) - hddwidth - 2,
BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100); BBarY + InfoHeightY_Info / 2 - 2 - 6, hddwidth , 6, per, 100);
per = 0; per = 0;
//HD info //HD info
if(!check_dir(g_settings.network_nfs_recordingdir)){ if(!check_dir(g_settings.network_nfs_recordingdir)){
@@ -1345,8 +1346,8 @@ void CInfoViewer::showSNR ()
per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100); per = (s.f_blocks - s.f_bfree) / (s.f_blocks/100);
} }
} }
hddscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 0:icon_crypt_width )+ icon_xres_width + 2*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?5:6)*2) - 102, hddscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 0:icon_crypt_width )+ icon_xres_width + 2*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?5:6)*2) - hddwidth - 2,
BBarY + InfoHeightY_Info / 2 + 2, 100, 6, per, 100); BBarY + InfoHeightY_Info / 2 + 2, hddwidth, 6, per, 100);
} }
} }

1
src/gui/infoviewer.h
View File

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