1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Implemented 'OSD/Sorting direction for recordings'

This commit is contained in:
Klaus Schmidinger 2017-12-09 18:58:25 +01:00
parent e757f10e44
commit 1492f6dbc4
36 changed files with 315 additions and 39 deletions

View File

@ -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

View File

@ -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).

7
MANUAL
View File

@ -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

View File

@ -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);

View File

@ -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;

8
menu.c
View File

@ -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();
}

View File

@ -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"

View File

@ -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 numèriques per a caràcters"

View File

@ -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"

View File

@ -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 ""

View File

@ -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 für Aufnahmen"
msgid "Setup.OSD$Sorting direction for recordings"
msgstr "Sortierreihenfolge für Aufnahmen"
msgid "Setup.OSD$Number keys for characters"
msgstr "Nummerntasten für Zeichen"

View File

@ -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 ""

View File

@ -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 "Menús 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 numéricas para caracteres"

View File

@ -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"

View File

@ -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ä"

View File

@ -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"

View File

@ -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 ""

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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 "Нумерички копчиња за букви"

View File

@ -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"

View File

@ -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 ""

View File

@ -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"

View File

@ -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 numéricas para caracteres"

View File

@ -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"

View File

@ -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 "Количество кнопок для символов"

View File

@ -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 "Zlo
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 "Písa» znaky èíselnými tlaèidlami"

View File

@ -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"

View File

@ -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 "Pi¹ite pomoæu numerièkih dugmiæa (kao SMS)"

View File

@ -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 f
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 "Använd sifferknappar för bokstavsinmatning"

View File

@ -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 Yolgeçen <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 ""

View File

@ -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 "Кількість клавіш для символів"

View File

@ -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 "数字键的字符"

View File

@ -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;
if (Setup.RecSortingDirection == rsdAscending)
return strcasecmp(SortName(), r->SortName());
else
return strcasecmp(r->SortName(), SortName());
}
bool cRecording::IsInPath(const char *Path) const

View File

@ -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);