From 45b91d060e0991870c3784970a3964797df89812 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 9 May 2013 14:20:00 +0200 Subject: Fixed display of recording duration in recordings menu when a cut is running --- HISTORY | 2 ++ config.c | 3 +-- menuitem.c | 3 ++- po/de_DE.po | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 806ea6a..bc6e331 100644 --- a/HISTORY +++ b/HISTORY @@ -212,3 +212,5 @@ Version 0.1.2 - Introduced "plain" style without any blending effects configurable by dedicated theme color - Added theme "iceblue" based on the introduced plain display style +- Fixed display of recording duration in recordings menu when a cut is + running in the background diff --git a/config.c b/config.c index 897bb26..88d962e 100644 --- a/config.c +++ b/config.c @@ -163,7 +163,6 @@ cNopacityConfig::~cNopacityConfig() { } void cNopacityConfig::setDynamicValues() { -esyslog("nopacity: col blending %x, do Blending %x", Theme.Color(clrDoBlending), CLR_BLENDING_ON); doBlending = (Theme.Color(clrDoBlending) == CLR_BLENDING_ON)?true:false; if (fontIndex == 0) { fontName = strdup(fontDefaultName); @@ -436,4 +435,4 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) { else return false; return true; -} \ No newline at end of file +} diff --git a/menuitem.c b/menuitem.c index bc10645..ab85994 100644 --- a/menuitem.c +++ b/menuitem.c @@ -1054,14 +1054,15 @@ void cNopacityRecordingMenuItem::DrawFolderIcon(void) { void cNopacityRecordingMenuItem::DrawRecDateTime(void) { int iconDateTimeSize = config.menuRecFolderSize / 2; + int iconHeight = height/2 + (height/2 - iconDateTimeSize)/2; if (!drawn) { cImageLoader imgLoader; if (imgLoader.LoadIcon("skinIcons/recordingdatetime", iconDateTimeSize)) { - int iconHeight = height/2 + (height/2 - iconDateTimeSize)/2; pixmapIcon->DrawImage(cPoint(3, iconHeight), imgLoader.GetImage()); } drawn = true; } + pixmapIcon->DrawRectangle(cRect(iconHeight, 0, width-iconHeight, height), clrTransparent); const cEvent *Event = NULL; Event = Recording->Info()->GetEvent(); cString strDateTime(""); diff --git a/po/de_DE.po b/po/de_DE.po index 42b2bbf..01b3fec 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -366,7 +366,7 @@ msgid "Background Style" msgstr "Hintergrund Stil" msgid "Rounded Corners" -msgstr "" +msgstr "Abgerundete Ecken" msgid "Channel Logo Position" msgstr "Kanallogo Position" -- cgit v1.2.3