frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented default sort mode for recordings

Browse Source
This commit is contained in:
Klaus Schmidinger
2015-04-18 13:43:29 +02:00
parent e6592e6201
commit 7aef23e97f
34 changed files with 306 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HISTORY
View File

@@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.2.0.
- Official release.
2015-04-11: Version 2.3.1
2015-04-18: Version 2.3.1
- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
a cPixmap may have on the current OSD. The 'osddemo' example has been modified
@@ -8625,3 +8625,9 @@ Video Disk Recorder Revision History
- The script that gets called for recordings is now also called right before a
recording is edited, with the first parameter being "editing" (suggested by
Dieter Ferdinand).
- The new setup option "OSD/Default sort mode for recordings" can be used to define
how recordings shall be sorted by default (either by time or by name, with "by time"
being the default). If a particular sort mode has been selected for a folder by
pressing '0', the default no longer applies to that folder. Repeating timers no
longer write a ".sort" file into a recordings folder to have the recordings sorted
by time.

5
MANUAL
View File

@@ -654,6 +654,11 @@ Version 2.2
plain recordings. Set this option to "no" if you want folders
to be interspersed with recordings when sorted alphabetically.
Default sort mode for recordings = by time
Controls whether recordings are sorted by time or by name.
If a particular sort mode has been selected for a folder by
pressing '0', the default no longer applies to that folder.
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

5
config.c
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 3.10 2015/02/10 12:24:13 kls Exp $
* $Id: config.c 4.1 2015/04/18 13:09:31 kls Exp $
*/
#include "config.h"
@@ -427,6 +427,7 @@ cSetup::cSetup(void)
RecordingDirs = 1;
FoldersInTimerMenu = 1;
AlwaysSortFoldersFirst = 1;
DefaultSortModeRec = rsmTime;
NumberKeysForChars = 1;
ColorKey0 = 0;
ColorKey1 = 1;
@@ -649,6 +650,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, "DefaultSortModeRec")) DefaultSortModeRec = 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);
@@ -775,6 +777,7 @@ bool cSetup::Save(void)
Store("RecordingDirs", RecordingDirs);
Store("FoldersInTimerMenu", FoldersInTimerMenu);
Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
Store("DefaultSortModeRec", DefaultSortModeRec);
Store("NumberKeysForChars", NumberKeysForChars);
Store("ColorKey0", ColorKey0);
Store("ColorKey1", ColorKey1);

3
config.h
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.1 2015/02/21 14:59:27 kls Exp $
* $Id: config.h 4.2 2015/04/18 13:13:15 kls Exp $
*/
#ifndef __CONFIG_H
@@ -301,6 +301,7 @@ public:
int RecordingDirs;
int FoldersInTimerMenu;
int AlwaysSortFoldersFirst;
int DefaultSortModeRec;
int NumberKeysForChars;
int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
int VideoDisplayFormat;

20
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.1 2015/03/09 11:50:26 kls Exp $
* $Id: menu.c 4.2 2015/04/18 13:20:41 kls Exp $
*/
#include "menu.h"
@@ -3006,6 +3006,7 @@ void cMenuSetupBase::Store(void)
class cMenuSetupOSD : public cMenuSetupBase {
private:
const char *useSmallFontTexts[3];
const char *recSortModeTexts[2];
const char *keyColorTexts[4];
int osdLanguageIndex;
int numSkins;
@@ -3058,6 +3059,8 @@ void cMenuSetupOSD::Set(void)
useSmallFontTexts[0] = tr("never");
useSmallFontTexts[1] = tr("skin dependent");
useSmallFontTexts[2] = tr("always");
recSortModeTexts[0] = tr("by name");
recSortModeTexts[1] = tr("by time");
keyColorTexts[0] = tr("Key$Red");
keyColorTexts[1] = tr("Key$Green");
keyColorTexts[2] = tr("Key$Yellow");
@@ -3091,6 +3094,7 @@ void cMenuSetupOSD::Set(void)
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 cMenuEditStraItem(tr("Setup.OSD$Default sort mode for recordings"), &data.DefaultSortModeRec, 2, recSortModeTexts));
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));
@@ -4811,20 +4815,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
cReplayControl::SetRecording(fileName);
Recordings.AddByName(fileName);
if (Timer && !Timer->IsSingleEvent()) {
char *Directory = strdup(fileName);
// going up two directory levels to get the series folder
if (char *p = strrchr(Directory, '/')) {
while (p > Directory && *--p != '/')
;
*p = 0;
if (!HasRecordingsSortMode(Directory)) {
dsyslog("setting %s to be sorted by time", Directory);
SetRecordingsSortMode(Directory, rsmTime);
}
}
free(Directory);
}
return;
}
else

11
po/ar.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -851,6 +851,12 @@ msgstr "متوقف على نوع الثوب"
msgid "always"
msgstr "دائما"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "عرص على الشاشة"
@@ -938,6 +944,9 @@ msgstr "Folders in timer menu"
msgid "Setup.OSD$Always sort folders first"
msgstr "قم دائما بسرد المجلدات اولا"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Number keys for characters"

11
po/ca_ES.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -850,6 +850,12 @@ msgstr "dep
msgid "always"
msgstr "sempre"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Informaci<63> en pantalla"
@@ -937,6 +943,9 @@ msgstr "Carpetes en men
msgid "Setup.OSD$Always sort folders first"
msgstr "Sempre ordenar primer carpetes"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Tecles num<75>riques per a car<61>cters"

11
po/cs_CZ.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -850,6 +850,12 @@ msgstr "podle vzhledu"
msgid "always"
msgstr "vždy"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -937,6 +943,9 @@ msgstr "Složky v menu časovače"
msgid "Setup.OSD$Always sort folders first"
msgstr "Adresáře řadit vždy na začátek"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Psát písmena pomocí číselných kláves"

11
po/da_DK.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -847,6 +847,12 @@ msgstr "skin afh
msgid "always"
msgstr "altid"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -934,6 +940,9 @@ msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

11
po/de_DE.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "je nach Oberfl
msgid "always"
msgstr "immer"
msgid "by name"
msgstr "nach Namen"
msgid "by time"
msgstr "nach Zeit"
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr "Verzeichnisse im Timer-Men
msgid "Setup.OSD$Always sort folders first"
msgstr "Verzeichnisse immer zuerst einsortieren"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Nummerntasten f<>r Zeichen"

11
po/el_GR.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -847,6 +847,12 @@ msgstr "
msgid "always"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -934,6 +940,9 @@ msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

11
po/es_ES.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "seg
msgid "always"
msgstr "siempre"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Men<65>s en pantalla"
@@ -935,6 +941,9 @@ msgstr "Carpetas en men
msgid "Setup.OSD$Always sort folders first"
msgstr "Siempre ordenar primero carpetas"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teclas num<75>ricas para caracteres"

11
po/et_EE.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -847,6 +847,12 @@ msgstr "kestast sõltuv"
msgid "always"
msgstr "alati"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Ekraanikuva"
@@ -934,6 +940,9 @@ msgstr "Kaustad taimeri menüüs"
msgid "Setup.OSD$Always sort folders first"
msgstr "Sorteerida kaustad alati ette"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teksti sisestamine numbriklahvidega"

11
po/fi_FI.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -851,6 +851,12 @@ msgstr "ulkoasun mukaan"
msgid "always"
msgstr "aina"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Kuvaruutunäyttö"
@@ -938,6 +944,9 @@ msgstr "Näytä kansiot ajastinvalikossa"
msgid "Setup.OSD$Always sort folders first"
msgstr "Näytä kansiot ensin"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Käytä numeronäppäimiä tekstisyötteessä"

11
po/fr_FR.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -858,6 +858,12 @@ msgstr "dépendant du skin"
msgid "always"
msgstr "toujours"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Affichage à l'écran"
@@ -945,6 +951,9 @@ msgstr "Dossiers dans menu programmation"
msgid "Setup.OSD$Always sort folders first"
msgstr "Toujours trier les dossiers en premier"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Touches numériques pour caractères"

11
po/hr_HR.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -849,6 +849,12 @@ msgstr "ovisno o povr
msgid "always"
msgstr "uvijek"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -936,6 +942,9 @@ msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

11
po/hu_HU.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -852,6 +852,12 @@ msgstr "Menü nézetétől függően"
msgid "always"
msgstr "mindig"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -939,6 +945,9 @@ msgstr "Könyvtárválasztás az időzítő menüben"
msgid "Setup.OSD$Always sort folders first"
msgstr "Könyvtárakat rendezd előre"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Betűk a számgombokon"

11
po/it_IT.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\n"
"PO-Revision-Date: 2015-02-12 19:31+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -853,6 +853,12 @@ msgstr "in base allo stile interfaccia"
msgid "always"
msgstr "sempre"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -940,6 +946,9 @@ msgstr "Cartelle nel menu timer"
msgid "Setup.OSD$Always sort folders first"
msgstr "Ordina sempre per prima le cartelle"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Tasti numerici per i caratteri"

11
po/lt_LT.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -847,6 +847,12 @@ msgstr "priklauso nuo stiliaus"
msgid "always"
msgstr "visada"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD (ekrano užsklanda)"
@@ -934,6 +940,9 @@ msgstr "Katalogai esantys laikmačių meniu"
msgid "Setup.OSD$Always sort folders first"
msgstr "Visada pirmiau rūšiuoti katalogus"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Skaičių mygtukai simboliams"

11
po/mk_MK.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "зависно од фасада"
msgid "always"
msgstr "секогаш"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr "Директориуми во менито за тајмер"
msgid "Setup.OSD$Always sort folders first"
msgstr "Секогаш сортирај прво папки"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Нумерички копчиња за букви"

11
po/nl_NL.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -853,6 +853,12 @@ msgstr "skin afhankelijk"
msgid "always"
msgstr "altijd"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -940,6 +946,9 @@ msgstr "Mappen in timermenu"
msgid "Setup.OSD$Always sort folders first"
msgstr "Altijd mappen eerst sorteren"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Nummertoetsen voor karakters"

11
po/nn_NO.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr ""
msgid "always"
msgstr ""
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

11
po/pl_PL.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -850,6 +850,12 @@ msgstr "zal. od sk
msgid "always"
msgstr "zawsze"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -937,6 +943,9 @@ msgstr "Katalogi w menu timera"
msgid "Setup.OSD$Always sort folders first"
msgstr "Sortuj najpierw katalogi"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Klawisze numeryczne dla liter"

11
po/pt_PT.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "dependente do tema"
msgid "always"
msgstr "sempre"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr "Pastas no menu de grava
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teclas num<75>ricas para caracteres"

11
po/ro_RO.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -849,6 +849,12 @@ msgstr "dependent de skin"
msgid "always"
msgstr "întotdeauna"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -936,6 +942,9 @@ msgstr "Directoare în meniul de timer-e"
msgid "Setup.OSD$Always sort folders first"
msgstr "Sortează întotdeauna directoarele la început"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Caractere pe tastele numerice"

11
po/ru_RU.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\n"
"PO-Revision-Date: 2013-03-10 17:13+0100\n"
"Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -848,6 +848,12 @@ msgstr "
msgid "always"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "<22><><EFBFBD><EFBFBD>"
@@ -935,6 +941,9 @@ msgstr "
msgid "Setup.OSD$Always sort folders first"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

11
po/sk_SK.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "pod
msgid "always"
msgstr "v<>dy"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD (Menu na obrazovke)"
@@ -935,6 +941,9 @@ msgstr "Zlo
msgid "Setup.OSD$Always sort folders first"
msgstr "Zlo<6C>ky v<>dy najprv usporiada<64>"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "P<>sa<73> znaky <20><>seln<6C>mi tla<6C>idlami"

11
po/sl_SI.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "odvisno od preobleke"
msgid "always"
msgstr "vedno"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr "Direktoriji v meniju urnika"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "<22>tevilo tipk za znake"

11
po/sr_RS.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "zavisi od stila (skin-a)"
msgid "always"
msgstr "uvek"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -935,6 +941,9 @@ msgstr "Direktorijumi u meniju tajmera"
msgid "Setup.OSD$Always sort folders first"
msgstr "Uvek sortiraj direktorijume prve"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Pi<50>ite pomo<6D>u numeri<72>kih dugmi<6D>a (kao SMS)"

11
po/sv_SE.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\n"
"PO-Revision-Date: 2015-02-12 21:58+0100\n"
"Last-Translator: Magnus Sirvi<76> <sirwio@hotmail.com>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -852,6 +852,12 @@ msgstr "skin-beroende"
msgid "always"
msgstr "alltid"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -939,6 +945,9 @@ msgstr "Visa mappar i timermenyn"
msgid "Setup.OSD$Always sort folders first"
msgstr "Sortera alltid mappar f<>rst"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Anv<6E>nd sifferknappar f<>r bokstavsinmatning"

11
po/tr_TR.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolge<67>en <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -847,6 +847,12 @@ msgstr "y
msgid "always"
msgstr "hep"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "OSD"
@@ -934,6 +940,9 @@ msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

11
po/uk_UA.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -848,6 +848,12 @@ msgstr "згідно зі стилем"
msgid "always"
msgstr "завжди"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "Меню"
@@ -935,6 +941,9 @@ msgstr "Теки в меню таймера"
msgid "Setup.OSD$Always sort folders first"
msgstr "Завжди сортувати теки першими"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Кількість клавіш для символів"

11
po/zh_CN.po
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: 2015-03-09 12:50+0100\n"
"POT-Creation-Date: 2015-04-18 15:43+0200\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"
@@ -849,6 +849,12 @@ msgstr "皮肤选择"
msgid "always"
msgstr "总是"
msgid "by name"
msgstr ""
msgid "by time"
msgstr ""
msgid "OSD"
msgstr "系统菜单设置"
@@ -936,6 +942,9 @@ msgstr "定时器菜单中的文件夹"
msgid "Setup.OSD$Always sort folders first"
msgstr "总是排序文件夹"
msgid "Setup.OSD$Default sort mode for recordings"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "数字键的字符"

6
recording.c
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.1 2015/04/11 10:44:38 kls Exp $
* $Id: recording.c 4.2 2015/04/18 13:14:55 kls Exp $
*/
#include "recording.h"
@@ -3020,7 +3020,7 @@ int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max)
// --- Recordings Sort Mode --------------------------------------------------
eRecordingsSortMode RecordingsSortMode = rsmName;
eRecordingsSortMode RecordingsSortMode = rsmTime;
bool HasRecordingsSortMode(const char *Directory)
{
@@ -3029,7 +3029,7 @@ bool HasRecordingsSortMode(const char *Directory)
void GetRecordingsSortMode(const char *Directory)
{
RecordingsSortMode = rsmName;
RecordingsSortMode = eRecordingsSortMode(constrain(Setup.DefaultSortModeRec, 0, int(rsmTime)));
if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
char buf[8];
if (fgets(buf, sizeof(buf), f))