neutrino: remove dub code

using class 'CComponentsDetailLine' instead multiple code
details line rendering


Origin commit data
------------------
Branch: ni/coolstream
Commit: 261904acd0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-16 (Mon, 16 Jul 2012)

Origin message was:
------------------
*neutrino: remove dub code

using class 'CComponentsDetailLine' instead multiple code
details line rendering


------------------
This commit was generated by Migit
This commit is contained in:
2012-07-16 14:55:14 +02:00
parent a89e1bdbd7
commit 0ed04a868f
4 changed files with 20 additions and 88 deletions

View File

@@ -55,6 +55,7 @@
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/progressbar.h>
#include <gui/widget/components.h>
#include <gui/osd_setup.h>
#include <system/settings.h>
@@ -1560,7 +1561,6 @@ void CChannelList::paintItem2DetailsLine (int pos, int /*ch_index*/)
int ypos1a = ypos1 + (fheight/2)-2;
int ypos2a = ypos2 + (info_height/2)-2;
fb_pixel_t col1 = COL_MENUCONTENT_PLUS_6;
fb_pixel_t col2 = COL_MENUCONTENT_PLUS_1;
// Clear
frameBuffer->paintBackgroundBoxRel(xpos,y, ConnectLineBox_Width, height+info_height);
@@ -1569,30 +1569,12 @@ void CChannelList::paintItem2DetailsLine (int pos, int /*ch_index*/)
if (pos >= 0) { //pos >= 0 && chanlist[ch_index]->currentEvent.description != "") {
if(1) // FIXME why -> ? (!g_settings.channellist_extended)
{
int fh = fheight > 10 ? fheight - 10: 5;
/* horizontal item mark */
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos1+5, 4, fh, col1);
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos1+5, 1, fh, col2);
//details line
CComponentsDetailLine details_line(xpos, ypos1a, ypos2a, fheight/2+1, info_height-RADIUS_LARGE*2);
details_line.paint();
/* horizontal info mark */
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+7, 4,info_height-14, col1);
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-4, ypos2+7, 1,info_height-14, col2);
/* vertical connect line */
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 3,ypos2a-ypos1a+3, col1);
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 1,ypos2a-ypos1a-3, col2);
/* vertical item line */
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos1a, 12,3, col1);
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16+3, ypos1a+3, 12-3,1, col2);
/* vertical info line */
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a, 12,3, col1);
frameBuffer->paintBoxRel(xpos+ConnectLineBox_Width-16, ypos2a+3, 12,1, col2);
// frameBuffer->paintBoxRel(x, ypos2, width, info_height, col1, RADIUS_LARGE);
//info box frame
frameBuffer->paintBoxFrame(x, ypos2, width, info_height, 2, col1, RADIUS_LARGE);
}
}
}