Release 0.2.00.2.0

8 files changed, 35 insertions, 34 deletions

diff --git a/HISTORY b/HISTORY
index 6762edd..4c7c7c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,19 @@
 VDR Plugin 'dvdswitch' Revision History
 ---------------------------------------
 
+2011-03-05: Version 0.2.0
+- Read name of volume to prefill OSD-Entry with filename
+  Fill OSD-field with capitalize volume name
+- Improve menu to read images
+- Rename image was'nt possible
+- used posix functions to parse commandline, create symbolic links, parse mountpoint
+- Improve handle of error messages
+- Update translations
+  Add italian translation (Support #490)
+- refactoring MenuSetup 
+  Allow localized character at title of image menu
+- remove some unused code, typecast ...
+
 2010-12-22: Version 0.1.6
 - Add french translation from http://www.vdr-portal.de/board/thread.php?postid=488211#post488211
 - Fix some GCC warnings (asprintf, realpath)
diff --git a/dvdplugin.c b/dvdplugin.c
index 498a068..b3044f1 100644
--- a/dvdplugin.c
+++ b/dvdplugin.c
@@ -100,13 +100,14 @@ void cDVDPlugin::DetectDevice(void)
 
         cTokenizer *token = new cTokenizer(output, " ");
         for(int i = 0; i <= token->Count(); i++) {
-            if(RegIMatch(token->GetToken(i), "^-C$") &&
-               token->GetToken(i + 1)) {
+            const char* t = token->GetToken(i);
+            if(t && 0 == strcmp(t, "-C")
+                 && token->GetToken(i + 1)) {
               dvd = strdup(token->GetToken(i + 1));
               break;
             }
-            if(RegIMatch(token->GetToken(i), "^--dvd=")) {
-              const char *p = strchr(token->GetToken(i), '=');
+            else if(t && 0 == strncmp(t, "--dvd=", 6)) {
+              const char *p = strchr(t, '=');
               dvd = strdup(p + 1);
               break;
             }
diff --git a/dvdswitch.c b/dvdswitch.c
index e083576..ca8321b 100644
--- a/dvdswitch.c
+++ b/dvdswitch.c
@@ -18,7 +18,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "0.1.7";
+static const char *VERSION        = "0.2.0";
 
 class cPluginDvdswitch : public cPlugin {
 private:
@@ -148,7 +148,7 @@ cString cPluginDvdswitch::SVDRPCommand(const char *Command, const char *Option,
 
 bool cPluginDvdswitch::CheckError(void)
 {
-  dsyslog("dvdswitch: Check ImageDir");
+  dsyslog("dvdswitch: Check Image Directory");
   if(!DirectoryOk(DVDSwitchSetup.ImageDir))
   {
     esyslog("dvdswitch: Image Directory '%s' not readable", DVDSwitchSetup.ImageDir);
diff --git a/po/de_DE.po b/po/de_DE.po
index f9f3115..5b0ff61 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvdswitch-plugin 0.1.7\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-01-19 19:02+0100\n"
+"POT-Creation-Date: 2011-02-13 16:14+0100\n"
 "PO-Revision-Date: 2009-10-03 14:03+0200\n"
 "Last-Translator:\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -191,9 +191,6 @@ msgstr "\tVerstecke Hauptmenüeintrag"
 msgid "\t  Name"
 msgstr "\t  Name"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~"
-msgstr " abcdefghijklmnopqrstuvwxyzäöüß0123456789-.#~"
-
 msgid "\tImage Dir."
 msgstr "\tImage Verz."
 
@@ -269,8 +266,8 @@ msgstr "\t  Anzahl vorm Kat.Namen"
 msgid "\tSpaces before/after Cat.Name"
 msgstr "\tLeerzeichen vor/nach Kat.Name"
 
-msgid "\tCutText for Subcat"
-msgstr "\tTrenntext für Subkat."
+msgid "\tSeparator for Subcat"
+msgstr "\tTrennzeichen für Subkat."
 
 msgid "Navigation"
 msgstr "Navigation"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 167c664..49d1298 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvdswitch-plugin 0.1.7\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-01-19 19:02+0100\n"
+"POT-Creation-Date: 2011-02-13 16:14+0100\n"
 "PO-Revision-Date: 2010-12-21 12:59+0100\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -196,9 +196,6 @@ msgstr "\tCache le menu"
 msgid "\t  Name"
 msgstr "\t  Nom"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~"
-msgstr " aàbcçdeéèfghijklmnopqrstuvwxyz0123456789-.#~"
-
 msgid "\tImage Dir."
 msgstr "\tDossier image"
 
@@ -274,7 +271,7 @@ msgstr "\t  Nombre devant cat.nom"
 msgid "\tSpaces before/after Cat.Name"
 msgstr "\tSigne vide avant/après nom.cat."
 
-msgid "\tCutText for Subcat"
+msgid "\tSeparator for Subcat"
 msgstr "\tTexte de séparation des sous-cat."
 
 msgid "Navigation"
@@ -396,3 +393,4 @@ msgstr ""
 
 msgid "No rights to move image"
 msgstr "pas d'autorisation de création"
+
diff --git a/po/it_IT.po b/po/it_IT.po
index 78951c8..dec48c3 100755..100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvdswitch-plugin 0.1.7\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-01-19 19:02+0100\n"
+"POT-Creation-Date: 2011-02-13 16:14+0100\n"
 "PO-Revision-Date: 2010-12-30 17:54+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -194,9 +194,6 @@ msgstr "\tNascondi voce menu princ."
 msgid "\t  Name"
 msgstr "\t  Nome"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~"
-msgstr " aáàbcdeéèfghiìîjklmnoòpqrstuùvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&°"
-
 msgid "\tImage Dir."
 msgstr "\tDir. Immagine"
 
@@ -272,7 +269,7 @@ msgstr "\t  Conta prima Nome Cat."
 msgid "\tSpaces before/after Cat.Name"
 msgstr "\tSpazi prima/dopo Nome Cat."
 
-msgid "\tCutText for Subcat"
+msgid "\tSeparator for Subcat"
 msgstr "\tTaglia testo per sottocategoria"
 
 msgid "Navigation"
diff --git a/setup-itypes.c b/setup-itypes.c
index 7b8057e..6a581fb 100644
--- a/setup-itypes.c
+++ b/setup-itypes.c
@@ -169,17 +169,14 @@ void cMenuSetupDSITypesItem::Set(void)
 
   Add(new cMenuEditStrItem(tr("Description"),
       LongName,
-      memberof(LongName),
-      tr(" abcdefghijklmnopqrstuvwxyz0123456789-.#~")));
+      memberof(LongName)));
   Add(new cMenuEditStrItem(tr("Type title"),
       ShortName,
-      memberof(ShortName),
-      tr(" abcdefghijklmnopqrstuvwxyz0123456789-.#~")));
+      memberof(ShortName)));
   Add(new cMenuEditStraItem(tr("Image type"), &FileType, memberof(FileTypes), FileTypes));
   Add(new cMenuEditStrItem(!FileType ? tr("Directory contains") : tr("File extension"),
       Extension,
-      memberof(Extension),
-      tr(" abcdefghijklmnopqrstuvwxyz0123456789-.#~")));
+      memberof(Extension)));
   if(FileType)
     Add(new cMenuEditBoolItem(tr("Hide extension"), &HideExtension));
 
diff --git a/setup.c b/setup.c
index 10fb8e1..57ab3b8 100644
--- a/setup.c
+++ b/setup.c
@@ -206,8 +206,7 @@ void cMenuSetupDVDSwitch::Set(void)
     if (!data.HideMenuEntry)
       Add(new cMenuEditStrItem(tr("\t  Name"),
           data.MenuName,
-          memberof(data.MenuName),
-          tr(" abcdefghijklmnopqrstuvwxyz0123456789-.#~")));
+          memberof(data.MenuName)));
     if(!data.ImageDirPerParam)
       Add(new cMenuEditStrItem(tr("\tImage Dir."),
           data.ImageDir,
@@ -261,8 +260,7 @@ void cMenuSetupDVDSwitch::Set(void)
     Add(new cMenuEditBoolItem(tr("\tvisible Image-Size Col"), &data.HideImgSizeCol));
     Add(new cMenuEditStrItem(tr("\tchange Character"),
         data.ChangeCharsOSDName,
-        20,
-        " abcdefghijklmnopqrstuvwxyz0123456789-_+*&.#~%$"));
+        memberof(data.ChangeCharsOSDName)));
     if(data.DisplayMode == 1)
     {
       //if(data.CategorieType == 0)
@@ -273,9 +271,9 @@ void cMenuSetupDVDSwitch::Set(void)
       Add(new cMenuEditIntItem(tr("\t  Count before Cat.Name"), &data.CharCountBeforeCat, 0, 30));
       Add(new cMenuEditBoolItem(tr("\tSpaces before/after Cat.Name"), &data.SpacesBeforeAfterCat));
       if(data.CategorieType == 1)
-        Add(new cMenuEditStrItem(tr("\tCutText for Subcat"),
+        Add(new cMenuEditStrItem(tr("\tSeparator for Subcat"),
             data.SubCatCutter,
-            6,
+            memberof(data.SubCatCutter),
             "-_.:#+*!%<>"));
     }
     Add(new cOsdItem("------------------------------------------------------------------------------------------"));