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

- infoviewer: rename txt_cur_event_rest => txt_cur_rest

Browse Source 
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Some changes were required for this pick:
Build was broken because of item name setters had wrong object names.
This commit is contained in:
svenhoefer
2018-01-09 11:14:08 +01:00
committed by Thilo Graf
parent 172f4038e5
commit 6e3f7babf3
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/infoviewer.cpp
View File

@@ -95,7 +95,7 @@ CInfoViewer::CInfoViewer ()
{ {
sigbox = NULL; sigbox = NULL;
header = numbox = body = rec = NULL; header = numbox = body = rec = NULL;
txt_cur_start = txt_cur_event = txt_cur_event_rest = txt_next_start = txt_next_event = txt_next_in = NULL; txt_cur_start = txt_cur_event = txt_cur_rest = txt_next_start = txt_next_event = txt_next_in = NULL;
timescale = NULL; timescale = NULL;
clock = NULL; clock = NULL;
info_CurrentNext.current_zeit.startzeit = 0; info_CurrentNext.current_zeit.startzeit = 0;
@@ -451,12 +451,12 @@ void CInfoViewer::paintBody()
body = new CComponentsShapeSquare(ChanInfoX, y_body, BoxEndX-ChanInfoX, h_body); body = new CComponentsShapeSquare(ChanInfoX, y_body, BoxEndX-ChanInfoX, h_body);
body->setItemName("body"); body->setItemName("body");
} else { } else {
if (txt_cur_event && txt_cur_start && txt_cur_event_rest && if (txt_cur_event && txt_cur_start && txt_cur_rest &&
txt_next_event && txt_next_start && txt_next_in) { txt_next_event && txt_next_start && txt_next_in) {
if (h_body != body->getHeight() || y_body != body->getYPos()){ if (h_body != body->getHeight() || y_body != body->getYPos()){
txt_cur_start->getCTextBoxObject()->clearScreenBuffer(); txt_cur_start->getCTextBoxObject()->clearScreenBuffer();
txt_cur_event->getCTextBoxObject()->clearScreenBuffer(); txt_cur_event->getCTextBoxObject()->clearScreenBuffer();
txt_cur_event_rest->getCTextBoxObject()->clearScreenBuffer(); txt_cur_rest->getCTextBoxObject()->clearScreenBuffer();
txt_next_start->getCTextBoxObject()->clearScreenBuffer(); txt_next_start->getCTextBoxObject()->clearScreenBuffer();
txt_next_event->getCTextBoxObject()->clearScreenBuffer(); txt_next_event->getCTextBoxObject()->clearScreenBuffer();
txt_next_in->getCTextBoxObject()->clearScreenBuffer(); txt_next_in->getCTextBoxObject()->clearScreenBuffer();
@@ -1780,15 +1780,15 @@ void CInfoViewer::display_Info(const char *current, const char *next,
} }
if (runningRest){ if (runningRest){
if (txt_cur_event_rest == NULL) if (txt_cur_rest == NULL)
txt_cur_event_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); txt_cur_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height);
else else
txt_cur_event_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); txt_cur_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height);
txt_cur_event_rest->setItemName("txt_cur_event_rest"); txt_cur_rest->setItemName("txt_cur_rest");
txt_cur_event_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); txt_cur_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_cur_event_rest->isPainted()) if (txt_cur_rest->isPainted())
txt_cur_event_rest->hide(); txt_cur_rest->hide();
txt_cur_event_rest->paint(CC_SAVE_SCREEN_YES); txt_cur_rest->paint(CC_SAVE_SCREEN_YES);
} }
} }
@@ -2073,8 +2073,8 @@ void CInfoViewer::killTitle()
if (txt_cur_event) if (txt_cur_event)
txt_cur_event->kill(); txt_cur_event->kill();
if (txt_cur_event_rest) if (txt_cur_rest)
txt_cur_event_rest->kill(); txt_cur_rest->kill();
if (txt_cur_start) if (txt_cur_start)
txt_cur_start->kill(); txt_cur_start->kill();
if (txt_next_start) if (txt_next_start)
@@ -2294,8 +2294,8 @@ void CInfoViewer::ResetModules()
delete clock; clock = NULL; delete clock; clock = NULL;
} }
delete txt_cur_start; txt_cur_start = NULL; delete txt_cur_start; txt_cur_start = NULL;
delete txt_cur_event; txt_cur_event = NULL; delete txt_cur_event; txt_cur_event = NULL;
delete txt_cur_event_rest; txt_cur_event_rest = NULL; delete txt_cur_rest; txt_cur_rest = NULL;
delete txt_next_start; txt_next_start = NULL; delete txt_next_start; txt_next_start = NULL;
delete txt_next_event; txt_next_event = NULL; delete txt_next_event; txt_next_event = NULL;
delete txt_next_in; txt_next_in = NULL; delete txt_next_in; txt_next_in = NULL;

2
src/gui/infoviewer.h
View File

@@ -52,7 +52,7 @@ class CInfoViewer
CInfoViewerBB* infoViewerBB; CInfoViewerBB* infoViewerBB;
CComponentsFrmClock *clock; CComponentsFrmClock *clock;
CComponentsShapeSquare *header , *numbox, *body, *rec; CComponentsShapeSquare *header , *numbox, *body, *rec;
CComponentsTextTransp *txt_cur_start, *txt_cur_event, *txt_cur_event_rest, *txt_next_start, *txt_next_event, *txt_next_in; CComponentsTextTransp *txt_cur_start, *txt_cur_event, *txt_cur_rest, *txt_next_start, *txt_next_event, *txt_next_in;
bool gotTime; bool gotTime;
bool recordModeActive; bool recordModeActive;