test if decor-files are installed in setup, use 10_rect_sml.decor as default

5 files changed, 12 insertions, 69 deletions

diff --git a/HISTORY b/HISTORY
index 559ac7f1..65a345fe 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,7 +4,10 @@ VDR Plugin 'skinflatplus' Revision History
 2014-XX-XX: Version 0.3.1
 - [fix] epg image position on channel info
 - [fix] Bug #1847 - SetRecording border with deleteresume.patch
+- [fix] test if decor-files are installed in setup
 - [update] tvsraper service api. ! Use only with new TVScraper Version 0.2.0 or greater !
+- [update] crypted.png
+- [update] use 10_rect_sml.decor as default
 
 2014-11-05: Version 0.3.0
 - [fix] use only current Event in extraevent display in displaychannel
diff --git a/decors/00_rect-alpha_mid.decor b/decors/00_rect-alpha_mid.decor
deleted file mode 100644
index dee9e046..00000000
--- a/decors/00_rect-alpha_mid.decor
+++ /dev/null
@@ -1,67 +0,0 @@
-Description = rect alpha mid
-# BORDER TYPES
-#   0 = none
-#   1 = rect
-#   2 = round
-#   3 = invert round
-#   4 = rect + alpha blend
-#   5 = round + alpha blend
-#   6 = invert round + alpha blend
-
-# PROGRESS TYPES
-#   0 = small line + big line
-#   1 = big line
-#   2 = big line + outline
-#   3 = small line + big line + dot
-#   4 = big line + dot
-#   5 = big line + outline + dot
-#   6 = small line + dot
-#   7 = outline + dot
-#   8 = small line + big line + alpha blend
-#   9 = big line + alpha blend
-
-# TopBar
-TopBarBorderType = 4
-TopBarBorderSize = 10
-
-# Buttons
-ButtonBorderType = 4
-ButtonBorderSize = 10
-
-# Messages
-MessageBorderType = 4
-MessageBorderSize = 10
-
-# Display Channel
-ChannelBorderType = 4
-ChannelBorderSize = 10
-ChannelProgressType = 0
-ChannelProgressSize = 10
-ChannelSignalProgressType = 2
-ChannelSignalProgressSize = 10
-
-# Display Menu
-MenuContentHeadBorderType = 4
-MenuContentHeadBorderSize = 10
-MenuContentBorderType = 4
-MenuContentBorderSize = 10
-MenuItemBorderType = 4
-MenuItemBorderSize = 10
-MenuItemProgressType = 2
-MenuItemProgressSize = 20
-
-# Display Replay
-ReplayBorderType = 4
-ReplayBorderSize = 10
-ReplayProgressType = 0
-ReplayProgressSize = 32
-
-# Display Tracks
-TrackItemBorderType = 4
-TrackItemBorderSize = 10
-
-# Display Volume
-VolumeBorderType = 4
-VolumeBorderSize = 10
-VolumeProgressType = 3
-VolumeProgressSize = 10
diff --git a/decors/70_MV_rect_sml.decor b/decors/70_MV_rect_sml.decor
index 942d0028..942d0028 100755..100644
--- a/decors/70_MV_rect_sml.decor
+++ b/decors/70_MV_rect_sml.decor
diff --git a/po/de_DE.po b/po/de_DE.po
index 49df1ac8..fcff4790 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-09 18:05+0200\n"
+"POT-Creation-Date: 2014-05-30 14:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -237,6 +237,9 @@ msgstr "TVScraper / scraper2vdr Einstellungen"
 msgid "TVScraper / scraper2vdr not installed"
 msgstr "TVScraper / scraper2vdr nicht installiert"
 
+msgid "no decorfiles found, check install"
+msgstr "keine Decordateien gefunden, prüfe Installation"
+
 msgid "Decorfile"
 msgstr "Decordatei"
 
diff --git a/setup.c b/setup.c
index 9cef8b91..bc1af413 100644
--- a/setup.c
+++ b/setup.c
@@ -245,7 +245,11 @@ void cFlatSetupGeneral::Setup(void) {
     if( SetupConfig->DecorIndex < 0 || SetupConfig->DecorIndex > DecorDescriptions.Size() )
         SetupConfig->DecorIndex = 0;
 
-    Add(new cMenuEditStraItem(tr("Decorfile"), &SetupConfig->DecorIndex, DecorDescriptions.Size(), &DecorDescriptions[0]));
+    if( DecorDescriptions.Size() == 0 ) {
+        esyslog("skinflatplus: no decor files found, please check your installation!");
+        Add(new cOsdItem(tr("no decorfiles found, check install"), osUnknown, false));
+    } else
+        Add(new cMenuEditStraItem(tr("Decorfile"), &SetupConfig->DecorIndex, DecorDescriptions.Size(), &DecorDescriptions[0]));
 
     Add(new cMenuEditBoolItem(tr("Show empty color-buttons"), &SetupConfig->ButtonsShowEmpty));
     Add(new cMenuEditBoolItem(tr("Show TopBar menu icons"), &SetupConfig->TopBarMenuIconShow));