When selecting a folder for a recording or timer, it is now possible to open a folder even if it doesn't contain any subfolders

31 files changed, 23 insertions, 104 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 07cd85be..285cc44e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3294,6 +3294,8 @@ Matthias Senzel <matthias.senzel@t-online.de>
  for reporting problem with locking the Recordings list in the cutting process
  for suggesting to change the log message ""ERROR: copying directory '%s' to '%s' ended
  prematurely" from "error" to "info"
+ for suggesting to allow opening a folder when selecting a folder for a recording or
+ timer, even if it doesn't contain any subfolders
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index acd78ba8..bb5fd692 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
   a subdirectory.
 - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
 
-2017-12-14: Version 2.3.9
+2017-12-15: Version 2.3.9
 
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@@ -9239,3 +9239,5 @@ Video Disk Recorder Revision History
 - Changed the log message ""ERROR: copying directory '%s' to '%s' ended prematurely" from
   "error" to "info", because any actual error would have already been reported before this
   (suggested by Matthias Senzel).
+- When selecting a folder for a recording or timer, it is now possible to open a folder
+  even if it doesn't contain any subfolders (suggested by Matthias Senzel).
diff --git a/menu.c b/menu.c
index df2ae220..300732d3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.52 2017/12/14 10:32:41 kls Exp $
+ * $Id: menu.c 4.53 2017/12/15 13:27:20 kls Exp $
  */
 
 #include "menu.h"
@@ -656,6 +656,7 @@ class cMenuFolderItem : public cOsdItem {
 private:
   cNestedItem *folder;
 public:
+  virtual void Set(void);
   cMenuFolderItem(cNestedItem *Folder);
   cNestedItem *Folder(void) { return folder; }
   };
@@ -664,8 +665,15 @@ cMenuFolderItem::cMenuFolderItem(cNestedItem *Folder)
 :cOsdItem(Folder->Text())
 {
   folder = Folder;
-  if (folder->SubItems())
+  Set();
+}
+
+void cMenuFolderItem::Set(void)
+{
+  if (folder->SubItems() && folder->SubItems()->Count())
      SetText(cString::sprintf("%s...", folder->Text()));
+  else
+     SetText(folder->Text());
 }
 
 // --- cMenuEditFolder -------------------------------------------------------
@@ -675,7 +683,6 @@ private:
   cList<cNestedItem> *list;
   cNestedItem *folder;
   char name[PATH_MAX];
-  int subFolder;
   eOSState Confirm(void);
 public:
   cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNestedItem *Folder = NULL);
@@ -689,13 +696,10 @@ cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNes
   SetMenuCategory(mcFolder);
   list = List;
   folder = Folder;
-  if (folder) {
+  if (folder)
      strn0cpy(name, folder->Text(), sizeof(name));
-     subFolder = folder->SubItems() != NULL;
-     }
   else {
      *name = 0;
-     subFolder = 0;
      cRemote::Put(kRight, true); // go right into string editing mode
      }
   if (!isempty(Dir)) {
@@ -704,7 +708,6 @@ cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNes
      Add(DirItem);
      }
   Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name)));
-  Add(new cMenuEditBoolItem(tr("Sub folder"), &subFolder));
 }
 
 cString cMenuEditFolder::GetFolder(void)
@@ -728,12 +731,10 @@ eOSState cMenuEditFolder::Confirm(void)
         return osContinue;
         }
      }
-  if (folder) {
+  if (folder)
      folder->SetText(name);
-     folder->SetSubItems(subFolder);
-     }
   else
-     list->Add(folder = new cNestedItem(name, subFolder));
+     list->Add(folder = new cNestedItem(name));
   return osEnd;
 }
 
@@ -791,12 +792,8 @@ void cMenuFolder::SetHelpKeys(void)
   if (HasSubMenu())
      return;
   int NewHelpKeys = 0;
-  if (firstFolder) {
-     if (cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current())) {
-        if (Folder->Folder()->SubItems())
-           NewHelpKeys = 1;
-        }
-     }
+  if (firstFolder)
+     NewHelpKeys = 1;
   if (NewHelpKeys != helpKeys) {
      helpKeys = NewHelpKeys;
      SetHelp(NewHelpKeys > 0 ? tr("Button$Open") : NULL, tr("Button$New"), firstFolder ? tr("Button$Delete") : NULL, firstFolder ? tr("Button$Edit") : NULL);
@@ -885,8 +882,10 @@ eOSState cMenuFolder::Select(bool Open)
   if (firstFolder) {
      cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
      if (Folder) {
-        if (Open && Folder->Folder()->SubItems())
+        if (Open) {
+           Folder->Folder()->SetSubItems(true);
            return AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text()));
+           }
         else
            return osEnd;
         }
diff --git a/po/ar.po b/po/ar.po
index 17957970..beef5246 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -615,9 +615,6 @@ msgstr "تحرير مجلد"
 msgid "New folder"
 msgstr "مجلد جديد"
 
-msgid "Sub folder"
-msgstr "مجلد فرعى"
-
 msgid "Folder name already exists!"
 msgstr "المجلد موجود بالفعل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3c0cae24..fec5b392 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -614,9 +614,6 @@ msgstr "Modificar carpeta"
 msgid "New folder"
 msgstr "Nova carpeta"
 
-msgid "Sub folder"
-msgstr "Sub carpeta"
-
 msgid "Folder name already exists!"
 msgstr "La carpeta ja existeix!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2d52fdff..1aab44e4 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -614,9 +614,6 @@ msgstr "Změna složky"
 msgid "New folder"
 msgstr "Nová složka"
 
-msgid "Sub folder"
-msgstr "Podsložka"
-
 msgid "Folder name already exists!"
 msgstr "Složka již existuje!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index ef745aaf..73a62931 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 90b0807e..11ff3144 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -612,9 +612,6 @@ msgstr "Verzeichnis editieren"
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-msgid "Sub folder"
-msgstr "Unterverzeichnis"
-
 msgid "Folder name already exists!"
 msgstr "Verzeichnisname existiert bereits!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 18497b2c..38cbb441 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index e2785fce..5097c404 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -612,9 +612,6 @@ msgstr "Modificar carpeta"
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-msgid "Sub folder"
-msgstr "Sub carpeta"
-
 msgid "Folder name already exists!"
 msgstr "�La carpeta ya existe!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 4cde1b70..73740cec 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -611,9 +611,6 @@ msgstr "Muuda kausta"
 msgid "New folder"
 msgstr "Uus kaust"
 
-msgid "Sub folder"
-msgstr "Uus alamkaust"
-
 msgid "Folder name already exists!"
 msgstr "Sellenimeline kaust juba olemas!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5b1bbb1c..82580164 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -615,9 +615,6 @@ msgstr "Muokkaa kansiota"
 msgid "New folder"
 msgstr "Uusi kansio"
 
-msgid "Sub folder"
-msgstr "Alikansio"
-
 msgid "Folder name already exists!"
 msgstr "Kansio on jo olemassa!"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 71cf4e86..ba140360 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -622,9 +622,6 @@ msgstr "Modifier le dossier"
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-msgid "Sub folder"
-msgstr "Sous-dossier"
-
 msgid "Folder name already exists!"
 msgstr "Ce nom de dossier existe déjà !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index c011d2ab..59d49e54 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -613,9 +613,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c6cfd989..dac0a7c4 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -616,9 +616,6 @@ msgstr "Könyvtár szerkesztése"
 msgid "New folder"
 msgstr "Új könyvtár"
 
-msgid "Sub folder"
-msgstr "Alkönyvtár"
-
 msgid "Folder name already exists!"
 msgstr "Ez a könyvtárnév már létezik!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 0a910b4d..70345ded 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -617,9 +617,6 @@ msgstr "Modifica cartella"
 msgid "New folder"
 msgstr "Nuova cartella"
 
-msgid "Sub folder"
-msgstr "Sotto cartella"
-
 msgid "Folder name already exists!"
 msgstr "Nome cartella già esistente!"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index c05eee7d..90d1e818 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -611,9 +611,6 @@ msgstr "Koreguoti katalogą"
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-msgid "Sub folder"
-msgstr "Pakatalogis"
-
 msgid "Folder name already exists!"
 msgstr "Toks katalogo vardas jau egzistuoja!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 7a25c272..5a1b4527 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -612,9 +612,6 @@ msgstr "Уреди директориум"
 msgid "New folder"
 msgstr "Нов директориум"
 
-msgid "Sub folder"
-msgstr "Поддиректориум"
-
 msgid "Folder name already exists!"
 msgstr "Името веќе постои"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 394615a9..b536a747 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -617,9 +617,6 @@ msgstr "Bewerk map"
 msgid "New folder"
 msgstr "Nieuwe map"
 
-msgid "Sub folder"
-msgstr "Submap"
-
 msgid "Folder name already exists!"
 msgstr "Map bestaat al"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 593c0646..fcb373c8 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -612,9 +612,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 70345c24..421d3908 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -614,9 +614,6 @@ msgstr "Edutuj katalog"
 msgid "New folder"
 msgstr "Nowy katalog"
 
-msgid "Sub folder"
-msgstr "Podkatalog"
-
 msgid "Folder name already exists!"
 msgstr "Taka nazwa katalogu juz istnieje"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index be9e255e..e2c83414 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -612,9 +612,6 @@ msgstr "Editar pasta"
 msgid "New folder"
 msgstr "Nova pasta"
 
-msgid "Sub folder"
-msgstr "Subpasta"
-
 msgid "Folder name already exists!"
 msgstr "Nome da pasta j� existe!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index b29c850b..95f0a913 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -613,9 +613,6 @@ msgstr "Editează directorul"
 msgid "New folder"
 msgstr "Director nou"
 
-msgid "Sub folder"
-msgstr "Sub-director"
-
 msgid "Folder name already exists!"
 msgstr "Un director cu acelaşi nume există!"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c42912a9..df0912f7 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -612,9 +612,6 @@ msgstr "Редакция директории"
 msgid "New folder"
 msgstr "Новая директория"
 
-msgid "Sub folder"
-msgstr "поддиректория"
-
 msgid "Folder name already exists!"
 msgstr "Директория уже существует!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index f61c3aae..b7e22700 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -612,9 +612,6 @@ msgstr "Upravi� zlo�ku"
 msgid "New folder"
 msgstr "Nov� zlo�ka"
 
-msgid "Sub folder"
-msgstr "Pod zlo�ka"
-
 msgid "Folder name already exists!"
 msgstr "N�zov zlo�ky u� existuje!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 8a2bfe06..c94bd7cb 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -612,9 +612,6 @@ msgstr "Uredi direktorij"
 msgid "New folder"
 msgstr "Nov direktorij"
 
-msgid "Sub folder"
-msgstr "Pod direktorij"
-
 msgid "Folder name already exists!"
 msgstr "Ime direktorija �e obstaja"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index e77b3bfa..00694328 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -612,9 +612,6 @@ msgstr "Izmeni direktorijum"
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-msgid "Sub folder"
-msgstr "Poddirektorijum"
-
 msgid "Folder name already exists!"
 msgstr "Naziv direktorijuma ve� postoji!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index bd9743bb..1e75cc2a 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -616,9 +616,6 @@ msgstr "Redigera mapp"
 msgid "New folder"
 msgstr "Ny mapp"
 
-msgid "Sub folder"
-msgstr "Undermapp"
-
 msgid "Folder name already exists!"
 msgstr "Mappnamnet finns redan!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 93115adb..dd54e1cb 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 509630af..2fb6f0e9 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -612,9 +612,6 @@ msgstr "Редагувати теку"
 msgid "New folder"
 msgstr "Нова тека"
 
-msgid "Sub folder"
-msgstr "Підтека"
-
 msgid "Folder name already exists!"
 msgstr "Назва теки вже існує!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca917716..d29390c1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -613,9 +613,6 @@ msgstr "编辑文件夹"
 msgid "New folder"
 msgstr "新文件夹"
 
-msgid "Sub folder"
-msgstr "子文件夹"
-
 msgid "Folder name already exists!"
 msgstr "文件夹名称已经存在！"