From cc3fef36658d5061ab24dd719a463cc2c52383c3 Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Fri, 26 Aug 2016 16:44:58 +0200 Subject: add setup option MenuItemRecordingDefaultOldDays --- HISTORY | 4 ++++ config.c | 2 ++ config.h | 1 + displaymenu.c | 2 ++ displayreplay.c | 2 +- po/de_DE.po | 12 ++++++------ po/it_IT.po | 7 +++++-- setup.c | 6 +++++- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/HISTORY b/HISTORY index 7acfefb9..79ba7db0 100644 --- a/HISTORY +++ b/HISTORY @@ -30,7 +30,11 @@ VDR Plugin 'skinflatplus' Revision History Create a "recordings_old.cfg" file under PLUGINCONFIGPATH (for example: /etc/vdr/plugins/skinflatplus/recordings_old.cfg) Each line has the format: FOLDERNAME=DAYS + The FOLDERNAME have to be the same name like in the vdr recordings menu. If last recording in the folder is older than DAYS than the exclamation mark icon will be shown. + There is also a new menu option: MenuItemRecordingDefaultOldDays + This is the default value if You don't want to use recordings_old.cfg. + If MenuItemRecordingDefaultOldDays is -1, the default value is disabled. 2015-02-14: Version 0.5.1 - [fix] topbar number recordings diff --git a/config.c b/config.c index 5ae06d64..86e818ea 100644 --- a/config.c +++ b/config.c @@ -127,6 +127,7 @@ cFlatConfig::cFlatConfig(void) { MainMenuWidgetWeatherType = 0; MenuItemRecordingSeenTreshold = 0.98 / 100.0; + MenuItemRecordingDefaultOldDays = -1; ChannelWeatherShow = 1; PlaybackWeatherShow = 1; @@ -375,6 +376,7 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "MainMenuWidgetActiveTimerShowRemoteRefreshTime") == 0) MainMenuWidgetActiveTimerShowRemoteRefreshTime = atoi(Value); else if (strcmp(Name, "ChannelDvbapiInfoShow") == 0) ChannelDvbapiInfoShow = atoi(Value); else if (strcmp(Name, "MenuItemRecordingSeenTreshold") == 0) MenuItemRecordingSeenTreshold = atod(Value); + else if (strcmp(Name, "MenuItemRecordingDefaultOldDays") == 0) MenuItemRecordingDefaultOldDays = atoi(Value); else return false; return true; diff --git a/config.h b/config.h index 0dd57fd7..5b6e1b4f 100644 --- a/config.h +++ b/config.h @@ -248,6 +248,7 @@ class cFlatConfig int MenuChannelShowCount; double MenuItemRecordingSeenTreshold; + int MenuItemRecordingDefaultOldDays; // 0 = vertikal // 1 = horizontal diff --git a/displaymenu.c b/displaymenu.c index 20727230..577e64bd 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -3967,6 +3967,8 @@ bool cFlatDisplayMenu::isRecordingOld( const cRecording *Recording, int Level ) std::string RecFolder = GetRecordingName(Recording, Level, true).c_str(); int value = Config.GetRecordingOldValue( RecFolder ); + if( value < 0 ) + value = Config.MenuItemRecordingDefaultOldDays; if( value < 0 ) return false; diff --git a/displayreplay.c b/displayreplay.c index ba97ccf9..42c88f8d 100644 --- a/displayreplay.c +++ b/displayreplay.c @@ -606,7 +606,7 @@ void cFlatDisplayReplay::PreLoadImages(void) { imgLoader.LoadIcon("play", fontHeight, fontHeight); imgLoader.LoadIcon("forward", fontHeight, fontHeight); imgLoader.LoadIcon("rewind_sel", fontHeight, fontHeight); - imgLoader.LoadIcon("pause_sel", fontHeight, fontHeight); + imgLoader.LoadIcon("play_sel", fontHeight, fontHeight); imgLoader.LoadIcon("pause_sel", fontHeight, fontHeight); imgLoader.LoadIcon("forward_sel", fontHeight, fontHeight); imgLoader.LoadIcon("recording_cutted_extra", fontHeight, fontHeight); diff --git a/po/de_DE.po b/po/de_DE.po index ffb6603e..264544d2 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-22 17:13+0100\n" +"POT-Creation-Date: 2016-08-26 16:35+0200\n" "PO-Revision-Date: 2015-02-09 20:09+0100\n" "Last-Translator: Martin Schirrmacher\n" "Language-Team: Martin Schirrmacher\n" @@ -627,8 +627,11 @@ msgstr "Men msgid "Recording menu show recording count in title" msgstr "Aufnahmen: Anzahl der Aufnahmen in Titelleiste" -msgid "Recording menu seen treshold" -msgstr "" +msgid "Recording menu recording seen treshold" +msgstr "Aufnahmen: Aufnahme gesehen Schwellwert" + +msgid "Recording menu default value - old folder in days" +msgstr "Aufnahmen: default-Wert alter Ordner in Tagen" msgid "Timer menu show timer count in title" msgstr "Timer: Anzahl der Timer in Titelleiste" @@ -902,6 +905,3 @@ msgstr "Eigene Befehle-Widget: Anzeigen" msgid "Widget custom commands: position" msgstr "Eigene Befehle-Widget: Position" - -#~ msgid "Show video/audio bitrate" -#~ msgstr "Zeige Video/Audio Bitrate" diff --git a/po/it_IT.po b/po/it_IT.po index adab15a6..1abffc07 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-22 17:13+0100\n" +"POT-Creation-Date: 2016-08-26 16:38+0200\n" "PO-Revision-Date: 2015-02-09 20:09+0100\n" "Last-Translator: fiveten_59\n" "Language-Team: Italian\n" @@ -627,7 +627,10 @@ msgstr "Men msgid "Recording menu show recording count in title" msgstr "Menù registrazioni mostra la lunghezza nel titolo" -msgid "Recording menu seen treshold" +msgid "Recording menu recording seen treshold" +msgstr "" + +msgid "Recording menu default value - old folder in days" msgstr "" msgid "Timer menu show timer count in title" diff --git a/setup.c b/setup.c index 12a28f3b..a88e3f7e 100644 --- a/setup.c +++ b/setup.c @@ -324,6 +324,7 @@ void cFlatSetup::Store(void) { SetupStore("MainMenuWidgetActiveTimerShowRemoteRefreshTime", Config.MainMenuWidgetActiveTimerShowRemoteRefreshTime); SetupStore("ChannelDvbapiInfoShow", Config.ChannelDvbapiInfoShow); SetupStore("MenuItemRecordingSeenTreshold", dtoa(Config.MenuItemRecordingSeenTreshold)); + SetupStore("MenuItemRecordingDefaultOldDays", Config.MenuItemRecordingDefaultOldDays); Config.Init(); } @@ -513,6 +514,7 @@ bool cFlatSetupGeneral::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "MainMenuWidgetActiveTimerShowRemoteRefreshTime") == 0) SetupConfig->MainMenuWidgetActiveTimerShowRemoteRefreshTime = atoi(Value); else if (strcmp(Name, "ChannelDvbapiInfoShow") == 0) SetupConfig->ChannelDvbapiInfoShow = atoi(Value); else if (strcmp(Name, "MenuItemRecordingSeenTreshold") == 0) SetupConfig->MenuItemRecordingSeenTreshold = atod(Value); + else if (strcmp(Name, "MenuItemRecordingDefaultOldDays") == 0) SetupConfig->MenuItemRecordingDefaultOldDays = atoi(Value); else return false; return true; @@ -684,6 +686,7 @@ void cFlatSetupGeneral::SaveCurrentSettings(void) { Config.Store("MainMenuWidgetActiveTimerShowRemoteRefreshTime", SetupConfig->MainMenuWidgetActiveTimerShowRemoteRefreshTime, *Filename); Config.Store("ChannelDvbapiInfoShow", SetupConfig->ChannelDvbapiInfoShow, *Filename); Config.Store("MenuItemRecordingSeenTreshold", dtoa(Config.MenuItemRecordingSeenTreshold), *Filename); + Config.Store("MenuItemRecordingDefaultOldDays", SetupConfig->MenuItemRecordingDefaultOldDays, *Filename); cString msg = cString::sprintf("%s %s", tr("saved settings in file:"), *File); Skins.Message(mtInfo, msg); @@ -962,7 +965,8 @@ void cFlatSetupMenu::Setup(void) { Add(new cMenuEditBoolItem(tr("Menu draw background over the entire height"), &SetupConfig->MenuFullOsd)); Add(new cMenuEditBoolItem(tr("Recording menu show recording count in title"), &SetupConfig->MenuRecordingShowCount)); - Add(new cMenuEditPrcItem(tr("Recording menu seen treshold"), &SetupConfig->MenuItemRecordingSeenTreshold, 0.008, 0.01, 2)); + Add(new cMenuEditPrcItem(tr("Recording menu recording seen treshold"), &SetupConfig->MenuItemRecordingSeenTreshold, 0.008, 0.01, 2)); + Add(new cMenuEditIntItem(tr("Recording menu default value - old folder in days"), &SetupConfig->MenuItemRecordingDefaultOldDays, -1)); Add(new cMenuEditBoolItem(tr("Timer menu show timer count in title"), &SetupConfig->MenuTimerShowCount)); Add(new cMenuEditBoolItem(tr("Channel menu show channel count in title"), &SetupConfig->MenuChannelShowCount)); -- cgit v1.2.3