Add "Use animation" to setup

With this menu item, the use of animation can be switched off centrally.

13 files changed, 61 insertions, 39 deletions

diff --git a/config.c b/config.c
index 2eb2d3d..1e4bcce 100644
--- a/config.c
+++ b/config.c
@@ -60,6 +60,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("fontIndex", 0));
     conf.insert(std::pair<std::string, int>("debugImageLoading", 0));
     conf.insert(std::pair<std::string, int>("scraperInfo", 1));
+    conf.insert(std::pair<std::string, int>("animation", 1));
     conf.insert(std::pair<std::string, int>("tabsInDetailView", 1));
     //DisplayMenu
     conf.insert(std::pair<std::string, int>("scrollMode", 0));
diff --git a/displaychannel.c b/displaychannel.c
index 966adc1..c8f1177 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -21,7 +21,7 @@ cNopacityDisplayChannel::cNopacityDisplayChannel(bool WithInfo) : cThread("Displ
 }
 
 cNopacityDisplayChannel::~cNopacityDisplayChannel(void) {
-    if (config.GetValue("channelFadeOutTime")) {
+    if (config.GetValue("animation") && config.GetValue("channelFadeOutTime")) {
         fadeout = true;
         Start();
     }
@@ -140,7 +140,7 @@ void cNopacityDisplayChannel::Flush(void) {
     } else
         channelView->ClearSourceInfo();
 
-    if (initial && config.GetValue("channelFadeTime")) {
+    if (initial && config.GetValue("animation") && config.GetValue("channelFadeTime")) {
         channelView->SetAlpha(0);
         Start();
     }
diff --git a/displaymenu.c b/displaymenu.c
index 3d9c272..63371a0 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -31,9 +31,11 @@ cNopacityDisplayMenu::cNopacityDisplayMenu(void) : cThread("DisplayMenu") {
 }
 
 cNopacityDisplayMenu::~cNopacityDisplayMenu(void) {
-    if (osd && (MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins) && menuFadeOutTime) {
-        fadeout = true;
-        Start();
+    if (config.GetValue("animation") && menuFadeOutTime) {
+        if ((MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins)) {
+            fadeout = true;
+            Start();
+        }
     }
     int count = 0;
     while (Active()) {
@@ -639,8 +641,8 @@ void cNopacityDisplayMenu::Flush(void) {
         if (config.GetValue("showTimers"))
             DrawTimers(timersChanged, numConflicts);
     }
-    if (initial) {
-        if ((MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins) && menuFadeTime) {
+    if (initial && config.GetValue("animation") && menuFadeTime) {
+        if ((MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins)) {
             SetAlpha(0, true);
             Start();
         }
diff --git a/displaymessage.c b/displaymessage.c
index 01094ad..a9141dd 100644
--- a/displaymessage.c
+++ b/displaymessage.c
@@ -12,7 +12,7 @@ cNopacityDisplayMessage::cNopacityDisplayMessage(void) : cThread("DisplayMessage
 }
 
 cNopacityDisplayMessage::~cNopacityDisplayMessage() {
-    if (config.GetValue("messageFadeOutTime")) {
+    if (config.GetValue("animation") && config.GetValue("messageFadeOutTime")) {
         fadeout = true;
         Start();
     }
@@ -30,7 +30,7 @@ cNopacityDisplayMessage::~cNopacityDisplayMessage() {
 void cNopacityDisplayMessage::SetMessage(eMessageType Type, const char *Text) {
     delete messageBox;
     messageBox = new cNopacityMessageBox(osd, cRect(0, 0, geoManager->messageWidth, geoManager->messageHeight), Type, Text);
-    if (config.GetValue("messageFadeTime")) {
+    if (config.GetValue("animation") && config.GetValue("messageFadeTime")) {
         messageBox->SetAlpha(0);
         Start();
     }
diff --git a/displayreplay.c b/displayreplay.c
index 0f583bd..1b91787 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -16,7 +16,7 @@ cNopacityDisplayReplay::cNopacityDisplayReplay(bool ModeOnly) : cThread("Display
 }
 
 cNopacityDisplayReplay::~cNopacityDisplayReplay() {
-    if (config.GetValue("replayFadeOutTime")) {
+    if (config.GetValue("animation") && config.GetValue("replayFadeOutTime")) {
         fadeout = true;
         Start();
     }
@@ -499,7 +499,7 @@ void cNopacityDisplayReplay::Flush(void) {
     if (!modeOnly) {
         DrawDate();
     }
-    if (initial && config.GetValue("replayFadeTime")) {
+    if (initial && config.GetValue("animation") && config.GetValue("replayFadeTime")) {
         SetAlpha(0);
         Start();
     }
diff --git a/displaytracks.c b/displaytracks.c
index 586e083..9ccb362 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -18,7 +18,7 @@ cNopacityDisplayTracks::cNopacityDisplayTracks(const char *Title, int NumTracks,
 }
 
 cNopacityDisplayTracks::~cNopacityDisplayTracks() {
-    if (config.GetValue("tracksFadeOutTime")) {
+    if (config.GetValue("animation") && config.GetValue("tracksFadeOutTime")) {
         fadeout = true;
         Start();
     }
@@ -188,7 +188,7 @@ void cNopacityDisplayTracks::SetAudioChannel(int AudioChannel) {
 void cNopacityDisplayTracks::Flush(void) {
     if (Running())
         return;
-    if (initial && config.GetValue("tracksFadeTime")) {
+    if (initial && config.GetValue("animation") && config.GetValue("tracksFadeTime")) {
         SetAlpha(0, true);
         Start();
     }
diff --git a/displayvolume.c b/displayvolume.c
index bb0293a..567afe5 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -51,7 +51,7 @@ cNopacityDisplayVolume::cNopacityDisplayVolume(void) : cThread("DisplayVolume")
 }
 
 cNopacityDisplayVolume::~cNopacityDisplayVolume(void) {
-    if (config.GetValue("volumeFadeOutTime")) {
+    if (config.GetValue("animation") && config.GetValue("volumeFadeOutTime")) {
         fadeout = true;
         Start();
     }
@@ -138,7 +138,7 @@ void cNopacityDisplayVolume::SetAlpha(int Alpha) {
 void cNopacityDisplayVolume::Flush(void) {
     if (Running())
         return;
-    if (initial && config.GetValue("volumeFadeTime")) {
+    if (initial && config.GetValue("animation") && config.GetValue("volumeFadeTime")) {
         SetAlpha(0);
         Start();
     }
diff --git a/menuitem.c b/menuitem.c
index 79a8c36..66ed777 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -427,8 +427,9 @@ void cNopacityMainMenuItem::Render(bool initial, bool fadeout) {
             }
         }
         SetTextShort();
-        if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-            Start();
+        if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+            if (current && scrollable && !Running())
+                Start();
         }
         if (wasCurrent && !current && scrollable && Running()) {
             pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
@@ -557,8 +558,9 @@ void cNopacityScheduleMenuItem::Render(bool initial, bool fadeout) {
             drawn = true;
         }
         SetTextShort();
-        if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-            Start();
+        if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+            if (current && scrollable && !Running())
+                Start();
         }
         if (wasCurrent && !current && scrollable && Running()) {
             pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
@@ -572,7 +574,7 @@ void cNopacityScheduleMenuItem::Render(bool initial, bool fadeout) {
             }
         if (current && Event) {
             if (config.GetValue("menuSchedulesWindowMode") == 0) {
-              if (!fadeout) {
+              if (config.GetValue("animation") && !fadeout) {
                 //window mode
                 infoTextWindow = new cNopacityTextWindow(osd, fontEPGWindow, vidWin);
                 infoTextWindow->SetGeometry(textWindow);
@@ -910,8 +912,9 @@ void cNopacityChannelMenuItem::Render(bool initial, bool fadeout) {
             drawn = true;
         }
         SetTextShort();
-        if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-            Start();
+        if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+            if (current && scrollable && !Running())
+                Start();
         }
         if (wasCurrent && !current && scrollable && Running()) {
             pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
@@ -924,7 +927,7 @@ void cNopacityChannelMenuItem::Render(bool initial, bool fadeout) {
                 infoTextWindow = NULL;
             }
         if (current && Channel && (config.GetValue("menuChannelDisplayMode") == 0)) {
-          if (!fadeout) {
+          if (config.GetValue("animation") && !fadeout) {
             infoTextWindow = new cNopacityTextWindow(osd, fontEPGWindow, vidWin);
             infoTextWindow->SetGeometry(textWindow);
             infoTextWindow->SetText(readEPG().c_str());
@@ -1086,8 +1089,9 @@ void cNopacityTimerMenuItem::Render(bool initial, bool fadeout) {
         }
         if (!Running())
             SetTextShort();
-        if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-            Start();
+        if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+            if (current && scrollable && !Running())
+                Start();
         }
         if (wasCurrent && !current && scrollable && Running()) {
             pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
@@ -1102,7 +1106,7 @@ void cNopacityTimerMenuItem::Render(bool initial, bool fadeout) {
         const cEvent *Event = Timer->Event();
         if (current && Event) {
             if (config.GetValue("menuTimersWindowMode") == 0) {
-              if (!fadeout) {
+              if (config.GetValue("animation") && !fadeout) {
                 //window mode
                 infoTextWindow = new cNopacityTextWindow(osd, fontEPGWindow, vidWin);
                 infoTextWindow->SetGeometry(textWindow);
@@ -1435,8 +1439,9 @@ void cNopacityRecordingMenuItem::Render(bool initial, bool fadeout) {
             DrawRecordingIcons();
             SetTextShort();
         }
-        if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-            Start();
+        if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+            if (current && scrollable && !Running())
+                Start();
         }
         if (wasCurrent && !current && scrollable && Running()) {
             pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
@@ -1451,7 +1456,7 @@ void cNopacityRecordingMenuItem::Render(bool initial, bool fadeout) {
                 }
             if (current) {
                 if (config.GetValue("menuRecordingsWindowMode") == 0) {
-                  if (!fadeout) {
+                  if (config.GetValue("animation") && !fadeout) {
                     //window mode
                     infoTextWindow = new cNopacityTextWindow(osd, fontEPGWindow, vidWin);
                     infoTextWindow->SetGeometry(textWindow);
@@ -1674,8 +1679,9 @@ void cNopacityDefaultMenuItem::Render(bool initial, bool fadeout) {
             break;
     }
 
-    if (current && scrollable && !Running() && config.GetValue("menuScrollSpeed")) {
-        Start();
+    if (config.GetValue("animation") && config.GetValue("menuScrollSpeed")) {
+        if (current && scrollable && !Running())
+            Start();
     }
     if (wasCurrent && !current && scrollable && Running()) {
         pixmapTextScroller->SetDrawPortPoint(cPoint(0, 0));
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 06d4ce8..126dacc 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-07-11 14:01+0200\n"
+"POT-Creation-Date: 2021-07-30 12:33+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -194,10 +194,13 @@ msgstr "Font"
 msgid "Create Log Messages for image loading"
 msgstr "Crea Log d'imatges carregades"
 
-msgid "Use tabs in detail view"
+msgid "Use scraper infos and pictures"
 msgstr ""
 
-msgid "Use scraper infos and pictures"
+msgid "Use animation"
+msgstr ""
+
+msgid "Use tabs in detail view"
 msgstr ""
 
 msgid "VDR Menu: Common Settings"
diff --git a/po/de_DE.po b/po/de_DE.po
index 3e7b22e..bd3bba5 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-07-11 15:55+0200\n"
+"POT-Creation-Date: 2021-07-30 12:33+0200\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -194,6 +194,9 @@ msgstr "Log Nachrichten beim Bilder laden erzeugen"
 msgid "Use scraper infos and pictures"
 msgstr "Scraper Infos und Bilder benutzen"
 
+msgid "Use animation"
+msgstr "Animationen benutzen"
+
 msgid "Use tabs in detail view"
 msgstr "Reiter in der Detail Ansicht benutzen"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index ad570f5..bbcd67a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-07-11 14:01+0200\n"
+"POT-Creation-Date: 2021-07-30 12:33+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -194,10 +194,13 @@ msgstr "Carattere"
 msgid "Create Log Messages for image loading"
 msgstr ""
 
-msgid "Use tabs in detail view"
+msgid "Use scraper infos and pictures"
 msgstr ""
 
-msgid "Use scraper infos and pictures"
+msgid "Use animation"
+msgstr ""
+
+msgid "Use tabs in detail view"
 msgstr ""
 
 msgid "VDR Menu: Common Settings"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 147fab3..9f517e7 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-07-11 14:05+0200\n"
+"POT-Creation-Date: 2021-07-30 12:33+0200\n"
 "PO-Revision-Date: 2013-11-11 20:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -194,6 +194,9 @@ msgstr "Vytvoriť protokolovanie správ pre načítanie obrázka"
 msgid "Use scraper infos and pictures"
 msgstr ""
 
+msgid "Use animation"
+msgstr ""
+
 msgid "Use tabs in detail view"
 msgstr ""
 
diff --git a/setup.c b/setup.c
index 9a13e4f..0b6d70f 100644
--- a/setup.c
+++ b/setup.c
@@ -38,6 +38,7 @@ void cNopacitySetup::Setup(void) {
     Add(new cMenuEditStraItem(tr("Font"), tmpConf.GetValueRef("fontIndex"), fontNames.Size(), &fontNames[0]));
     Add(new cMenuEditBoolItem(tr("Create Log Messages for image loading"), tmpConf.GetValueRef("debugImageLoading")));
     Add(new cMenuEditBoolItem(tr("Use scraper infos and pictures"), tmpConf.GetValueRef("scraperInfo")));
+    Add(new cMenuEditBoolItem(tr("Use animation"), tmpConf.GetValueRef("animation")));
     Add(new cMenuEditBoolItem(tr("Use tabs in detail view"), tmpConf.GetValueRef("tabsInDetailView")));
     Add(new cOsdItem("",  osUnknown, false));
     Add(new cOsdItem(tr("VDR Menu: Common Settings")));