mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-30 16:32:43 +01:00
parent b8bc7ca96f 8195393c78
commit eccc57e073
11 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/timeosd.cpp
View File

@@ -32,6 +32,7 @@
#include <global.h>
#include <neutrino.h>
#include <gui/volumebar.h>
#include <gui/infoclock.h>
#include <gui/timeosd.h>
#include "screensaver.h"
@@ -42,6 +43,9 @@ extern CInfoIcons *InfoIcons;
CTimeOSD::CTimeOSD():CComponentsFrmClock( 1, 1, NULL, "%H:%M:%S", NULL, false, 1, NULL, CC_SHADOW_ON)
{
m_mode = MODE_HIDE;
tmp_mode = MODE_HIDE;
m_restore = false;
Init();
}
@@ -49,7 +53,6 @@ void CTimeOSD::Init()
{
paint_bg = g_settings.infoClockBackground;
m_time_show = time(0);
m_mode = MODE_HIDE;
//use current theme colors
setColorAll(COL_FRAME_PLUS_0, COL_MENUCONTENT_PLUS_0, COL_SHADOW_PLUS_0);
@@ -63,13 +66,7 @@ void CTimeOSD::Init()
setColorBody(COL_BACKGROUND_PLUS_0);
}
//set height, NOTE: height is strictly bound to settings
if (g_settings.infoClockFontSize != height){
height = g_settings.infoClockFontSize;
int dx = 0;
int dy = height;
setClockFont(*CNeutrinoFonts::getInstance()->getDynFont(dx, dy, cl_format_str, cl_font_style));
}
setClockFont(CInfoClock::getInstance()->getClockFont());
// set corner radius depending on clock height
corner_rad = (g_settings.rounded_corners) ? std::max(height/10, CORNER_RADIUS_SMALL) : 0;
@@ -88,6 +85,14 @@ CTimeOSD::~CTimeOSD()
}
#endif
CTimeOSD* CTimeOSD::getInstance()
{
static CTimeOSD* timeOSD = NULL;
if(!timeOSD)
timeOSD = new CTimeOSD();
return timeOSD;
}
void CTimeOSD::initTimeString()
{
struct tm t;