[vdr-plugin-skinsoppalusikka] 01/03: Imported Upstream version 2.0.3
Tobias Grimm
tiber-guest at moszumanska.debian.org
Mon Feb 9 22:47:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-skinsoppalusikka.
commit dbc435b7ccfefa1dc734fa50e26c935915ede13a
Author: etobi <git at e-tobi.net>
Date: Mon Feb 9 23:46:28 2015 +0100
Imported Upstream version 2.0.3
---
HISTORY | 29 ++++++++++++++++
Makefile | 11 ++++--
README | 10 +-----
logo.h | 4 +--
po/de_DE.po | 17 ++++++---
po/es_ES.po | 17 ++++++---
po/et_EE.po | 17 ++++++---
po/fi_FI.po | 17 ++++++---
po/fr_FR.po | 17 ++++++---
po/hu_HU.po | 17 ++++++---
po/it_IT.po | 15 ++++++--
po/pl_PL.po | 17 ++++++---
po/ru_RU.po | 17 ++++++---
po/sv_SE.po | 17 ++++++---
skinsoppalusikka.c | 9 ++---
soppalusikka.c | 46 ++++++++++++++++---------
symbol.c | 4 ++-
symbol.h | 13 +++----
themes/soppalusikka-blackberry.theme | 2 ++
themes/soppalusikka-citron.theme | 2 ++
themes/soppalusikka-default.theme | 2 ++
themes/soppalusikka-mint.theme | 2 ++
themes/soppalusikka-orange.theme | 2 ++
themes/soppalusikka-potato.theme | 67 ++++++++++++++++++++++++++++++++++++
themes/soppalusikka-vanilla.theme | 2 ++
25 files changed, 293 insertions(+), 80 deletions(-)
diff --git a/HISTORY b/HISTORY
index ac1603c..d8ecfbd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -176,6 +176,11 @@ VDR Skin 'Soppalusikka' Revision History
increased the default logo cache size to 100.
- Improved performance.
+
+========================================
+VDR Skin 'Soppalusikka' Revision History
+========================================
+
2008-03-27: Version 1.6.0
- Updated for vdr-1.6.0.
@@ -275,3 +280,27 @@ VDR Skin 'Soppalusikka' Revision History
2013-02-10: Version 1.7.9
- Updated for vdr-1.7.37.
+
+
+========================================
+VDR Skin 'Soppalusikka' Revision History
+========================================
+
+2013-04-01: Version 2.0.0
+
+- Updated for vdr-2.0.0.
+- Fixed symbols in schedule and recordings menus.
+
+2013-04-21: Version 2.0.1
+
+- Updated all themes with two new color fields.
+- Added a new theme: Potato (Thanks to Andreas Brachold).
+
+2013-10-23: Version 2.0.2
+
+- Updated the recording info layout.
+
+2014-01-10: Version 2.0.3
+
+- Fixed a memory leak and issues reported by scan-build
+ and cppcheck tools.
diff --git a/Makefile b/Makefile
index 3a35aed..dd24937 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,11 @@ GITTAG = $(shell git describe --always 2>/dev/null)
### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg)
+CFGDIR = $(call PKGCFG,configdir)
#
TMPDIR ?= /tmp
@@ -129,7 +130,11 @@ endif
install-lib: $(SOFILE)
install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-install: install-lib install-i18n
+install-conf:
+ @mkdir -p $(DESTDIR)$(CFGDIR)/themes/
+ @cp -pn themes/* $(DESTDIR)$(CFGDIR)/themes/
+
+install: install-lib install-i18n install-conf
dist: $(I18Npo) clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -145,4 +150,4 @@ clean:
.PHONY: cppcheck
cppcheck:
- @cppcheck --enable=all -v -f $(OBJS:%.o=%.c)
+ @cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
diff --git a/README b/README
index 5459070..1607b72 100644
--- a/README
+++ b/README
@@ -23,16 +23,8 @@ The "Soppalusikka" is a standalone skin providing the good old "ElchiAIO" looks.
Installation:
-cd /put/your/path/here/VDR/PLUGINS/src
tar -xzf /put/your/path/here/vdr-skinsoppalusikka-X.Y.Z.tgz
-ln -s skinsoppalusikka-X.Y.Z skinsoppalusikka
-mkdir -p /path/to/vdrconf/plugins/skinsoppalusikka
-cp -d /path/to/channel/logos/*.xpm /path/to/vdrconf/plugins/skinsoppalusikka/
-cp -d skinsoppalusikka/themes/*.theme /path/to/vdrconf/themes/
-cd /put/your/path/here/VDR
-make
-make plugins
-./vdr -P skinsoppalusikka
+make -C skinsoppalusikka-X.Y.Z install
Configuration:
diff --git a/logo.h b/logo.h
index 251bfae..726e06b 100644
--- a/logo.h
+++ b/logo.h
@@ -35,8 +35,8 @@ public:
bool Load(const char *fileNameP);
cBitmap& Get(void);
bool Flush(void);
- int GetLogoHeight() { return int(yFactorM * DEFAULT_LOGO_HEIGHT); }
- int GetLogoWidth() { return int(yFactorM * DEFAULT_LOGO_WIDTH); }
+ int GetLogoHeight() { return int(yFactorM * cSoppalusikkaLogoCache::DEFAULT_LOGO_HEIGHT); }
+ int GetLogoWidth() { return int(yFactorM * cSoppalusikkaLogoCache::DEFAULT_LOGO_WIDTH); }
};
extern cSoppalusikkaLogoCache SoppalusikkaLogoCache;
diff --git a/po/de_DE.po b/po/de_DE.po
index 6564ad9..20f995a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,15 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Thomas G�nther
# J�rg Bornkessel
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: J�rg Bornkessel\n"
"Language-Team: German <vdr at linuxtv.org>\n"
"Language: de\n"
@@ -95,12 +95,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Priorit�t"
msgid "Lifetime"
msgstr "Lebensdauer"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Zusatzinfo"
diff --git a/po/es_ES.po b/po/es_ES.po
index 57f41ed..c907b00 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Luis Palacios
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Luis Palacios\n"
"Language-Team: Spanish <vdr at linuxtv.org>\n"
"Language: es\n"
@@ -94,12 +94,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Prioridad"
msgid "Lifetime"
msgstr "Duraci�n"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Informaci�n auxiliar"
diff --git a/po/et_EE.po b/po/et_EE.po
index ca1586f..863e535 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Arthur Konovalov
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Arthur Konovalov\n"
"Language-Team: Estonian <vdr at linuxtv.org>\n"
"Language: et\n"
@@ -100,12 +100,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Prioriteet"
msgid "Lifetime"
msgstr "Eluiga"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Lisainfo"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 48214d7..571c29d 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Rolf Ahrenberg
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr at linuxtv.org>\n"
"Language: fi\n"
@@ -100,12 +100,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr "Kesto"
+
+msgid "Size"
+msgstr "Koko"
+
msgid "Priority"
msgstr "Prioriteetti"
msgid "Lifetime"
msgstr "Elinikä"
+msgid "Format"
+msgstr "Tiedostomuoto"
+
msgid "Auxiliary information"
msgstr "Lisätiedot"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 852b30b..26d79fc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,15 +1,15 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Micha�l Nival
# neptunvasja at VDRPortal
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: NIVAL Micha�l <mnival at club-internet.fr>\n"
"Language-Team: French <vdr at linuxtv.org>\n"
"Language: fr\n"
@@ -101,12 +101,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Priorit�"
msgid "Lifetime"
msgstr "Dur�e de vie"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Information auxiliare"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b48aef1..3de2333 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# F�ley Istv�n
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: F�ley Istv�n\n"
"Language-Team: Hungarian <vdr at linuxtv.org>\n"
"Language: hu\n"
@@ -94,12 +94,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Priorit�s"
msgid "Lifetime"
msgstr "�lettartam"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Tov�bbi inform�ci�k"
diff --git a/po/it_IT.po b/po/it_IT.po
index deef671..33d0da7 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Luis Palacios
# Diego Pierotto <vdr-italian at tiscali.it>
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
"PO-Revision-Date: 2008-12-21 20:25+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: Italian <vdr at linuxtv.org>\n"
@@ -101,12 +101,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Priorit�"
msgid "Lifetime"
msgstr "Durata"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Info ausiliare"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index a90bcfb..c145a67 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Jaroslaw Swierczynski
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Jaroslaw Swierczynski\n"
"Language-Team: Polish <vdr at linuxtv.org>\n"
"Language: pl\n"
@@ -94,12 +94,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Priorytet"
msgid "Lifetime"
msgstr "Czas �ycia"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Informacje pomocnicze"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3c56a9b..f33d801 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Alexander Gross <Bikalexander at gmail.com>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Alexander Gross <Bikalexander at gmail.com>\n"
"Language-Team: Russian <vdr at linuxtv.org>\n"
"Language: ru\n"
@@ -101,12 +101,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Приоритет"
msgid "Lifetime"
msgstr "Срок хранения"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Дополнительная информация"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 3cd71a3..4207568 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,15 +1,15 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
# This file is distributed under the same license as the skinsoppalusikka package.
# Rolf Ahrenberg
# Jan Ekholm
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-skinsoppalusikka 1.7.9\n"
+"Project-Id-Version: vdr-skinsoppalusikka 2.0.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-06-03 06:03+0200\n"
-"PO-Revision-Date: 2012-06-03 06:03+0200\n"
+"POT-Creation-Date: 2013-10-23 00:31+0300\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Jan Ekholm\n"
"Language-Team: Swedish <vdr at linuxtv.org>\n"
"Language: sv\n"
@@ -95,12 +95,21 @@ msgstr "VPS"
msgid "EBU"
msgstr "EBU"
+msgid "Duration"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
msgid "Priority"
msgstr "Prioritet"
msgid "Lifetime"
msgstr "Livstid"
+msgid "Format"
+msgstr ""
+
msgid "Auxiliary information"
msgstr "Extrainformation"
diff --git a/skinsoppalusikka.c b/skinsoppalusikka.c
index 404e1d6..2a103e6 100644
--- a/skinsoppalusikka.c
+++ b/skinsoppalusikka.c
@@ -13,15 +13,15 @@
#include "logo.h"
#include "soppalusikka.h"
-#if defined(APIVERSNUM) && APIVERSNUM < 10737
-#error "VDR-1.7.37 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20000
+#error "VDR-2.0.0 API version or greater is required!"
#endif
#ifndef GITVERSION
#define GITVERSION ""
#endif
-static const char VERSION[] = "1.7.9" GITVERSION;
+static const char VERSION[] = "2.0.3" GITVERSION;
static const char DESCRIPTION[] = trNOOP("Soppalusikka skin");
class cPluginSkinSoppalusikka : public cPlugin {
@@ -192,10 +192,11 @@ cString cPluginSkinSoppalusikka::SVDRPCommand(const char *Command, const char *O
}
cPluginSkinSoppalusikkaSetup::cPluginSkinSoppalusikkaSetup(void)
+: data(SoppalusikkaConfig)
{
// create setup menu
debug("cPluginSkinSoppalusikkaSetup()");
- data = SoppalusikkaConfig;
+ SetMenuCategory(mcSetupPlugins);
Setup();
SetHelp(tr("Button$Flush cache"), NULL, NULL, NULL);
}
diff --git a/soppalusikka.c b/soppalusikka.c
index 6cb8c97..b634547 100644
--- a/soppalusikka.c
+++ b/soppalusikka.c
@@ -52,6 +52,7 @@ THEME_CLR(Theme, clrMessageErrorFg, 0xFFFFEE00);
THEME_CLR(Theme, clrMessageErrorBg, 0xC8000066);
THEME_CLR(Theme, clrVolumePromptFg, 0xFF000000);
THEME_CLR(Theme, clrVolumePromptBg, 0xFFFFFFFF);
+THEME_CLR(Theme, clrVolumePromptBorder, 0xFF000000);
THEME_CLR(Theme, clrVolumeBarUpper, 0xC8000066);
THEME_CLR(Theme, clrVolumeBarLower, 0xFF33CC33);
THEME_CLR(Theme, clrVolumeBarMute, 0xFFFF0000);
@@ -85,6 +86,7 @@ THEME_CLR(Theme, clrMenuScrollbarShown, 0xFFCCBB22);
THEME_CLR(Theme, clrMenuText, 0xFFCCBB22);
THEME_CLR(Theme, clrReplayTitleFg, 0xFF000000);
THEME_CLR(Theme, clrReplayTitleBg, 0xFFFFFFFF);
+THEME_CLR(Theme, clrReplayTitleBorder, 0xFF000000);
THEME_CLR(Theme, clrReplayCurrent, 0xFFFFFFFF);
THEME_CLR(Theme, clrReplayTotal, 0xFFFFFFFF);
THEME_CLR(Theme, clrReplayModeJump, 0xFFFFFFFF);
@@ -766,17 +768,18 @@ void cSkinSoppalusikkaDisplayMenu::SetItem(const char *Text, int Index, bool Cur
bool isprogressbar = false;
int now = 0, total = 0;
// check if event info symbol: "tTV*" "R"
- if (SoppalusikkaConfig.showsymbols /*&& (MenuCategory() == mcSchedule)*/) {
- // check if event info characters
- if (strlen(s) == 3 && ischaracter(s[0], " tTR") && ischaracter(s[1], " V") && ischaracter(s[2], " *")) {
- // update status
- iseventinfo = true;
- }
+ if (SoppalusikkaConfig.showsymbols &&
+ ((MenuCategory() == mcSchedule) || (MenuCategory() == mcScheduleNow) || (MenuCategory() == mcScheduleNext)) &&
+ strlen(s) == 3 && ischaracter(s[0], " tTR") && ischaracter(s[1], " V") && ischaracter(s[2], " *")) {
+ // update status
+ iseventinfo = true;
}
- // check if new recording: "01.01.06*", "10:10*"
- if (!iseventinfo && SoppalusikkaConfig.showsymbols /*&& (MenuCategory() == mcRecording)*/ &&
- (strlen(s) == 6 && s[5] == '*' && s[2] == ':' && isdigit(*s) && isdigit(*(s + 1)) && isdigit(*(s + 3)) && isdigit(*(s + 4))) ||
- (strlen(s) == 9 && s[8] == '*' && s[5] == '.' && s[2] == '.' && isdigit(*s) && isdigit(*(s + 1)) && isdigit(*(s + 3)) && isdigit(*(s + 4)) && isdigit(*(s + 6)) && isdigit(*(s + 7)))) {
+ // check if new recording: "0:45*", "10:10*", "01.01.06*"
+ if (!iseventinfo && SoppalusikkaConfig.showsymbols &&
+ (MenuCategory() == mcRecording) &&
+ ((strlen(s) == 5 && s[4] == '*' && s[1] == ':' && isdigit(*s) && isdigit(*(s + 2)) && isdigit(*(s + 3))) ||
+ (strlen(s) == 6 && s[5] == '*' && s[2] == ':' && isdigit(*s) && isdigit(*(s + 1)) && isdigit(*(s + 3)) && isdigit(*(s + 4))) ||
+ (strlen(s) == 9 && s[8] == '*' && s[5] == '.' && s[2] == '.' && isdigit(*s) && isdigit(*(s + 1)) && isdigit(*(s + 3)) && isdigit(*(s + 4)) && isdigit(*(s + 6)) && isdigit(*(s + 7))))) {
// update status
isnewrecording = true;
// make a copy
@@ -785,8 +788,9 @@ void cSkinSoppalusikkaDisplayMenu::SetItem(const char *Text, int Index, bool Cur
buffer[strlen(s) - 1] = '\0';
}
// check if progress bar: "[||||||| ]"
- if (!iseventinfo && !isnewrecording && SoppalusikkaConfig.showprogressbar /*&& (MenuCategory() == mcSchedule)*/ &&
- (strlen(s) > 5 && s[0] == '[' && s[strlen(s) - 1] == ']')) {
+ if (!iseventinfo && !isnewrecording && SoppalusikkaConfig.showprogressbar &&
+ ((MenuCategory() == mcSchedule) || (MenuCategory() == mcScheduleNow) || (MenuCategory() == mcScheduleNext)) &&
+ (strlen(s) > 5 && s[0] == '[' && s[strlen(s) - 1] == ']')) {
const char *p = s + 1;
// update status
isprogressbar = true;
@@ -926,7 +930,7 @@ void cSkinSoppalusikkaDisplayMenu::SetEvent(const cEvent *Event)
if (Event->Vps()) {
// draw VPS symbol
osd->DrawBitmap(xs, y + (y4 - y) / GetSymbol(SYMBOL_VPS).Height(), GetSymbol(SYMBOL_VPS), Theme.Color(clrMenuEventSymbolFg), Theme.Color(clrMenuEventSymbolBg));
- xs += (GetSymbol(SYMBOL_VPS).Width() + Roundness);
+ //xs += (GetSymbol(SYMBOL_VPS).Width() + Roundness);
}
y = y4;
// draw event date / duration string
@@ -1039,7 +1043,17 @@ void cSkinSoppalusikkaDisplayMenu::SetRecording(const cRecording *Recording)
ts.Set(osd, x2, y, x3 - x2, y5 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
y += ts.Height();
// draw additional information
- cString info = cString::sprintf("%s: %d %s: %d", tr("Priority"), Recording->Priority(), tr("Lifetime"), Recording->Lifetime());
+ cString info("");
+ cChannel *channel = Channels.GetByChannelID(Info->ChannelID());
+ if (channel)
+ info = cString::sprintf("%s\n%s: %s", *info, trVDR("Channel"), *ChannelString(channel, 0));
+ int length = Recording->LengthInSeconds();
+ int dirsize = DirSizeMB(Recording->FileName());
+ cString duration = (length >= 0) ? cString::sprintf("%s: %d:%02d:%02d ", tr("Duration"), length / 3600, length / 60 % 60, length % 60) : cString("");
+ cString size = (dirsize > 9999) ? cString::sprintf("%s: %.2f GB ", tr("Size"), dirsize / 1024.0) : cString::sprintf("%s: %d MB ", tr("Size"), dirsize);
+ cString bitrate = (length > 0) ? cString::sprintf("(%.2f MBit/s)", 8.0 * dirsize / length) : cString("");
+ info = cString::sprintf("%s\n%s%s%s", *info, *duration, *size, *bitrate);
+ info = cString::sprintf("%s\n%s: %d %s: %d %s: %s", *info, tr("Priority"), Recording->Priority(), tr("Lifetime"), Recording->Lifetime(), tr("Format"), Recording->IsPesRecording() ? "PES" : "TS");
if (SoppalusikkaConfig.showauxinfo && Info->Aux()) {
char *aux = strdup(Info->Aux());
info = cString::sprintf("%s\n%s: %s", *info, tr("Auxiliary information"), parseaux(aux));
@@ -1251,7 +1265,7 @@ cSkinSoppalusikkaDisplayReplay::cSkinSoppalusikkaDisplayReplay(bool ModeOnly)
}
else {
// draw titlebar
- osd->DrawRectangle(x0, y0, x5 - 1, y2 - 1, Theme.Color(clrReplayTitleFg));
+ osd->DrawRectangle(x0, y0, x5 - 1, y2 - 1, Theme.Color(clrReplayTitleBorder));
// draw rounded left corner of timebar
osd->DrawSlope(x5, y0, x6 - 1, y2 - 1, Theme.Color(clrBackground), 0);
// draw timebar
@@ -1575,7 +1589,7 @@ void cSkinSoppalusikkaDisplayVolume::SetVolume(int Current, int Total, bool Mute
// current volume
int vol = x2 + (x3 - x2) * Current / Total;
// draw titlebar
- osd->DrawRectangle(x0, y0, wbg - 1, y2 - 1, Theme.Color(clrVolumePromptFg));
+ osd->DrawRectangle(x0, y0, wbg - 1, y2 - 1, Theme.Color(clrVolumePromptBorder));
osd->DrawRectangle(wbg, y0, x4 - 1, y2 - 1, clrTransparent);
osd->DrawText(x0 + Gap, y0 + Gap, Prompt, Theme.Color(clrVolumePromptFg), Theme.Color(clrVolumePromptBg), font, wfg, lineHeight, taCenter);
// draw rounded left corner
diff --git a/symbol.c b/symbol.c
index 04943aa..ae04d94 100644
--- a/symbol.c
+++ b/symbol.c
@@ -45,6 +45,7 @@
#include "symbols/eventrecording.xpm"
#include "symbols/recordingnew.xpm"
+static cBitmap bmOnePixel(1, 1, 1);
static cBitmap bmAudio(audio_xpm);
static cBitmap bmAudioLeft(audioleft_xpm);
static cBitmap bmAudioRight(audioright_xpm);
@@ -117,6 +118,7 @@ bool cSoppalusikkaSymbolCache::Populate(void)
Flush();
// pushing order must follow the enumeration - keep original proportions
+ cacheM.Append(bmOnePixel.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ONEPIXEL
cacheM.Append(bmAudio.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AUDIO
cacheM.Append(bmAudioLeft.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AUDIO_LEFT
cacheM.Append(bmAudioRight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AUDIO_RIGHT
@@ -173,7 +175,7 @@ bool cSoppalusikkaSymbolCache::Flush(void)
cBitmap& cSoppalusikkaSymbolCache::Get(eSymbols symbolP)
{
- cBitmap *bitmapM = NULL;
+ cBitmap *bitmapM = cacheM[SYMBOL_ONEPIXEL];
if (symbolP < cacheM.Size())
bitmapM = cacheM[symbolP];
diff --git a/symbol.h b/symbol.h
index bc6eebb..3931eda 100644
--- a/symbol.h
+++ b/symbol.h
@@ -12,7 +12,8 @@
#include <vdr/osd.h>
enum eSymbols {
- SYMBOL_AUDIO = 0,
+ SYMBOL_ONEPIXEL = 0,
+ SYMBOL_AUDIO,
SYMBOL_AUDIO_LEFT,
SYMBOL_AUDIO_RIGHT,
SYMBOL_DOLBY_DIGITAL,
@@ -71,11 +72,11 @@ public:
~cSoppalusikkaSymbolCache();
void Refresh();
cBitmap& Get(eSymbols symbolP);
- int GetGapTiny() { return int(yFactorM * DEFAULT_GAP_TINY); }
- int GetGapSmall() { return int(yFactorM * DEFAULT_GAP_SMALL); }
- int GetGapNormal() { return int(yFactorM * DEFAULT_GAP_NORMAL); }
- int GetGapBig() { return int(yFactorM * DEFAULT_GAP_BIG); }
- int GetRoundness() { return int(yFactorM * DEFAULT_ROUNDNESS); }
+ int GetGapTiny() { return int(yFactorM * cSoppalusikkaSymbolCache::DEFAULT_GAP_TINY); }
+ int GetGapSmall() { return int(yFactorM * cSoppalusikkaSymbolCache::DEFAULT_GAP_SMALL); }
+ int GetGapNormal() { return int(yFactorM * cSoppalusikkaSymbolCache::DEFAULT_GAP_NORMAL); }
+ int GetGapBig() { return int(yFactorM * cSoppalusikkaSymbolCache::DEFAULT_GAP_BIG); }
+ int GetRoundness() { return int(yFactorM * cSoppalusikkaSymbolCache::DEFAULT_ROUNDNESS); }
};
extern cSoppalusikkaSymbolCache SoppalusikkaSymbolCache;
diff --git a/themes/soppalusikka-blackberry.theme b/themes/soppalusikka-blackberry.theme
index e23c115..8c9b2b8 100644
--- a/themes/soppalusikka-blackberry.theme
+++ b/themes/soppalusikka-blackberry.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFF2200
clrMessageErrorBg = 88111100
clrVolumePromptFg = FF111100
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF111100
clrVolumeBarUpper = 88111100
clrVolumeBarLower = FF6D93DB
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFEEBB22
clrMenuText = FFEEBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
diff --git a/themes/soppalusikka-citron.theme b/themes/soppalusikka-citron.theme
index 516fa48..be78bdd 100644
--- a/themes/soppalusikka-citron.theme
+++ b/themes/soppalusikka-citron.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFFFFFF
clrMessageErrorBg = AFFC1010
clrVolumePromptFg = FF000000
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF000000
clrVolumeBarUpper = AF101000
clrVolumeBarLower = FF33CC33
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFCCBB22
clrMenuText = FFCCBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
diff --git a/themes/soppalusikka-default.theme b/themes/soppalusikka-default.theme
index c70fb80..98d7def 100644
--- a/themes/soppalusikka-default.theme
+++ b/themes/soppalusikka-default.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFFEE00
clrMessageErrorBg = C8000066
clrVolumePromptFg = FF000000
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF000000
clrVolumeBarUpper = C8000066
clrVolumeBarLower = FF33CC33
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFCCBB22
clrMenuText = FFCCBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
diff --git a/themes/soppalusikka-mint.theme b/themes/soppalusikka-mint.theme
index 079065e..32a51b7 100644
--- a/themes/soppalusikka-mint.theme
+++ b/themes/soppalusikka-mint.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFFEE00
clrMessageErrorBg = BB005555
clrVolumePromptFg = FF000000
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF000000
clrVolumeBarUpper = BB005555
clrVolumeBarLower = FF33CC33
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFCCBB22
clrMenuText = FFCCBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
diff --git a/themes/soppalusikka-orange.theme b/themes/soppalusikka-orange.theme
index d8cb33b..b8684aa 100644
--- a/themes/soppalusikka-orange.theme
+++ b/themes/soppalusikka-orange.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFFEE00
clrMessageErrorBg = 88111100
clrVolumePromptFg = FF000000
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF000000
clrVolumeBarUpper = 88111100
clrVolumeBarLower = FF33CC33
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFCCBB22
clrMenuText = FFCCBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
diff --git a/themes/soppalusikka-potato.theme b/themes/soppalusikka-potato.theme
new file mode 100644
index 0000000..de88cbf
--- /dev/null
+++ b/themes/soppalusikka-potato.theme
@@ -0,0 +1,67 @@
+Description = Potato
+Description.fin = Peruna
+clrBackground = 88222222
+clrButtonRedFg = ffca0000
+clrButtonRedBg = e8222222
+clrButtonGreenFg = ff1dcc1d
+clrButtonGreenBg = e8222222
+clrButtonYellowFg = ffca9a1b
+clrButtonYellowBg = e8222222
+clrButtonBlueFg = ff0080ff
+clrButtonBlueBg = e8222222
+clrMessageStatusFg = ff00fcfc
+clrMessageStatusBg = 88222222
+clrMessageInfoFg = ff24fc24
+clrMessageInfoBg = 88222222
+clrMessageWarningFg = fffcc024
+clrMessageWarningBg = 88222222
+clrMessageErrorFg = fffc1414
+clrMessageErrorBg = 88222222
+clrVolumePromptFg = ffd0d0d0
+clrVolumePromptBg = e8222222
+clrVolumePromptBorder = e8222222
+clrVolumeBarUpper = 88222222
+clrVolumeBarLower = ff7f7f7f
+clrVolumeBarMute = 88222222
+clrChannelNameFg = ffd0d0d0
+clrChannelNameBg = e8222222
+clrChannelNumberDateFg = ffffffff
+clrChannelNumberDateBg = e8222222
+clrChannelEpgTimeFg = ffd0d0d0
+clrChannelEpgTimeBg = e8222222
+clrChannelEpgTitle = ffffffff
+clrChannelEpgShortText = ffd0d0d0
+clrChannelEpgDuration = ffd0d0d0
+clrChannelTimeBarFg = ff7f7f7f
+clrChannelTimeBarBg = 88222222
+clrChannelSymbolActive = ffd0d0d0
+clrChannelSymbolInactive = ff7f7f7f
+clrChannelSymbolRecord = ff800000
+clrMenuTitleFg = ffffffff
+clrMenuTitleBg = e8222222
+clrMenuItemCurrentFg = ff1b1b1b
+clrMenuItemCurrentBg = ffc6c6c6
+clrMenuItemSelectable = fffcfcfc
+clrMenuEventTime = ffffffff
+clrMenuEventTitle = ffd0d0d0
+clrMenuEventShortText = ffd0d0d0
+clrMenuEventDescription = ffd0d0d0
+clrMenuEventSymbolFg = ffd0d0d0
+clrMenuEventSymbolBg = 88222222
+clrMenuScrollbarTotal = 88222222
+clrMenuScrollbarShown = ff7f7f7f
+clrMenuText = ffd0d0d0
+clrReplayTitleFg = ffd0d0d0
+clrReplayTitleBg = e8222222
+clrReplayTitleBorder = e8222222
+clrReplayCurrent = ffd0d0d0
+clrReplayTotal = ffd0d0d0
+clrReplayModeJump = ffd0d0d0
+clrReplaySymbolActive = ffd0d0d0
+clrReplaySymbolInactive = ff7f7f7f
+clrReplayProgressSeen = ff7f7f7f
+clrReplayProgressRest = 88222222
+clrReplayProgressSelected = ffd0d0d0
+clrReplayProgressMark = ff000000
+clrReplayProgressCurrent = ffd0d0d0
+
diff --git a/themes/soppalusikka-vanilla.theme b/themes/soppalusikka-vanilla.theme
index 7f25965..1a4bd70 100644
--- a/themes/soppalusikka-vanilla.theme
+++ b/themes/soppalusikka-vanilla.theme
@@ -19,6 +19,7 @@ clrMessageErrorFg = FFFCFCFC
clrMessageErrorBg = FFFC1414
clrVolumePromptFg = FF000000
clrVolumePromptBg = FFFFFFFF
+clrVolumePromptBorder = FF000000
clrVolumeBarUpper = FFFCFCFC
clrVolumeBarLower = FF24FC24
clrVolumeBarMute = FFFF0000
@@ -52,6 +53,7 @@ clrMenuScrollbarShown = FFCCBB22
clrMenuText = FFCCBB22
clrReplayTitleFg = FF000000
clrReplayTitleBg = FFFFFFFF
+clrReplayTitleBorder = FF000000
clrReplayCurrent = FFFFFFFF
clrReplayTotal = FFFFFFFF
clrReplayModeJump = FFFFFFFF
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-skinsoppalusikka.git
More information about the pkg-vdr-dvb-changes
mailing list