ich hab das teil auch nochmal angepasst (mehr oder weniger).
...bei der lösung von dbt hat mich gestört das auf der zweiten seite (pig in groß) kein min/max mehr zu sehen ist.
wiedem auch sei, hier mal noch ein anderer ansatz.
Code: Alles auswählen
--- streaminfo2.cpp 2007-07-15 00:52:37.000000000 +0200
+++ streaminfo2.cpp 2007-07-15 01:14:26.000000000 +0200
@@ -62,8 +62,8 @@
iheight = g_Font[font_info]->getHeight();
sheight = g_Font[font_small]->getHeight();
- width = w_max (710, 5);
- height = h_max (560, 5);
+ width = w_max (640, 5);
+ height = h_max (480, 5);
max_height = SCREEN_Y-1;
max_width = SCREEN_X-1;
@@ -79,7 +79,7 @@
frameBuffer->paletteSetColor(COL_RED, 0x00FF0000, 0);
frameBuffer->paletteSetColor(COL_GREEN, 0x0000FF00, 0);
frameBuffer->paletteSetColor(COL_BLUE, 0x002020FF, 0);
- frameBuffer->paletteSetColor(COL_YELLOW, 0x0000FFFF, 0);
+ frameBuffer->paletteSetColor(COL_YELLOW, 0x00FF9900, 0);
frameBuffer->paletteSetColor(COL_BLACK, 0x00000000, 0);
frameBuffer->paletteSet();
@@ -165,14 +165,14 @@
char buf[100];
int ypos = y+5;
int xpos = x+10;
- int width = w_max (710, 5);
+ int width = w_max (640, 5);
ypos += hheight;
ypos += (iheight >>1);
ypos += iheight;
ypos += iheight;
sprintf((char*) buf, "%s: %5u kbit/s", g_Locale->getText(LOCALE_STREAMINFO_BITRATE), bitrate);
- frameBuffer->paintBoxRel(xpos, ypos-iheight+1, 300, iheight-1, COL_MENUHEAD_PLUS_0);
+ frameBuffer->paintBoxRel(xpos, ypos-iheight+1, 300, iheight-1, COL_MENUCONTENT_PLUS_0);
g_Font[font_info]->RenderString(xpos, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
}
@@ -268,8 +268,8 @@
void CStreamInfo2::paint_pig(int x, int y, int w, int h)
{
- frameBuffer->paintBoxRel(x,y,w,h, COL_BACKGROUND);
- pig->show (x,y,w,h);
+ frameBuffer->paintBoxRel(x-20,y+15,w,h, COL_BACKGROUND);
+ pig->show (x-20,y+15,w,h);
}
void CStreamInfo2::paint_signal_fe_box(int x, int y, int w, int h)
@@ -277,6 +277,8 @@
int y1;
int xd = w/4;
+ x = x-20;
+
g_Font[font_info]->RenderString(x, y+iheight, width-10, g_Locale->getText(LOCALE_STREAMINFO_SIGNAL), COL_MENUCONTENT, 0, true);
sigBox_x = x;
@@ -299,8 +301,8 @@
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_YELLOW, x+2+xd*3 , y1- 20 );
g_Font[font_small]->RenderString(x+25+xd*3, y1, 50, "Bitrate", COL_MENUCONTENT, 0, true);
- g_Font[font_small]->RenderString(x+25+xd*3+45, y1 - iheight - iheight - iheight, 50, "max", COL_MENUCONTENT, 0, true);
- g_Font[font_small]->RenderString(x+25+xd*3+45, y1 - iheight, 50, "min", COL_MENUCONTENT, 0, true);
+ g_Font[font_small]->RenderString(x+25+xd*3+50, y1 - iheight - iheight - iheight, 50, "max", COL_MENUCONTENT, 0, true);
+ g_Font[font_small]->RenderString(x+25+xd*3+50, y1 - iheight, 50, "min", COL_MENUCONTENT, 0, true);
sig_text_y = y1 - iheight;
sig_text_ber_x = x+05+xd*0;
@@ -393,7 +395,7 @@
{
char str[30];
- frameBuffer->paintBoxRel(x, y-iheight+1, 60, iheight-1, COL_MENUHEAD_PLUS_0);
+ frameBuffer->paintBoxRel(x, y-iheight+1, 60, iheight-1, COL_MENUCONTENT_PLUS_0);
sprintf(str,"%6u",value);
g_Font[font_small]->RenderString(x, y, 60, str, COL_MENUCONTENT, 0, true);
}
@@ -414,27 +416,28 @@
CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, head_string);
// paint backround, title pig, etc.
frameBuffer->paintBoxRel(0, 0, max_width, max_height, COL_MENUHEAD_PLUS_0);
- g_Font[font_head]->RenderString(xpos, ypos+ hheight+1, width, head_string, COL_MENUHEAD, 0, true); // UTF-8
+ g_Font[font_head]->RenderString(xpos, 0 + hheight + 4, width, head_string, COL_MENUHEAD, 0, true); // UTF-8
+ frameBuffer->paintBoxRel(0, 0 + hheight, max_width, max_height - hheight, COL_MENUCONTENT_PLUS_0);
ypos+= hheight;
// paint PIG
- paint_pig( width-240, y+10 , 240, 190);
+ paint_pig( width-240-20, y+10 , 240, 190);
// Info Output
ypos += (iheight >>1);
paint_techinfo ( xpos, ypos);
- paint_signal_fe_box ( width-240, (y + 190 + hheight), 240, 190);
+ paint_signal_fe_box ( width-240-20, (y + 190 + hheight), 240, 190);
} else {
// -- small PIG, small signal graph
// -- paint backround, title pig, etc.
- frameBuffer->paintBoxRel(0, 0, max_width, max_height, COL_MENUHEAD_PLUS_0);
+ frameBuffer->paintBoxRel(0, 0, max_width, max_height, COL_MENUCONTENT_PLUS_0);
// -- paint large signal graph
- paint_signal_fe_box ( x, y, width, height - 60);
+ paint_signal_fe_box ( x+20, y, width, height - 60);
}
}
: 
