From db8cf38b5b39a611ca35bebb8d657167a4573b20 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 4 Mar 2013 14:11:47 +0100 Subject: [PATCH] Implemented the setup option "OSD/Always sort folders first" --- HISTORY | 3 +++ MANUAL | 5 +++++ config.c | 5 ++++- config.h | 7 ++++--- menu.c | 5 ++++- po/ar.po | 5 ++++- po/ca_ES.po | 5 ++++- po/cs_CZ.po | 5 ++++- po/da_DK.po | 5 ++++- po/de_DE.po | 5 ++++- po/el_GR.po | 5 ++++- po/es_ES.po | 5 ++++- po/et_EE.po | 5 ++++- po/fi_FI.po | 5 ++++- po/fr_FR.po | 5 ++++- po/hr_HR.po | 5 ++++- po/hu_HU.po | 5 ++++- po/it_IT.po | 5 ++++- po/lt_LT.po | 5 ++++- po/mk_MK.po | 5 ++++- po/nl_NL.po | 5 ++++- po/nn_NO.po | 5 ++++- po/pl_PL.po | 5 ++++- po/pt_PT.po | 5 ++++- po/ro_RO.po | 5 ++++- po/ru_RU.po | 5 ++++- po/sk_SK.po | 5 ++++- po/sl_SI.po | 5 ++++- po/sr_SR.po | 5 ++++- po/sv_SE.po | 5 ++++- po/tr_TR.po | 5 ++++- po/uk_UA.po | 5 ++++- po/zh_CN.po | 5 ++++- recording.c | 19 +++++++++++++++++-- recording.h | 4 +++- 35 files changed, 152 insertions(+), 36 deletions(-) diff --git a/HISTORY b/HISTORY index 4c248b56..78608763 100644 --- a/HISTORY +++ b/HISTORY @@ -7701,3 +7701,6 @@ Video Disk Recorder Revision History - Added the system's character set to the page header in the epg2html script (pointed out by Dimitar Petrovski). - Updated the Slovenian OSD texts (thanks to Matjaz Thaler). +- The new option "Setup/OSD/Always sort folders first" can be used to control whether + folders will be always at the top of the Recordings menu, or will be interspersed + with plain recordings when sorted alphabetically. diff --git a/MANUAL b/MANUAL index 25261e3f..e1f79f85 100644 --- a/MANUAL +++ b/MANUAL @@ -601,6 +601,11 @@ Version 1.6 Controls whether the full folder path is shown in the "Timers" menu, or just the basic recording name. + Always sort folders first = yes + In the "Recordings" menu folders are always listed before + plain recordings. Set this option to "no" if you want folders + to be interspersed with recordings when sorted alphabetically. + Number keys for characters = yes Controls whether the number keys can be used to enter characters in a text input field. You may want to set this diff --git a/config.c b/config.c index 2c87985a..47d5ecd2 100644 --- a/config.c +++ b/config.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.35 2013/02/14 15:14:37 kls Exp $ + * $Id: config.c 2.36 2013/03/04 13:30:12 kls Exp $ */ #include "config.h" @@ -420,6 +420,7 @@ cSetup::cSetup(void) VpsMargin = 120; RecordingDirs = 1; FoldersInTimerMenu = 1; + AlwaysSortFoldersFirst = 1; NumberKeysForChars = 1; ColorKey0 = 0; ColorKey1 = 1; @@ -624,6 +625,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "VpsMargin")) VpsMargin = atoi(Value); else if (!strcasecmp(Name, "RecordingDirs")) RecordingDirs = atoi(Value); else if (!strcasecmp(Name, "FoldersInTimerMenu")) FoldersInTimerMenu = atoi(Value); + else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value); else if (!strcasecmp(Name, "NumberKeysForChars")) NumberKeysForChars = atoi(Value); else if (!strcasecmp(Name, "ColorKey0")) ColorKey0 = atoi(Value); else if (!strcasecmp(Name, "ColorKey1")) ColorKey1 = atoi(Value); @@ -732,6 +734,7 @@ bool cSetup::Save(void) Store("VpsMargin", VpsMargin); Store("RecordingDirs", RecordingDirs); Store("FoldersInTimerMenu", FoldersInTimerMenu); + Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst); Store("NumberKeysForChars", NumberKeysForChars); Store("ColorKey0", ColorKey0); Store("ColorKey1", ColorKey1); diff --git a/config.h b/config.h index 943b2b08..9d88d6c2 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.70 2013/03/03 15:38:17 kls Exp $ + * $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $ */ #ifndef __CONFIG_H @@ -27,8 +27,8 @@ // The plugin API's version number: -#define APIVERSION "1.7.39" -#define APIVERSNUM 10739 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.40" +#define APIVERSNUM 10740 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to @@ -293,6 +293,7 @@ public: int VpsMargin; int RecordingDirs; int FoldersInTimerMenu; + int AlwaysSortFoldersFirst; int NumberKeysForChars; int ColorKey0, ColorKey1, ColorKey2, ColorKey3; int VideoDisplayFormat; diff --git a/menu.c b/menu.c index 4db68ec7..77326972 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 2.80 2013/02/19 09:33:26 kls Exp $ + * $Id: menu.c 2.81 2013/03/04 14:11:47 kls Exp $ */ #include "menu.h" @@ -2608,6 +2608,7 @@ void cMenuSetupOSD::Set(void) Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"), &data.MenuKeyCloses)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"), &data.RecordingDirs)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"), &data.FoldersInTimerMenu)); + Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars)); Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"), &data.ColorKey0, 4, keyColorTexts)); Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"), &data.ColorKey1, 4, keyColorTexts)); @@ -2649,6 +2650,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key) ModifiedAppearance = true; if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP)) ModifiedAppearance = true; + if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst) + Recordings.ClearSortNames(); } int oldSkinIndex = skinIndex; diff --git a/po/ar.po b/po/ar.po index 41657931..63ffb004 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" "Last-Translator: Osama Alrawab \n" "Language-Team: Arabic \n" @@ -850,6 +850,9 @@ msgstr "مجلد التسجيلات" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/ca_ES.po b/po/ca_ES.po index 138536df..7a9c5920 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Catalan \n" @@ -849,6 +849,9 @@ msgstr "Gravacions en subcarpetes" msgid "Setup.OSD$Folders in timer menu" msgstr "Carpetes en men temporitzadors" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Tecles numriques per a carcters " diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 475f0389..443120b2 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Aleš Juřík \n" "Language-Team: Czech \n" @@ -849,6 +849,9 @@ msgstr "Seznam nahrávek" msgid "Setup.OSD$Folders in timer menu" msgstr "Složky v menu časovače" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Psát písmena pomocí číselných kláves" diff --git a/po/da_DK.po b/po/da_DK.po index 511e03f6..583ce0da 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: Danish \n" @@ -846,6 +846,9 @@ msgstr "Optagelser i foldere" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 77af04a7..cb2b25a7 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" @@ -846,6 +846,9 @@ msgstr "Aufnahmeverzeichnisse" msgid "Setup.OSD$Folders in timer menu" msgstr "Verzeichnisse im Timer-Men" +msgid "Setup.OSD$Always sort folders first" +msgstr "Verzeichnisse immer zuerst einsortieren" + msgid "Setup.OSD$Number keys for characters" msgstr "Nummerntasten fr Zeichen" diff --git a/po/el_GR.po b/po/el_GR.po index d0c1c7df..62039e06 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: Greek \n" @@ -846,6 +846,9 @@ msgstr " msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 286cfc28..27d9e999 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Spanish \n" @@ -847,6 +847,9 @@ msgstr "Mostrar carpetas de grabaciones" msgid "Setup.OSD$Folders in timer menu" msgstr "Carpetas en men timers" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Teclas numricas para caracteres" diff --git a/po/et_EE.po b/po/et_EE.po index ffb3c91b..c06a2bd7 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian \n" @@ -846,6 +846,9 @@ msgstr "Kausta nime salvestamine" msgid "Setup.OSD$Folders in timer menu" msgstr "Kaustad taimeri menüüs" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Teksti sisestamine numbriklahvidega" diff --git a/po/fi_FI.po b/po/fi_FI.po index dbf3e80e..9dbb47e0 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" @@ -849,6 +849,9 @@ msgstr "Näytä tallennehakemistot" msgid "Setup.OSD$Folders in timer menu" msgstr "Näytä kansiot ajastinvalikossa" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Käytä numeronäppäimiä tekstisyötteessä" diff --git a/po/fr_FR.po b/po/fr_FR.po index e12b5984..3c8ffa5e 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-24 12:56+0100\n" "Last-Translator: Bernard Jaulin \n" "Language-Team: French \n" @@ -855,6 +855,9 @@ msgstr "Dossiers d'enregistrements" msgid "Setup.OSD$Folders in timer menu" msgstr "Dossiers dans menu programmation" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Touches numériques pour caractères" diff --git a/po/hr_HR.po b/po/hr_HR.po index af63cc12..61e43384 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval \n" "Language-Team: Croatian \n" @@ -848,6 +848,9 @@ msgstr "Imenik za snimke" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 260668a6..6c8867b4 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-03-01 19:22+0200\n" "Last-Translator: István Füley \n" "Language-Team: Hungarian \n" @@ -850,6 +850,9 @@ msgstr "Felvételek listája" msgid "Setup.OSD$Folders in timer menu" msgstr "Könyvtárválasztás az időzítő menüben" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Számgombok a betűkön" diff --git a/po/it_IT.po b/po/it_IT.po index e6c848b7..6959e2ca 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-11 23:46+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -853,6 +853,9 @@ msgstr "Directory di registrazione" msgid "Setup.OSD$Folders in timer menu" msgstr "Cartelle nel menu timer" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Tasti numerici per i caratteri" diff --git a/po/lt_LT.po b/po/lt_LT.po index e9f24ca4..f895851c 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" @@ -846,6 +846,9 @@ msgstr "Įrašų katalogai" msgid "Setup.OSD$Folders in timer menu" msgstr "Katalogai esantys laikmačių meniu" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Skaičių mygtukai simboliams" diff --git a/po/mk_MK.po b/po/mk_MK.po index aed2f83c..b7ec8d88 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-1.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2012-11-19 15:18+0100\n" "Last-Translator: Dimitar Petrovski \n" "Language-Team: Macedonian \n" @@ -847,6 +847,9 @@ msgstr "Директориум за снимки" msgid "Setup.OSD$Folders in timer menu" msgstr "Директориуми во менито за тајмер" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Нумерички копчиња за букви" diff --git a/po/nl_NL.po b/po/nl_NL.po index c95b22aa..fef508a6 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.38\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Carel Willemse \n" "Language-Team: Dutch \n" @@ -850,6 +850,9 @@ msgstr "Opname mappen" msgid "Setup.OSD$Folders in timer menu" msgstr "Mappen in timermenu" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Nummertoetsen voor karakters" diff --git a/po/nn_NO.po b/po/nn_NO.po index 664018bb..57793b3f 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: Norwegian Nynorsk \n" @@ -847,6 +847,9 @@ msgstr "Kataloger til opptak" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 351e59f7..4f9bdd30 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Marek Nazarko \n" "Language-Team: Polish \n" @@ -848,6 +848,9 @@ msgstr "Katalogi nagra msgid "Setup.OSD$Folders in timer menu" msgstr "Katalogi w menu timera" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Klawisze numeryczne dla liter" diff --git a/po/pt_PT.po b/po/pt_PT.po index 9dec2876..e035ff63 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" "Last-Translator: Cris Silva \n" "Language-Team: Portuguese \n" @@ -847,6 +847,9 @@ msgstr "Pasta de grava msgid "Setup.OSD$Folders in timer menu" msgstr "Pastas no menu de gravaes" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Teclas numricas para caracteres" diff --git a/po/ro_RO.po b/po/ro_RO.po index 4c257ad8..12bbdfe2 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-09 23:01+0100\n" "Last-Translator: Lucian Muresan \n" "Language-Team: Romanian \n" @@ -848,6 +848,9 @@ msgstr "Directoare înregistrări" msgid "Setup.OSD$Folders in timer menu" msgstr "Directoare în meniul de timer-e" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Caractere pe tastele numerice" diff --git a/po/ru_RU.po b/po/ru_RU.po index 3f4f9849..d85aa89e 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-03-03 13:43+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian \n" @@ -847,6 +847,9 @@ msgstr " msgid "Setup.OSD$Folders in timer menu" msgstr " " +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr " " diff --git a/po/sk_SK.po b/po/sk_SK.po index 6aea45c2..ae0b51d3 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-01-29 22:39+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" @@ -846,6 +846,9 @@ msgstr "Zoznam nahr msgid "Setup.OSD$Folders in timer menu" msgstr "Zloky v menu plnovaa" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Psa znaky selnmi tlaidlami" diff --git a/po/sl_SI.po b/po/sl_SI.po index 242e8430..2e476057 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: Slovenian \n" @@ -847,6 +847,9 @@ msgstr "Direktoriji za posnetke" msgid "Setup.OSD$Folders in timer menu" msgstr "Direktoriji v meniju urnika" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "tevilo tipk za znake" diff --git a/po/sr_SR.po b/po/sr_SR.po index 1d503cda..47a5a2af 100644 --- a/po/sr_SR.po +++ b/po/sr_SR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n" "Last-Translator: Milan Cvijanovi \n" "Language-Team: Serbian \n" @@ -846,6 +846,9 @@ msgstr "Direktorij za snimke" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index de03d3d6..1d880dc9 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-18 17:04+0100\n" "Last-Translator: Richard Lithvall \n" "Language-Team: Swedish \n" @@ -850,6 +850,9 @@ msgstr "Visa mappar i inspelningsmenyn" msgid "Setup.OSD$Folders in timer menu" msgstr "Visa mappar i timermenyn" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Anvnd sifferknappar fr bokstavsinmatning" diff --git a/po/tr_TR.po b/po/tr_TR.po index 30e3fbd2..1a418ebb 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeen \n" "Language-Team: Turkish \n" @@ -846,6 +846,9 @@ msgstr "Kay msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index 82b8d2a8..0d250415 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.7.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2013-02-09 16:00+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -847,6 +847,9 @@ msgstr "Теки зберігання записів" msgid "Setup.OSD$Folders in timer menu" msgstr "Теки в меню таймера" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Кількість клавіш для символів" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3f4a6c6d..464deee6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 16:46+0100\n" +"POT-Creation-Date: 2013-03-04 14:46+0100\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n" "Last-Translator: Nan Feng \n" "Language-Team: Chinese (simplified) \n" @@ -849,6 +849,9 @@ msgstr "录像目录" msgid "Setup.OSD$Folders in timer menu" msgstr "" +msgid "Setup.OSD$Always sort folders first" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/recording.c b/recording.c index ede7c1b9..032175dd 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.89 2013/03/03 10:54:05 kls Exp $ + * $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $ */ #include "recording.h" @@ -943,7 +943,9 @@ char *cRecording::SortName(void) const { char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime; if (!*sb) { - char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)), RecordingsSortMode != rsmName); + char *s = strdup(FileName() + strlen(VideoDirectory)); + if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst) + s = StripEpisodeName(s, RecordingsSortMode != rsmName); strreplace(s, '/', '0'); // some locales ignore '/' when sorting int l = strxfrm(NULL, s, 0) + 1; *sb = MALLOC(char, l); @@ -953,6 +955,12 @@ char *cRecording::SortName(void) const return *sb; } +void cRecording::ClearSortName(void) +{ + DELETENULL(sortBufferName); + DELETENULL(sortBufferTime); +} + int cRecording::GetResume(void) const { if (resume == RESUME_NOT_INITIALIZED) { @@ -1422,6 +1430,13 @@ void cRecordings::ResetResume(const char *ResumeFileName) ChangeState(); } +void cRecordings::ClearSortNames(void) +{ + LOCK_THREAD; + for (cRecording *recording = First(); recording; recording = Next(recording)) + recording->ClearSortName(); +} + // --- cMark ----------------------------------------------------------------- double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND; diff --git a/recording.h b/recording.h index 4807fc9d..ff3119da 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 2.45 2013/03/03 10:48:39 kls Exp $ + * $Id: recording.h 2.46 2013/03/04 14:01:23 kls Exp $ */ #ifndef __RECORDING_H @@ -99,6 +99,7 @@ private: cRecording &operator=(const cRecording &); // can't assign cRecording static char *StripEpisodeName(char *s, bool Strip); char *SortName(void) const; + void ClearSortName(void); int GetResume(void) const; time_t start; int priority; @@ -187,6 +188,7 @@ public: void ChangeState(void) { state++; } bool StateChanged(int &State); void ResetResume(const char *ResumeFileName = NULL); + void ClearSortNames(void); cRecording *GetByName(const char *FileName); void AddByName(const char *FileName, bool TriggerUpdate = true); void DelByName(const char *FileName);