mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

dboxinfo: automatically resize info window

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@172 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1943d704cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-16 (Sat, 16 Jan 2010)
This commit is contained in:
Stefan Seyfried
2010-01-16 22:46:16 +00:00
parent 513ca0c22b
commit 4f55961982
1 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/gui/dboxinfo.cpp
View File

@@ -64,11 +64,10 @@ CDBoxInfoWidget::CDBoxInfoWidget()
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
// width = 600; // width = 600;
// height = hheight+13*mheight+ 10; // height = hheight+13*mheight+ 10;
width = w_max (600, 0); width = 0;
height = h_max (hheight+14*mheight+ 10, 0); height = 0;
x = 0;
x=getScreenStartX( width ); y = 0;
y=getScreenStartY( height );
} }
@@ -96,8 +95,55 @@ void CDBoxInfoWidget::hide()
void CDBoxInfoWidget::paint() void CDBoxInfoWidget::paint()
{ {
const char *head = "Filesystem Size Used Available Use% ";
int offsetw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(head);
offsetw += 20;
width = offsetw + 10 + 120;
height = hheight + 6 * mheight;
struct statfs s;
FILE * mountFile;
struct mntent * mnt;
/* this is lame, as it duplicates code. OTOH, it is small and fast enough...
The algorithm is exactly the same as below in the display routine */
if ((mountFile = setmntent("/proc/mounts", "r")) == NULL) {
perror("/proc/mounts");
} else {
while ((mnt = getmntent(mountFile)) != NULL) {
if (::statfs(mnt->mnt_dir, &s) == 0) {
switch (s.f_type) /* f_type is long */
{
case 0xEF53L: /*EXT2 & EXT3*/
case 0x6969L: /*NFS*/
case 0xFF534D42L: /*CIFS*/
case 0x517BL: /*SMB*/
case 0x52654973L: /*REISERFS*/
case 0x65735546L: /*fuse for ntfs*/
case 0x58465342L: /*xfs*/
case 0x4d44L: /*msdos*/
break;
case 0x72b6L: /*jffs2*/
if (strcmp(mnt->mnt_fsname, "rootfs") == 0)
continue;
height += mheight;
break;
default:
continue;
}
height += mheight;
}
}
endmntent(mountFile);
}
width = w_max(width, 0);
height = h_max(height, 0);
x = getScreenStartX(width);
y = getScreenStartY(height);
fprintf(stderr, "CDBoxInfoWidget::CDBoxInfoWidget() x = %d, y = %d, width = %d height = %d\n", x, y, width, height);
int ypos=y; int ypos=y;
int tmpypos=ypos;
int i = 0; int i = 0;
frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP); frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP);
frameBuffer->paintBoxRel(x, ypos+ hheight, width, height- hheight, COL_MENUCONTENT_PLUS_0, ROUND_RADIUS, CORNER_BOTTOM); frameBuffer->paintBoxRel(x, ypos+ hheight, width, height- hheight, COL_MENUCONTENT_PLUS_0, ROUND_RADIUS, CORNER_BOTTOM);
@@ -121,13 +167,13 @@ void CDBoxInfoWidget::paint()
if(p) if(p)
hw=++p; hw=++p;
hw+=" Info"; hw+=" Info";
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, tmpypos+ hheight+1, width, hw.c_str(), COL_MENUHEAD, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, y + hheight+1, width - 10, hw.c_str(), COL_MENUHEAD, 0, true); // UTF-8
break; break;
} }
i++; i++;
if (i > 2) if (i > 2)
continue; continue;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width, buffer, COL_MENUCONTENT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, buffer, COL_MENUCONTENT);
ypos+= mheight; ypos+= mheight;
} }
fclose(fd); fclose(fd);
@@ -174,17 +220,13 @@ void CDBoxInfoWidget::paint()
LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2])); LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));
strcat(sbuf, ubuf); strcat(sbuf, ubuf);
ypos+= mheight/2; ypos+= mheight/2;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width, sbuf, COL_MENUCONTENT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, sbuf, COL_MENUCONTENT);
ypos+= mheight; ypos+= mheight;
snprintf(ubuf,buf_size, "memory total %dKb, free %dKb", (int) info.totalram/1024, (int) info.freeram/1024); snprintf(ubuf,buf_size, "memory total %dKb, free %dKb", (int) info.totalram/1024, (int) info.freeram/1024);
ypos+= mheight/2; ypos+= mheight/2;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width, ubuf, COL_MENUCONTENT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, ubuf, COL_MENUCONTENT);
ypos+= mheight; ypos+= mheight;
struct statfs s;
FILE * mountFile;
struct mntent * mnt;
if ((mountFile = setmntent("/proc/mounts", "r")) == 0 ) { if ((mountFile = setmntent("/proc/mounts", "r")) == 0 ) {
perror("/proc/mounts"); perror("/proc/mounts");
@@ -192,10 +234,7 @@ void CDBoxInfoWidget::paint()
else { else {
float gb=0; float gb=0;
char c=' '; char c=' ';
int offsetw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("Filesystem Size Used Available Use% "); while ((mnt = getmntent(mountFile)) != 0) {
offsetw += 20;
i = 0;
while ( ((mnt = getmntent(mountFile)) != 0) && (i<8 )) {
if (::statfs(mnt->mnt_dir, &s) == 0) { if (::statfs(mnt->mnt_dir, &s) == 0) {
switch (s.f_type) switch (s.f_type)
{ {
@@ -211,14 +250,14 @@ void CDBoxInfoWidget::paint()
c = 'G'; c = 'G';
break; break;
case (int) 0x72b6: /*jffs2*/ case (int) 0x72b6: /*jffs2*/
if (strcmp(mnt->mnt_fsname, "rootfs") == 0) if (strcmp(mnt->mnt_fsname, "rootfs") == 0)
continue; continue;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width, "Filesystem Size Used Available Use% ", COL_MENUCONTENTINACTIVE); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, head, COL_MENUCONTENTINACTIVE);
ypos+= mheight; ypos+= mheight;
gb = 1024.0; gb = 1024.0;
c = 'M'; c = 'M';
break; break;
default: default:
continue; continue;
} }
@@ -235,13 +274,20 @@ void CDBoxInfoWidget::paint()
,s.f_bavail * (s.f_bsize / 1024.0) / gb, c ,s.f_bavail * (s.f_bsize / 1024.0) / gb, c
,blocks_percent_used ,blocks_percent_used
); );
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width, ubuf, COL_MENUCONTENT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, ubuf, COL_MENUCONTENT);
CProgressBar pb(pb_blink, -1, -1, 30, 100, 70, true); int pbw = width - offsetw - 10;
pb.paintProgressBarDefault(x+offsetw, ypos+3, 120, mheight-10, blocks_percent_used, 100); //fprintf(stderr, "width: %d offsetw: %d pbw: %d\n", width, offsetw, pbw);
if (pbw > 8) /* smaller progressbar is not useful ;) */
{
CProgressBar pb(pb_blink, -1, -1, 30, 100, 70, true);
pb.paintProgressBarDefault(x+offsetw, ypos+3, pbw, mheight-10, blocks_percent_used, 100);
}
ypos+= mheight; ypos+= mheight;
} }
i++; i++;
} }
if (ypos > y + height - mheight) /* the screen is not high enough */
break; /* todo: scrolling? */
} }
endmntent(mountFile); endmntent(mountFile);
} }