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

infoviewer: add weather (inactive)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9fc84807f
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-01-14 (Fri, 14 Jan 2022)

Origin message was:
------------------
- infoviewer: add weather (inactive)

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-01-14 22:43:24 +01:00
parent 941d38df57
commit 05b2fca409
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/infoviewer.cpp
View File

@@ -111,6 +111,7 @@ CInfoViewer::CInfoViewer ()
info_CurrentNext.flags = 0; info_CurrentNext.flags = 0;
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
infoViewerBB = CInfoViewerBB::getInstance(); infoViewerBB = CInfoViewerBB::getInstance();
weather = CWeather::getInstance();
ecmInfoBox = NULL; //NI ecmInfoBox = NULL; //NI
md5_ecmInfo = "0"; //NI md5_ecmInfo = "0"; //NI
@@ -621,6 +622,8 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
if (!zap_mode) if (!zap_mode)
infoViewerBB->paintshowButtonBar(); infoViewerBB->paintshowButtonBar();
//weather->show(BoxStartX, g_settings.screen_StartY + OFFSET_INNER_MID);
int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8; int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8;
int ChannelLogoMode = 0; int ChannelLogoMode = 0;
if (g_settings.infobar_show_channellogo > 1) if (g_settings.infobar_show_channellogo > 1)
@@ -813,6 +816,8 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
infoViewerBB->paintshowButtonBar(noTimer); infoViewerBB->paintshowButtonBar(noTimer);
} }
//weather->show(BoxStartX, g_settings.screen_StartY + OFFSET_INNER_MID);
int ChanNumWidth = 0; int ChanNumWidth = 0;
int ChannelLogoMode = 0; int ChannelLogoMode = 0;
bool logo_ok = false; bool logo_ok = false;
@@ -2164,6 +2169,9 @@ void CInfoViewer::killTitle()
is_visible = false; is_visible = false;
infoViewerBB->is_visible = false; infoViewerBB->is_visible = false;
if (weather)
weather->hide();
//NI InfoIcons //NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER) if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
CInfoIcons::getInstance()->hideIcons(); CInfoIcons::getInstance()->hideIcons();

3
src/gui/infoviewer.h
View File

@@ -40,6 +40,7 @@
#include <string> #include <string>
#include <zapit/channel.h> #include <zapit/channel.h>
#include <gui/components/cc.h> #include <gui/components/cc.h>
#include <gui/weather.h>
class CFrameBuffer; class CFrameBuffer;
class COSDFader; class COSDFader;
@@ -54,6 +55,8 @@ class CInfoViewer : public sigc::trackable
CComponentsShapeSquare *header , *numbox, *body, *rec; CComponentsShapeSquare *header , *numbox, *body, *rec;
CComponentsTextTransp *txt_curr_start, *txt_curr_event, *txt_curr_rest, *txt_next_start, *txt_next_event, *txt_next_in; CComponentsTextTransp *txt_curr_start, *txt_curr_event, *txt_curr_rest, *txt_next_start, *txt_next_event, *txt_next_in;
CWeather *weather;
bool gotTime; bool gotTime;
bool recordModeActive; bool recordModeActive;