- motorcontrol: using CComponentsHeader to paint header

This commit is contained in:
svenhoefer
2013-05-29 21:18:39 +02:00
parent bc9e3ac7bd
commit 9673fe4b01
2 changed files with 9 additions and 11 deletions

View File

@@ -38,6 +38,7 @@
#include <gui/motorcontrol.h>
#include <gui/scan_setup.h>
#include <gui/color.h>
#include <gui/components/cc_frm.h>
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <system/settings.h>
@@ -171,7 +172,7 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &)
g_Zapit->tune_TP(TP);
paint();
paintHead();
paintMenu();
paintStatus();
@@ -595,20 +596,17 @@ void CMotorControl::paintStatus()
paintSeparator(xpos1, &ypos, width, g_Locale->getText(LOCALE_MOTORCONTROL_SETTINGS));
}
void CMotorControl::paint()
void CMotorControl::paintHead()
{
ypos = y;
frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + 10, ypos + hheight, width, g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), COL_MENUHEAD, 0, true); // UTF-8
frameBuffer->paintBoxRel(x, ypos + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
ypos += hheight + (mheight >> 1) - 10;
ypos_menue = ypos;
CComponentsHeader header(x, y, width, hheight, LOCALE_MOTORCONTROL_HEAD, NULL /*no header icon*/);
header.paint(CC_SAVE_SCREEN_NO);
}
void CMotorControl::paintMenu()
{
ypos = ypos_menue;
frameBuffer->paintBoxRel(x, y + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
ypos = y + hheight + (mheight >> 1) - 10;
int xpos1 = x + 10;
int xpos2 = xpos1 + 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("(7/yellow)");

View File

@@ -68,7 +68,7 @@ class CMotorControl : public CMenuTarget
int satfindpid;
int lastsnr, lastsig;
CProgressBar *snrscale, *sigscale;
void paint();
void paintHead(void);
void paintMenu(void);
void paintStatus(void);
void paintLine(int x, int *y, int width, const char *txt);