Merge branch 'master' into features/python3

libavg · Mar 2, 2021 · de9e7b2 · de9e7b2
2 parents daffd28 + a27e270
commit de9e7b2
Show file tree

Hide file tree

Showing 637 changed files with 765 additions and 695 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ project(libavg)
 set(AVG_VERSION_MAJOR 2)
 set(AVG_VERSION_MINOR 0)
 set(AVG_VERSION_MICRO 0)
-set(AVG_VERSION_EXTRA dev4) # optional
+set(AVG_VERSION_EXTRA dev5) # optional
 set(AVG_VERSION_RELEASE "${AVG_VERSION_MAJOR}.${AVG_VERSION_MINOR}.${AVG_VERSION_MICRO}")
 if(DEFINED AVG_VERSION_EXTRA)
     set(AVG_VERSION_RELEASE "${AVG_VERSION_RELEASE}.${AVG_VERSION_EXTRA}")

diff --git a/CreateVersionFile.py b/CreateVersionFile.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/__init__.py b/python/libavg/__init__.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/__init__.py b/python/libavg/app/__init__.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/app.py b/python/libavg/app/app.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -86,6 +86,7 @@ def __init__(self):
         self._windowSize = None
         self._mtEmu = None
         self._clickTest = None
+        self._clickTestConfig = {}
 
         self._settings = None
         self._setupSettings()
@@ -151,6 +152,16 @@ def settings(self):
     def onBeforeLaunch(self):
         pass
 
+    def configClickTest(self,
+            mouse=clicktest.ClickTest.DEFAULT_MOUSE,
+            maxTouches=clicktest.ClickTest.DEFAULT_MAX_TOUCHES,
+            probabilities=clicktest.ClickTest.DEFAULT_PROBABILITIES,
+            visualize=clicktest.ClickTest.DEFAULT_VISUALIZE):
+        self._clickTestConfig = {
+            'mouse': mouse, 'maxTouches': maxTouches,
+            'probabilities': probabilities, 'visualize': visualize
+        }
+
     def takeScreenshot(self, targetFolder='.'):
         screenBmp = player.screenshot()
 
@@ -413,7 +424,7 @@ def _toggleMtEmulation(self):
 
     def _toggleClickTest(self):
         if not self._clickTest:
-            self._clickTest = clicktest.ClickTest()
+            self._clickTest = clicktest.ClickTest(**self._clickTestConfig)
             self._clickTest.start()
         else:
             self._stopClickTest()

diff --git a/python/libavg/app/debugpanel.py b/python/libavg/app/debugpanel.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/flashmessage.py b/python/libavg/app/flashmessage.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/keyboardmanager.py b/python/libavg/app/keyboardmanager.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/settings.py b/python/libavg/app/settings.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/app/touchvisualization.py b/python/libavg/app/touchvisualization.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/apphelpers.py b/python/libavg/apphelpers.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/clicktest.py b/python/libavg/clicktest.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2020 Thomas Schott, <scotty at c-base dot org>
+# Copyright (C) 2020-2021 Thomas Schott, <scotty at c-base dot org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,8 +29,13 @@
 
 
 class ClickTest:
-    def __init__(self, mouse=False, maxTouches=10, probabilities=(0.5, 0.1, 0.2),
-            visualize=True):
+    DEFAULT_MOUSE = False
+    DEFAULT_MAX_TOUCHES = 10
+    DEFAULT_PROBABILITIES = (0.5, 0.1, 0.2)  # down, up, move
+    DEFAULT_VISUALIZE = True
+
+    def __init__(self, mouse=DEFAULT_MOUSE, maxTouches=DEFAULT_MAX_TOUCHES,
+            probabilities=DEFAULT_PROBABILITIES, visualize=DEFAULT_VISUALIZE):
         self._mouse = bool(mouse)
         self._maxTouches = max(0, maxTouches)
         self._probabilities = tuple(min(1.0, max(0.0, p)) for p in probabilities)

diff --git a/python/libavg/filter.py b/python/libavg/filter.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/geom.py b/python/libavg/geom.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/gesture.py b/python/libavg/gesture.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/graph.py b/python/libavg/graph.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/methodref.py b/python/libavg/methodref.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/mtemu.py b/python/libavg/mtemu.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/parsecamargs.py b/python/libavg/parsecamargs.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/persist.py b/python/libavg/persist.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/sprites.py b/python/libavg/sprites.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/statemachine.py b/python/libavg/statemachine.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/testapp.py b/python/libavg/testapp.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/testcase.py b/python/libavg/testcase.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/textarea.py b/python/libavg/textarea.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/utils.py b/python/libavg/utils.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/__init__.py b/python/libavg/widget/__init__.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/base.py b/python/libavg/widget/base.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/button.py b/python/libavg/widget/button.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -378,15 +378,15 @@ def __init__(self, text="", skinObj=skin.Skin.default, **kwargs):
         checkedDownNode = self.__createImageNode(self.cfg["checkedDownBmp"])
         checkedDisabledNode = self.__createImageNode(self.cfg["checkedDisabledBmp"])
 
+        self.textNode = avg.WordsNode(pos=(20,0), text=text, fontstyle=self.cfg["font"])
         super().__init__(uncheckedUpNode=uncheckedUpNode,
                 uncheckedDownNode=uncheckedDownNode, 
                 uncheckedDisabledNode=uncheckedDisabledNode,
                 checkedUpNode=checkedUpNode,
                 checkedDownNode=checkedDownNode, 
                 checkedDisabledNode=checkedDisabledNode,
                 **kwargs)
-        self.textNode = avg.WordsNode(pos=(20,0), text=text, fontstyle=self.cfg["font"],
-                parent=self)
+        self.appendChild(self.textNode)
 
     def _enterUncheckedUp(self):
         self.textNode.fontstyle = self.cfg["font"]

diff --git a/python/libavg/widget/keyboard.py b/python/libavg/widget/keyboard.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/mediacontrol.py b/python/libavg/widget/mediacontrol.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/scrollarea.py b/python/libavg/widget/scrollarea.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/skin.py b/python/libavg/widget/skin.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/libavg/widget/slider.py b/python/libavg/widget/slider.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/scripts/avg_audioplayer b/python/scripts/avg_audioplayer
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/python/scripts/avg_checkcirclespeed b/python/scripts/avg_checkcirclespeed
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2020 Ulrich von Zadow
+# Copyright (C) 2003-2021 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public