diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2017-12-09 18:58:25 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-12-09 18:58:25 +0100 |
| commit | 1492f6dbc4c237b750687a6c6dd41a0284a09229 (patch) | |
| tree | 665c6591ce967651309fe3b589bd4e9e098f7202 | |
| parent | e757f10e440a160c9657b89b51388311d95ff123 (diff) | |
| download | vdr-1492f6dbc4c237b750687a6c6dd41a0284a09229.tar.gz vdr-1492f6dbc4c237b750687a6c6dd41a0284a09229.tar.bz2 | |
Implemented 'OSD/Sorting direction for recordings'
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | MANUAL | 7 | ||||
| -rw-r--r-- | config.c | 5 | ||||
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | menu.c | 8 | ||||
| -rw-r--r-- | po/ar.po | 11 | ||||
| -rw-r--r-- | po/ca_ES.po | 11 | ||||
| -rw-r--r-- | po/cs_CZ.po | 11 | ||||
| -rw-r--r-- | po/da_DK.po | 11 | ||||
| -rw-r--r-- | po/de_DE.po | 11 | ||||
| -rw-r--r-- | po/el_GR.po | 11 | ||||
| -rw-r--r-- | po/es_ES.po | 11 | ||||
| -rw-r--r-- | po/et_EE.po | 11 | ||||
| -rw-r--r-- | po/fi_FI.po | 11 | ||||
| -rw-r--r-- | po/fr_FR.po | 11 | ||||
| -rw-r--r-- | po/hr_HR.po | 11 | ||||
| -rw-r--r-- | po/hu_HU.po | 11 | ||||
| -rw-r--r-- | po/it_IT.po | 11 | ||||
| -rw-r--r-- | po/lt_LT.po | 11 | ||||
| -rw-r--r-- | po/mk_MK.po | 11 | ||||
| -rw-r--r-- | po/nl_NL.po | 11 | ||||
| -rw-r--r-- | po/nn_NO.po | 11 | ||||
| -rw-r--r-- | po/pl_PL.po | 11 | ||||
| -rw-r--r-- | po/pt_PT.po | 11 | ||||
| -rw-r--r-- | po/ro_RO.po | 11 | ||||
| -rw-r--r-- | po/ru_RU.po | 11 | ||||
| -rw-r--r-- | po/sk_SK.po | 11 | ||||
| -rw-r--r-- | po/sl_SI.po | 11 | ||||
| -rw-r--r-- | po/sr_RS.po | 11 | ||||
| -rw-r--r-- | po/sv_SE.po | 11 | ||||
| -rw-r--r-- | po/tr_TR.po | 11 | ||||
| -rw-r--r-- | po/uk_UA.po | 11 | ||||
| -rw-r--r-- | po/zh_CN.po | 11 | ||||
| -rw-r--r-- | recording.c | 13 | ||||
| -rw-r--r-- | recording.h | 3 |
36 files changed, 315 insertions, 39 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 640fd58b..531321d2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3288,6 +3288,7 @@ Matthias Senzel <matthias.senzel@t-online.de> different volumes for fixing a lengthy write lock on the Recordings list in case of moving a folder with more than one recording + for implementing the parameter "OSD/Sorting direction for recordings" Marek Nazarko <mnazarko@gmail.com> for translating OSD texts to the Polish language @@ -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-07: Version 2.3.9 +2017-12-09: Version 2.3.9 - Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). @@ -9223,3 +9223,7 @@ Video Disk Recorder Revision History more than one recording (thanks to Matthias Senzel). - If TS packets are not accepted by the output device in Transfer Mode, this is now reported only once per minute in the log file. +- The new setup option "OSD/Sorting direction for recordings" can be used to switch + the sequence in which recordings are presented in the "Recordings" menu between + ascending (oldest first) and descendeng (newest first) (thanks to Matthias Senzel). + @@ -665,6 +665,13 @@ Version 2.2 If a particular sort mode has been selected for a folder by pressing '0', the default no longer applies to that folder. + Sorting direction for recordings = ascending + When recordings are sorted "by time", they appear in ascending + order (i.e. "oldest" to "newest"). If this parameter is set to + "descending", they will be presented "newest" to "oldest. + Note that in the latter case, if "Always sort folders first" + is "yes", folders will appear in reverse alphabetical order. + 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 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 4.6 2017/05/21 10:25:26 kls Exp $ + * $Id: config.c 4.7 2017/12/09 14:17:02 kls Exp $ */ #include "config.h" @@ -432,6 +432,7 @@ cSetup::cSetup(void) FoldersInTimerMenu = 1; AlwaysSortFoldersFirst = 1; DefaultSortModeRec = rsmTime; + RecSortingDirection = rsdAscending; NumberKeysForChars = 1; ColorKey0 = 0; ColorKey1 = 1; @@ -658,6 +659,7 @@ bool cSetup::Parse(const char *Name, const char *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, "RecSortingDirection")) RecSortingDirection= atoi(Value); else if (!strcasecmp(Name, "DefaultSortModeRec")) DefaultSortModeRec = atoi(Value); else if (!strcasecmp(Name, "NumberKeysForChars")) NumberKeysForChars = atoi(Value); else if (!strcasecmp(Name, "ColorKey0")) ColorKey0 = atoi(Value); @@ -789,6 +791,7 @@ bool cSetup::Save(void) Store("RecordingDirs", RecordingDirs); Store("FoldersInTimerMenu", FoldersInTimerMenu); Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst); + Store("RecSortingDirection",RecSortingDirection); Store("DefaultSortModeRec", DefaultSortModeRec); Store("NumberKeysForChars", NumberKeysForChars); Store("ColorKey0", ColorKey0); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 4.13 2017/07/24 08:56:53 kls Exp $ + * $Id: config.h 4.14 2017/12/09 14:15:58 kls Exp $ */ #ifndef __CONFIG_H @@ -306,6 +306,7 @@ public: int FoldersInTimerMenu; int AlwaysSortFoldersFirst; int DefaultSortModeRec; + int RecSortingDirection; int NumberKeysForChars; int ColorKey0, ColorKey1, ColorKey2, ColorKey3; int VideoDisplayFormat; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 4.49 2017/12/05 16:39:57 kls Exp $ + * $Id: menu.c 4.50 2017/12/09 14:14:46 kls Exp $ */ #include "menu.h" @@ -3265,6 +3265,7 @@ class cMenuSetupOSD : public cMenuSetupBase { private: const char *useSmallFontTexts[3]; const char *recSortModeTexts[2]; + const char *recSortDirTexts[2]; const char *keyColorTexts[4]; int osdLanguageIndex; int numSkins; @@ -3319,6 +3320,8 @@ void cMenuSetupOSD::Set(void) useSmallFontTexts[2] = tr("always"); recSortModeTexts[0] = tr("by name"); recSortModeTexts[1] = tr("by time"); + recSortDirTexts[0] = tr("ascending"); + recSortDirTexts[1] = tr("descending"); keyColorTexts[0] = tr("Key$Red"); keyColorTexts[1] = tr("Key$Green"); keyColorTexts[2] = tr("Key$Yellow"); @@ -3353,6 +3356,7 @@ void cMenuSetupOSD::Set(void) 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 cMenuEditStraItem(tr("Setup.OSD$Default sort mode for recordings"), &data.DefaultSortModeRec, 2, recSortModeTexts)); + Add(new cMenuEditStraItem(tr("Setup.OSD$Sorting direction for recordings"), &data.RecSortingDirection, 2, recSortDirTexts)); 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)); @@ -3394,7 +3398,7 @@ 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 || data.RecordingDirs != Setup.RecordingDirs) { + if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs || data.RecSortingDirection != Setup.RecSortingDirection) { LOCK_RECORDINGS_WRITE; Recordings->ClearSortNames(); } @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n" "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -866,6 +866,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "عرص على الشاشة" @@ -956,6 +962,9 @@ msgstr "قم دائما بسرد المجلدات اولا" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Number keys for characters" diff --git a/po/ca_ES.po b/po/ca_ES.po index 2056321b..3c0cae24 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n" @@ -865,6 +865,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Informaci en pantalla" @@ -955,6 +961,9 @@ msgstr "Sempre ordenar primer carpetes" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 bed6cce1..2d52fdff 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n" "Language-Team: Czech <vdr@linuxtv.org>\n" @@ -865,6 +865,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -955,6 +961,9 @@ msgstr "Adresáře řadit vždy na začátek" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 b1722819..ef745aaf 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: Danish <vdr@linuxtv.org>\n" @@ -862,6 +862,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -952,6 +958,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 34cb823c..90b0807e 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-10 13:45+0100\n" "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n" "Language-Team: German <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "nach Namen" msgid "by time" msgstr "nach Zeit" +msgid "ascending" +msgstr "aufsteigend" + +msgid "descending" +msgstr "absteigend" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "Verzeichnisse immer zuerst einsortieren" msgid "Setup.OSD$Default sort mode for recordings" msgstr "Standard Sortierreihenfolge fr Aufnahmen" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "Sortierreihenfolge fr Aufnahmen" + msgid "Setup.OSD$Number keys for characters" msgstr "Nummerntasten fr Zeichen" diff --git a/po/el_GR.po b/po/el_GR.po index cece0485..18497b2c 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: Greek <vdr@linuxtv.org>\n" @@ -862,6 +862,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -952,6 +958,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 6eb382f8..e2785fce 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-19 23:00+0100\n" "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Mens en pantalla" @@ -953,6 +959,9 @@ msgstr "Siempre ordenar primero carpetas" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 bac55caa..4cde1b70 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n" @@ -862,6 +862,12 @@ msgstr "nime järgi" msgid "by time" msgstr "aja järgi" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -952,6 +958,9 @@ msgstr "Järjesta kaustad alati ette" msgid "Setup.OSD$Default sort mode for recordings" msgstr "Salvestiste vaikimisi järjestus" +msgid "Setup.OSD$Sorting direction for recordings" +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 0c76cbcd..5b1bbb1c 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -866,6 +866,12 @@ msgstr "nimen mukaan" msgid "by time" msgstr "ajan mukaan" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Kuvaruutunäyttö" @@ -956,6 +962,9 @@ msgstr "Näytä kansiot ensin" msgid "Setup.OSD$Default sort mode for recordings" msgstr "Järjestä tallenteet oletuksena" +msgid "Setup.OSD$Sorting direction for recordings" +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 a8e57775..71cf4e86 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-18 20:16+0100\n" "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n" "Language-Team: French <vdr@linuxtv.org>\n" @@ -873,6 +873,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Affichage à l'écran" @@ -963,6 +969,9 @@ msgstr "Toujours trier les dossiers en premier" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 6881a773..c011d2ab 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Language-Team: Croatian <vdr@linuxtv.org>\n" @@ -864,6 +864,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -954,6 +960,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 3fff8fa1..c6cfd989 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-13 09:36+0200\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n" @@ -867,6 +867,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -957,6 +963,9 @@ msgstr "Könyvtárakat rendezd előre" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Betűk a számgombokon" diff --git a/po/it_IT.po b/po/it_IT.po index 5dec260e..0a910b4d 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2017-07-02 23:49+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr@linuxtv.org>\n" @@ -868,6 +868,12 @@ msgstr "per nome" msgid "by time" msgstr "per ora" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -958,6 +964,9 @@ msgstr "Ordina sempre per prima le cartelle" msgid "Setup.OSD$Default sort mode for recordings" msgstr "Modalità ordinamento predefinito per registrazioni" +msgid "Setup.OSD$Sorting direction for recordings" +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 7ee982e2..c05eee7d 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-11 14:02+0200\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n" @@ -862,6 +862,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD (ekrano užsklanda)" @@ -952,6 +958,9 @@ msgstr "Visada pirmiau rūšiuoti katalogus" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 b71c1351..7a25c272 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-08 15:18+0100\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Language-Team: Macedonian <en@li.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "Секогаш сортирај прво папки" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Нумерички копчиња за букви" diff --git a/po/nl_NL.po b/po/nl_NL.po index b1125145..394615a9 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-10 19:43+0100\n" "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n" @@ -868,6 +868,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -958,6 +964,9 @@ msgstr "Altijd mappen eerst sorteren" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 318cdac0..593c0646 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index b5f2f3d3..70345c24 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-12 00:59+0100\n" "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n" "Language-Team: Polish <vdr@linuxtv.org>\n" @@ -865,6 +865,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -955,6 +961,9 @@ msgstr "Sortuj najpierw katalogi" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 051e76ec..be9e255e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n" "Last-Translator: Cris Silva <hudokkow@gmail.com>\n" "Language-Team: Portuguese <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 791b8f29..b29c850b 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-11 22:26+0100\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n" @@ -864,6 +864,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -954,6 +960,9 @@ msgstr "Sortează întotdeauna directoarele la început" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 66725f86..c42912a9 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2016-12-27 17:13+0100\n" "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n" "Language-Team: Russian <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "по имени" msgid "by time" msgstr "по времени" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Меню" @@ -953,6 +959,9 @@ msgstr "Директории всегда в первую очередь сор msgid "Setup.OSD$Default sort mode for recordings" msgstr "Сортировка по умолчанию" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Количество кнопок для символов" diff --git a/po/sk_SK.po b/po/sk_SK.po index 9fcf86cc..f61c3aae 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-17 18:59+0100\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD (Menu na obrazovke)" @@ -953,6 +959,9 @@ msgstr "Zloky vdy najprv usporiada" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 66e36548..8a2bfe06 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "tevilo tipk za znake" diff --git a/po/sr_RS.po b/po/sr_RS.po index d762f6ae..e77b3bfa 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2013-03-16 15:05+0100\n" "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -953,6 +959,9 @@ msgstr "Uvek sortiraj direktorijume prve" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Piite pomou numerikih dugmia (kao SMS)" diff --git a/po/sv_SE.po b/po/sv_SE.po index c93ff478..bd9743bb 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-12 21:58+0100\n" "Last-Translator: Magnus Sirvi <sirwio@hotmail.com>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n" @@ -867,6 +867,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -957,6 +963,9 @@ msgstr "Sortera alltid mappar frst" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +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 3d0edcc1..93115adb 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeen <oktay_73@yahoo.de>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n" @@ -862,6 +862,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "OSD" @@ -952,6 +958,9 @@ msgstr "" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index 790fa094..509630af 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2015-02-13 18:14+0100\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n" @@ -863,6 +863,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "Меню" @@ -953,6 +959,9 @@ msgstr "Завжди сортувати теки першими" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "Кількість клавіш для символів" diff --git a/po/zh_CN.po b/po/zh_CN.po index de09bbe0..ca917716 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.2.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2017-12-04 13:11+0100\n" +"POT-Creation-Date: 2017-12-09 15:25+0100\n" "PO-Revision-Date: 2013-03-04 14:52+0800\n" "Last-Translator: NFVDR <nfvdr@live.com>\n" "Language-Team: Chinese (simplified) <nfvdr@live.com>\n" @@ -864,6 +864,12 @@ msgstr "" msgid "by time" msgstr "" +msgid "ascending" +msgstr "" + +msgid "descending" +msgstr "" + msgid "OSD" msgstr "系统菜单设置" @@ -954,6 +960,9 @@ msgstr "总是排序文件夹" msgid "Setup.OSD$Default sort mode for recordings" msgstr "" +msgid "Setup.OSD$Sorting direction for recordings" +msgstr "" + msgid "Setup.OSD$Number keys for characters" msgstr "数字键的字符" diff --git a/recording.c b/recording.c index ec6db3d6..6b99b7c3 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 4.12 2017/12/04 13:03:11 kls Exp $ + * $Id: recording.c 4.13 2017/12/09 14:24:35 kls Exp $ */ #include "recording.h" @@ -962,8 +962,8 @@ char *cRecording::StripEpisodeName(char *s, bool Strip) // To have folders sorted before plain recordings, the '/' s1 points to // is replaced by the character '1'. All other slashes will be replaced // by '0' in SortName() (see below), which will result in the desired - // sequence: - *s1 = '1'; + // sequence ('0' and '1' are reversed in case of rsdDescending): + *s1 = (Setup.RecSortingDirection == rsdAscending) ? '1' : '0'; if (Strip) { s1++; memmove(s1, s2, t - s2 + 1); @@ -986,7 +986,7 @@ char *cRecording::SortName(void) const char *s = strdup(FileName() + strlen(cVideoDirectory::Name())); if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst) s = StripEpisodeName(s, RecordingsSortMode != rsmName); - strreplace(s, '/', '0'); // some locales ignore '/' when sorting + strreplace(s, '/', (Setup.RecSortingDirection == rsdAscending) ? '0' : '1'); // some locales ignore '/' when sorting int l = strxfrm(NULL, s, 0) + 1; *sb = MALLOC(char, l); strxfrm(*sb, s, l); @@ -1020,7 +1020,10 @@ int cRecording::GetResume(void) const int cRecording::Compare(const cListObject &ListObject) const { cRecording *r = (cRecording *)&ListObject; - return strcasecmp(SortName(), r->SortName()); + if (Setup.RecSortingDirection == rsdAscending) + return strcasecmp(SortName(), r->SortName()); + else + return strcasecmp(r->SortName(), SortName()); } bool cRecording::IsInPath(const char *Path) const diff --git a/recording.h b/recording.h index 200af45a..035983e2 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 4.5 2017/04/03 13:31:16 kls Exp $ + * $Id: recording.h 4.6 2017/12/09 14:11:16 kls Exp $ */ #ifndef __RECORDING_H @@ -526,6 +526,7 @@ bool GenerateIndex(const char *FileName, bool Update = false); ///< complete, and will be updated if it isn't. Otherwise an existing index ///< file will be removed before a new one is generated. +enum eRecordingsSortDir { rsdAscending, rsdDescending }; enum eRecordingsSortMode { rsmName, rsmTime }; extern eRecordingsSortMode RecordingsSortMode; bool HasRecordingsSortMode(const char *Directory); |