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

scan: using CComponentsHeader to paint header

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d9045d50
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-29 (Wed, 29 May 2013)

Origin message was:
------------------
- scan: using CComponentsHeader to paint header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2013-05-29 21:17:09 +02:00
parent fabadea26c
commit c7c7214413
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/scan.cpp
View File

@@ -49,6 +49,7 @@
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#include <gui/widget/messagebox.h> #include <gui/widget/messagebox.h>
#include <gui/components/cc_frm.h>
#include <gui/components/cc_item_progressbar.h> #include <gui/components/cc_item_progressbar.h>
#include <system/settings.h> #include <system/settings.h>
@@ -337,9 +338,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
g_RCInput->open_click(); g_RCInput->open_click();
} }
if(!test) { if(!test) {
const char * text = g_Locale->getText(success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED); CComponentsHeader header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED, NULL /*no header icon*/);
frameBuffer->paintBoxRel(x, y, width, hheight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP); header.paint(CC_SAVE_SCREEN_NO);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(xpos1, y + hheight, width, text, COL_MENUHEAD, 0, true); // UTF-8
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(0xFFFF); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(0xFFFF);
do { do {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
@@ -500,19 +500,14 @@ void CScanTs::paintLine(int px, int py, int w, const char * const txt)
void CScanTs::paint(bool fortest) void CScanTs::paint(bool fortest)
{ {
int ypos; CComponentsHeader header(x, y, width, hheight, fortest ? LOCALE_SCANTS_TEST : LOCALE_SCANTS_HEAD, NULL /*no header icon*/);
header.paint(CC_SAVE_SCREEN_NO);
ypos = y; frameBuffer->paintBoxRel(x, y + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
//frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(xpos1, ypos + hheight, width, fortest ? g_Locale->getText(LOCALE_SCANTS_TEST) : g_Locale->getText(LOCALE_SCANTS_HEAD), COL_MENUHEAD, 0, true); // UTF-8
//frameBuffer->paintBoxRel(x, ypos + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x, ypos + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
frameBuffer->loadPal(tuned ? "radar.pal" : "radar_red.pal", 18, 38); frameBuffer->loadPal(tuned ? "radar.pal" : "radar_red.pal", 18, 38);
ypos = y + hheight + (mheight >> 1); int ypos = y + hheight + (mheight >> 1);
ypos_cur_satellite = ypos; ypos_cur_satellite = ypos;