frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Implemented the setup option "OSD/Always sort folders first"

This commit is contained in:
Klaus Schmidinger 2013-03-04 14:11:47 +01:00
parent f3eb300bb0
commit db8cf38b5b
35 changed files with 152 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -7701,3 +7701,6 @@ Video Disk Recorder Revision History
- Added the system's character set to the page header in the epg2html script (pointed
out by Dimitar Petrovski).
- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
- The new option "Setup/OSD/Always sort folders first" can be used to control whether
folders will be always at the top of the Recordings menu, or will be interspersed
with plain recordings when sorted alphabetically.

5
MANUAL
View File

@ -601,6 +601,11 @@ Version 1.6
Controls whether the full folder path is shown in the
"Timers" menu, or just the basic recording name.
Always sort folders first = yes
In the "Recordings" menu folders are always listed before
plain recordings. Set this option to "no" if you want folders
to be interspersed with recordings when sorted alphabetically.
Number keys for characters = yes
Controls whether the number keys can be used to enter
characters in a text input field. You may want to set this

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 2.35 2013/02/14 15:14:37 kls Exp $
* $Id: config.c 2.36 2013/03/04 13:30:12 kls Exp $
*/
#include "config.h"
@ -420,6 +420,7 @@ cSetup::cSetup(void)
VpsMargin = 120;
RecordingDirs = 1;
FoldersInTimerMenu = 1;
AlwaysSortFoldersFirst = 1;
NumberKeysForChars = 1;
ColorKey0 = 0;
ColorKey1 = 1;
@ -624,6 +625,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "VpsMargin")) VpsMargin = atoi(Value);
else if (!strcasecmp(Name, "RecordingDirs")) RecordingDirs = atoi(Value);
else if (!strcasecmp(Name, "FoldersInTimerMenu")) FoldersInTimerMenu = atoi(Value);
else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value);
else if (!strcasecmp(Name, "NumberKeysForChars")) NumberKeysForChars = atoi(Value);
else if (!strcasecmp(Name, "ColorKey0")) ColorKey0 = atoi(Value);
else if (!strcasecmp(Name, "ColorKey1")) ColorKey1 = atoi(Value);
@ -732,6 +734,7 @@ bool cSetup::Save(void)
Store("VpsMargin", VpsMargin);
Store("RecordingDirs", RecordingDirs);
Store("FoldersInTimerMenu", FoldersInTimerMenu);
Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
Store("NumberKeysForChars", NumberKeysForChars);
Store("ColorKey0", ColorKey0);
Store("ColorKey1", ColorKey1);

7
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 2.70 2013/03/03 15:38:17 kls Exp $
* $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $
*/
#ifndef __CONFIG_H
@ -27,8 +27,8 @@
// The plugin API's version number:
#define APIVERSION "1.7.39"
#define APIVERSNUM 10739 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.7.40"
#define APIVERSNUM 10740 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
@ -293,6 +293,7 @@ public:
int VpsMargin;
int RecordingDirs;
int FoldersInTimerMenu;
int AlwaysSortFoldersFirst;
int NumberKeysForChars;
int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
int VideoDisplayFormat;

5
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 2.80 2013/02/19 09:33:26 kls Exp $
* $Id: menu.c 2.81 2013/03/04 14:11:47 kls Exp $
*/
#include "menu.h"
@ -2608,6 +2608,7 @@ void cMenuSetupOSD::Set(void)
Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"), &data.MenuKeyCloses));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"), &data.RecordingDirs));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"), &data.FoldersInTimerMenu));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"), &data.ColorKey0, 4, keyColorTexts));
Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"), &data.ColorKey1, 4, keyColorTexts));
@ -2649,6 +2650,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
ModifiedAppearance = true;
if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
ModifiedAppearance = true;
if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst)
Recordings.ClearSortNames();
}
int oldSkinIndex = skinIndex;

5
po/ar.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n"
@ -850,6 +850,9 @@ msgstr "مجلد التسجيلات"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/ca_ES.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n"
@ -849,6 +849,9 @@ msgstr "Gravacions en subcarpetes"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Carpetes en menú temporitzadors"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Tecles numèriques per a caràcters "

5
po/cs_CZ.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n"
@ -849,6 +849,9 @@ msgstr "Seznam nahrávek"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Složky v menu časovače"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Psát písmena pomocí číselných kláves"

5
po/da_DK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Optagelser i foldere"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/de_DE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Aufnahmeverzeichnisse"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Verzeichnisse im Timer-Menü"
msgid "Setup.OSD$Always sort folders first"
msgstr "Verzeichnisse immer zuerst einsortieren"
msgid "Setup.OSD$Number keys for characters"
msgstr "Nummerntasten für Zeichen"

5
po/el_GR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/es_ES.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "Mostrar carpetas de grabaciones"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Carpetas en menú timers"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teclas numéricas para caracteres"

5
po/et_EE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Kausta nime salvestamine"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Kaustad taimeri menüüs"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teksti sisestamine numbriklahvidega"

5
po/fi_FI.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@ -849,6 +849,9 @@ msgstr "Näytä tallennehakemistot"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Näytä kansiot ajastinvalikossa"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Käytä numeronäppäimiä tekstisyötteessä"

5
po/fr_FR.po
View File

@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.37\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-02-24 12:56+0100\n"
"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
"Language-Team: French <vdr@linuxtv.org>\n"
@ -855,6 +855,9 @@ msgstr "Dossiers d'enregistrements"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Dossiers dans menu programmation"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Touches numériques pour caractères"

5
po/hr_HR.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n"
@ -848,6 +848,9 @@ msgstr "Imenik za snimke"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/hu_HU.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-03-01 19:22+0200\n"
"Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
@ -850,6 +850,9 @@ msgstr "Felvételek listája"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Könyvtárválasztás az időzítő menüben"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Számgombok a betűkön"

5
po/it_IT.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-02-11 23:46+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
@ -853,6 +853,9 @@ msgstr "Directory di registrazione"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Cartelle nel menu timer"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Tasti numerici per i caratteri"

5
po/lt_LT.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.37\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2010-10-30 11:55+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Įrašų katalogai"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Katalogai esantys laikmačių meniu"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Skaičių mygtukai simboliams"

5
po/mk_MK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR-1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2012-11-19 15:18+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n"
@ -847,6 +847,9 @@ msgstr "Директориум за снимки"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Директориуми во менито за тајмер"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Нумерички копчиња за букви"

5
po/nl_NL.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.38\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Carel Willemse <carel@nekanali.nl>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n"
@ -850,6 +850,9 @@ msgstr "Opname mappen"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Mappen in timermenu"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Nummertoetsen voor karakters"

5
po/nn_NO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "Kataloger til opptak"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/pl_PL.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n"
@ -848,6 +848,9 @@ msgstr "Katalogi nagra
msgid "Setup.OSD$Folders in timer menu"
msgstr "Katalogi w menu timera"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Klawisze numeryczne dla liter"

5
po/pt_PT.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.15\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "Pasta de grava
msgid "Setup.OSD$Folders in timer menu"
msgstr "Pastas no menu de gravações"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Teclas numéricas para caracteres"

5
po/ro_RO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.37\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-02-09 23:01+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n"
@ -848,6 +848,9 @@ msgstr "Directoare înregistrări"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Directoare în meniul de timer-e"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Caractere pe tastele numerice"

5
po/ru_RU.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-03-03 13:43+0100\n"
"Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "
msgid "Setup.OSD$Folders in timer menu"
msgstr "´ØàÕÚâÞàØØ Ò ÜÕÝî âÐÙÜÕà"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "ºÞÛØçÕáâÒÞ ÚÝÞßÞÚ ÔÛï áØÜÒÞÛÞÒ"

5
po/sk_SK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-01-29 22:39+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Zoznam nahr
msgid "Setup.OSD$Folders in timer menu"
msgstr "Zlo¾ky v menu plánovaèa"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Písa» znaky èíselnými tlaèidlami"

5
po/sl_SI.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-03-04 12:46+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "Direktoriji za posnetke"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Direktoriji v meniju urnika"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "©tevilo tipk za znake"

5
po/sr_SR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.1\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2011-01-09 15:57+0100\n"
"Last-Translator: Milan Cvijanoviæ <elcom_cvijo@hotmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Direktorij za snimke"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/sv_SE.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-02-18 17:04+0100\n"
"Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
@ -850,6 +850,9 @@ msgstr "Visa mappar i inspelningsmenyn"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Visa mappar i timermenyn"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Använd sifferknappar för bokstavsinmatning"

5
po/tr_TR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@ -846,6 +846,9 @@ msgstr "Kay
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

5
po/uk_UA.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2013-02-09 16:00+0100\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@ -847,6 +847,9 @@ msgstr "Теки зберігання записів"
msgid "Setup.OSD$Folders in timer menu"
msgstr "Теки в меню таймера"
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr "Кількість клавіш для символів"

5
po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2013-02-03 16:46+0100\n"
"POT-Creation-Date: 2013-03-04 14:46+0100\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@ -849,6 +849,9 @@ msgstr "录像目录"
msgid "Setup.OSD$Folders in timer menu"
msgstr ""
msgid "Setup.OSD$Always sort folders first"
msgstr ""
msgid "Setup.OSD$Number keys for characters"
msgstr ""

19
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 2.89 2013/03/03 10:54:05 kls Exp $
* $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $
*/
#include "recording.h"
@ -943,7 +943,9 @@ char *cRecording::SortName(void) const
{
char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
if (!*sb) {
char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)), RecordingsSortMode != rsmName);
char *s = strdup(FileName() + strlen(VideoDirectory));
if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
s = StripEpisodeName(s, RecordingsSortMode != rsmName);
strreplace(s, '/', '0'); // some locales ignore '/' when sorting
int l = strxfrm(NULL, s, 0) + 1;
*sb = MALLOC(char, l);
@ -953,6 +955,12 @@ char *cRecording::SortName(void) const
return *sb;
}
void cRecording::ClearSortName(void)
{
DELETENULL(sortBufferName);
DELETENULL(sortBufferTime);
}
int cRecording::GetResume(void) const
{
if (resume == RESUME_NOT_INITIALIZED) {
@ -1422,6 +1430,13 @@ void cRecordings::ResetResume(const char *ResumeFileName)
ChangeState();
}
void cRecordings::ClearSortNames(void)
{
LOCK_THREAD;
for (cRecording *recording = First(); recording; recording = Next(recording))
recording->ClearSortName();
}
// --- cMark -----------------------------------------------------------------
double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND;

4
recording.h
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 2.45 2013/03/03 10:48:39 kls Exp $
* $Id: recording.h 2.46 2013/03/04 14:01:23 kls Exp $
*/
#ifndef __RECORDING_H
@ -99,6 +99,7 @@ private:
cRecording &operator=(const cRecording &); // can't assign cRecording
static char *StripEpisodeName(char *s, bool Strip);
char *SortName(void) const;
void ClearSortName(void);
int GetResume(void) const;
time_t start;
int priority;
@ -187,6 +188,7 @@ public:
void ChangeState(void) { state++; }
bool StateChanged(int &State);
void ResetResume(const char *ResumeFileName = NULL);
void ClearSortNames(void);
cRecording *GetByName(const char *FileName);
void AddByName(const char *FileName, bool TriggerUpdate = true);
void DelByName(const char *FileName);