fix compatibility to wxPython>=4.1.1

CHANGELOG

@@ -7,7 +7,7 @@ License: GPL3
 Change Log:
 
 +------------------------------------+
-Tue, 08 Feb 2024 V.5.0.5
+Tue, 16 Feb 2024 V.5.0.5
 
   * Fixed `ValueError: could not convert string to float: 'N/A'` given by the
     `get_milliseconds()` function.
@@ -25,6 +25,12 @@ Tue, 08 Feb 2024 V.5.0.5
     close the app (see #260 and #113 issues).
   * Fixed small bug in preferences dialog causing FFmpeg binaries to be set
     incorrectly (self.settings['ffprobe_cmd'] > self.settings['ffplay_cmd']) .
+  * Removed backwards compatibility with wxPython < 4.1.0 .
+  * Minimun requirements fixed to `wxPython >= 4.1.0`, `Python >= 3.7`,
+    `FFmpeg >= 5.1.4` .
+  * New versions of wxPython support svg images for icons well, so most png
+    icons are removed.
+  * Fixed FFmpeg warns: `-vsync arg is deprecated, use fps_mode`
 
 
 +------------------------------------+

INSTALL

@@ -5,7 +5,7 @@ BASE DEPENDENCIES
 
     Required:
         - Python >=3.7.0
-        - wxPython-Phoenix >=4.0.7
+        - wxPython-Phoenix >=4.1.1
         - PyPubSub
         - requests
         - FFmpeg (with ffplay and ffprobe) >=5.1

README.md

@@ -30,7 +30,7 @@ each operating system.
 
 ### Requirements
 - **[Python >= 3.7.0](https://www.python.org/)**
-- **[wxPython-Phoenix >= 4.0.7](https://wxpython.org/)**
+- **[wxPython-Phoenix >= 4.1.1](https://wxpython.org/)**
 - **[PyPubSub >= 4.0.3](https://pypi.org/project/PyPubSub/)**
 - **[requests >= 2.21.0](https://pypi.org/project/requests/)**
 - **[ffmpeg >=5.1](https://ffmpeg.org/)**

TODO

@@ -7,31 +7,14 @@ URGENCY: to do soon
 URGENCY: high
 --------------
 
-- FFmpeg warns: for the new versions `-vsync` arg is deprecated, use `fps_mode`.
-  This is related to `video_to_sequences.py`, `concatenete.py`, but for
-  backwards compatibility reasons I will keep the  '-vsync' argument for a
-  while longer because fps_mode does not work with old versions of FFmpeg.
-  So, vsync's warning is just a warning and still works with the new versions.
-
 - A new implementation is needed for embedding subtitles. The infrastructure
   could be organized on a new A/V Conversions tab or as an independent tool
   that can be called up from the main menu (Home).
 
 ---------------
 URGENCY: medium
 ----------------
-- If you plan to refactor code and make it compatible only for wx.Python>=4.1.1:
-  - then erase `TestListCtrl` class on `formatcode.py` file.
-  - Also check all code that starts with `wx.version()` keywords.
-  - Erase these block codes along any py-files:
-
-        try:
-            from wx.svg import SVGimage
-        except ModuleNotFoundError:
-            pass
 
-  However, note that these operations leads to make Videomass code incompatible
-  for wxPython4.0.7
 
 -------------
 URGENCY: low (New implementations)

debian/changelog

@@ -15,8 +15,15 @@ videomass (5.0.5-1) UNRELEASED; urgency=medium
   * [YouTube Downloader] Saves the width of the format code columns when you
     close the app (see #260 and #113 issues).
   * Fixed small bug in preferences dialog causing FFmpeg binaries to be set
-    incorrectly self.settings['ffprobe_cmd'] > self.settings['ffplay_cmd']) .
- -- Gianluca Pernigotto <[email protected]>  Thu, 08 Feb 2024 00:15:00 +0200
+    incorrectly (self.settings['ffprobe_cmd'] > self.settings['ffplay_cmd']) .
+  * Removed backwards compatibility with wxPython < 4.1.0 .
+  * Minimun requirements fixed to `wxPython >= 4.1.0`, `Python >= 3.7`,
+    `FFmpeg >= 5.1.4` .
+  * New versions of wxPython support svg images for icons well, so most png
+    icons are removed.
+  * Fixed FFmpeg warns: `-vsync arg is deprecated, use fps_mode`
+
+ -- Gianluca Pernigotto <[email protected]>  Fri, 16 Feb 2024 00:29:00 +0200
 
 videomass (5.0.4-1) UNRELEASED; urgency=high
 

setup.py

@@ -44,7 +44,7 @@ def source_build():
 
     if 'sdist' in sys.argv or 'bdist_wheel' in sys.argv:
 
-        inst_req = ["wxpython>=4.0.7; platform_system=='Windows' or "
+        inst_req = ["wxpython>=4.1.1; platform_system=='Windows' or "
                     "platform_system=='Darwin'",
                     "PyPubSub>=4.0.3",
                     "yt_dlp>=2021.9.2",
@@ -60,7 +60,7 @@ def source_build():
         long_description_ct = 'text/markdown'
 
     else:  # e.g. to make a Debian source package, include wxpython.
-        inst_req = ["wxpython>=4.0.7",
+        inst_req = ["wxpython>=4.1.1",
                     "PyPubSub>=4.0.3",
                     "requests>=2.21.0",
                     ]

videomass/gui_app.py

@@ -29,10 +29,7 @@
 from shutil import which, rmtree
 import builtins
 import wx
-try:
-    from wx.svg import SVGimage
-except ModuleNotFoundError:
-    pass
+from wx.svg import SVGimage
 from videomass.vdms_sys.argparser import arguments
 from videomass.vdms_sys.configurator import DataSource
 from videomass.vdms_sys import app_const as appC

videomass/vdms_main/main_frame.py

@@ -6,7 +6,7 @@
 Author: Gianluca Pernigotto <[email protected]>
 Copyleft - 2024 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Feb.07.2024
+Rev: Feb.13.2024
 Code checker: flake8, pylint
 
 This file is part of Videomass.
@@ -1241,26 +1241,15 @@ def videomass_tool_bar(self):
                     int(self.appdata['toolbarsize']))
         self.toolbar.SetToolBitmapSize(bmp_size)
 
-        if 'wx.svg' in sys.modules:  # available only in wx version 4.1 to up
-            bmpback = get_bmp(self.icons['previous'], bmp_size)
-            bmpnext = get_bmp(self.icons['next'], bmp_size)
-            bmpinfo = get_bmp(self.icons['fileproperties'], bmp_size)
-            bmpconv = get_bmp(self.icons['startconv'], bmp_size)
-            bmpstop = get_bmp(self.icons['stop'], bmp_size)
-            bmphome = get_bmp(self.icons['home'], bmp_size)
-            bmpclear = get_bmp(self.icons['cleanup'], bmp_size)
-            bmpplay = get_bmp(self.icons['play'], bmp_size)
-
-        else:
-            bmpback = wx.Bitmap(self.icons['previous'], wx.BITMAP_TYPE_ANY)
-            bmpnext = wx.Bitmap(self.icons['next'], wx.BITMAP_TYPE_ANY)
-            bmpinfo = wx.Bitmap(self.icons['fileproperties'],
-                                wx.BITMAP_TYPE_ANY)
-            bmpconv = wx.Bitmap(self.icons['startconv'], wx.BITMAP_TYPE_ANY)
-            bmpstop = wx.Bitmap(self.icons['stop'], wx.BITMAP_TYPE_ANY)
-            bmphome = wx.Bitmap(self.icons['home'], wx.BITMAP_TYPE_ANY)
-            bmpclear = wx.Bitmap(self.icons['cleanup'], wx.BITMAP_TYPE_ANY)
-            bmpplay = wx.Bitmap(self.icons['play'], wx.BITMAP_TYPE_ANY)
+        # available only in wx version 4.1 to up
+        bmpback = get_bmp(self.icons['previous'], bmp_size)
+        bmpnext = get_bmp(self.icons['next'], bmp_size)
+        bmpinfo = get_bmp(self.icons['fileproperties'], bmp_size)
+        bmpconv = get_bmp(self.icons['startconv'], bmp_size)
+        bmpstop = get_bmp(self.icons['stop'], bmp_size)
+        bmphome = get_bmp(self.icons['home'], bmp_size)
+        bmpclear = get_bmp(self.icons['cleanup'], bmp_size)
+        bmpplay = get_bmp(self.icons['play'], bmp_size)
 
         self.toolbar.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL,
                                      wx.NORMAL, 0, ""))

videomass/vdms_panels/av_conversions.py

@@ -6,7 +6,7 @@
 Author: Gianluca Pernigotto <[email protected]>
 Copyleft - 2024 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Feb.18.2023
+Rev: Feb.13.2024
 Code checker: flake8, pylint
 
 This file is part of Videomass.
@@ -146,37 +146,20 @@ def __init__(self, parent, appdata, icons):
         Collects all the values of the
         GUI controls used in this panel
         """
-        if 'wx.svg' in sys.modules:  # only available in wx version 4.1 to up
-            bmpplay = get_bmp(icons['preview'], ((16, 16)))
-            bmpapreview = get_bmp(icons['preview_audio'], ((16, 16)))
-            self.bmpreset = get_bmp(icons['clear'], ((16, 16)))
-            bmpresize = get_bmp(icons['scale'], ((16, 16)))
-            bmpcrop = get_bmp(icons['crop'], ((16, 16)))
-            bmprotate = get_bmp(icons['rotate'], ((16, 16)))
-            bmpdeinterlace = get_bmp(icons['deinterlace'], ((16, 16)))
-            bmpdenoiser = get_bmp(icons['denoiser'], ((16, 16)))
-            bmpanalyzes = get_bmp(icons['volanalyze'], ((16, 16)))
-            bmpasettings = get_bmp(icons['settings'], ((16, 16)))
-            bmppeaklevel = get_bmp(icons['audiovolume'], ((16, 16)))
-            bmpstab = get_bmp(icons['stabilizer'], ((16, 16)))
-            bmpsaveprf = get_bmp(icons['addtoprst'], ((16, 16)))
-            bmpcoloreq = get_bmp(icons['coloreq'], ((16, 16)))
-        else:
-            bmpplay = wx.Bitmap(icons['preview'], wx.BITMAP_TYPE_ANY)
-            bmpapreview = wx.Bitmap(icons['preview_audio'], wx.BITMAP_TYPE_ANY)
-            self.bmpreset = wx.Bitmap(icons['clear'], wx.BITMAP_TYPE_ANY)
-            bmpresize = wx.Bitmap(icons['scale'], wx.BITMAP_TYPE_ANY)
-            bmpcrop = wx.Bitmap(icons['crop'], wx.BITMAP_TYPE_ANY)
-            bmprotate = wx.Bitmap(icons['rotate'], wx.BITMAP_TYPE_ANY)
-            bmpdeinterlace = wx.Bitmap(icons['deinterlace'],
-                                       wx.BITMAP_TYPE_ANY)
-            bmpdenoiser = wx.Bitmap(icons['denoiser'], wx.BITMAP_TYPE_ANY)
-            bmpanalyzes = wx.Bitmap(icons['volanalyze'], wx.BITMAP_TYPE_ANY)
-            bmpasettings = wx.Bitmap(icons['settings'], wx.BITMAP_TYPE_ANY)
-            bmppeaklevel = wx.Bitmap(icons['audiovolume'], wx.BITMAP_TYPE_ANY)
-            bmpstab = wx.Bitmap(icons['stabilizer'], wx.BITMAP_TYPE_ANY)
-            bmpsaveprf = wx.Bitmap(icons['addtoprst'], wx.BITMAP_TYPE_ANY)
-            bmpcoloreq = wx.Bitmap(icons['coloreq'], wx.BITMAP_TYPE_ANY)
+        bmpplay = get_bmp(icons['preview'], ((16, 16)))
+        bmpapreview = get_bmp(icons['preview_audio'], ((16, 16)))
+        self.bmpreset = get_bmp(icons['clear'], ((16, 16)))
+        bmpresize = get_bmp(icons['scale'], ((16, 16)))
+        bmpcrop = get_bmp(icons['crop'], ((16, 16)))
+        bmprotate = get_bmp(icons['rotate'], ((16, 16)))
+        bmpdeinterlace = get_bmp(icons['deinterlace'], ((16, 16)))
+        bmpdenoiser = get_bmp(icons['denoiser'], ((16, 16)))
+        bmpanalyzes = get_bmp(icons['volanalyze'], ((16, 16)))
+        bmpasettings = get_bmp(icons['settings'], ((16, 16)))
+        bmppeaklevel = get_bmp(icons['audiovolume'], ((16, 16)))
+        bmpstab = get_bmp(icons['stabilizer'], ((16, 16)))
+        bmpsaveprf = get_bmp(icons['addtoprst'], ((16, 16)))
+        bmpcoloreq = get_bmp(icons['coloreq'], ((16, 16)))
 
         # Args settings definition
         self.opt = {
@@ -207,10 +190,7 @@ def __init__(self, parent, appdata, icons):
         elif self.appdata['ostype'] == 'Darwin':
             sizepancodevideo = (300, 700)
         else:
-            if int(''.join(wx.version().split()[0].split('.'))) >= 410:
-                sizepancodevideo = (300, 700)
-            else:
-                sizepancodevideo = (350, 700)
+            sizepancodevideo = (300, 700)
 
         wx.Panel.__init__(self, parent, -1)
         # ------------ widgets

videomass/vdms_panels/choose_topic.py

@@ -6,7 +6,7 @@
 Author: Gianluca Pernigotto <[email protected]>
 Copyleft - 2024 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Jan.21.2023
+Rev: Feb.13.2024
 Code checker: flake8, pylint
 
 This file is part of Videomass.
@@ -49,24 +49,12 @@ def __init__(self, parent, OS):
         self.oS = OS
         version = current_release()
 
-        if 'wx.svg' in sys.modules:  # available only in wx version 4.1 to up
-            bmpAVconv = get_bmp(self.icons['A/V-Conv'], ((48, 48)))
-            bmpPrstmng = get_bmp(self.icons['presets_manager'], ((48, 48)))
-            bmpYdl = get_bmp(self.icons['youtube'], ((48, 48)))
-            bmpConcat = get_bmp(self.icons['concatenate'], ((48, 48)))
-            bmpSlideshow = get_bmp(self.icons['slideshow'], ((48, 48)))
-            bmpTopictures = get_bmp(self.icons['videotopictures'], ((48, 48)))
-        else:
-            bmpAVconv = wx.Bitmap(self.icons['A/V-Conv'], wx.BITMAP_TYPE_ANY)
-            bmpPrstmng = wx.Bitmap(self.icons['presets_manager'],
-                                   wx.BITMAP_TYPE_ANY)
-            bmpYdl = wx.Bitmap(self.icons['youtube'], wx.BITMAP_TYPE_ANY)
-            bmpConcat = wx.Bitmap(self.icons['concatenate'],
-                                  wx.BITMAP_TYPE_ANY)
-            bmpSlideshow = wx.Bitmap(self.icons['slideshow'],
-                                     wx.BITMAP_TYPE_ANY)
-            bmpTopictures = wx.Bitmap(self.icons['videotopictures'],
-                                      wx.BITMAP_TYPE_ANY)
+        bmpAVconv = get_bmp(self.icons['A/V-Conv'], ((48, 48)))
+        bmpPrstmng = get_bmp(self.icons['presets_manager'], ((48, 48)))
+        bmpYdl = get_bmp(self.icons['youtube'], ((48, 48)))
+        bmpConcat = get_bmp(self.icons['concatenate'], ((48, 48)))
+        bmpSlideshow = get_bmp(self.icons['slideshow'], ((48, 48)))
+        bmpTopictures = get_bmp(self.icons['videotopictures'], ((48, 48)))
 
         wx.Panel.__init__(self, parent, -1, style=wx.TAB_TRAVERSAL)
 

videomass/vdms_panels/concatenate.py

@@ -262,7 +262,7 @@ def on_start(self):
                                f"{self.spin_pict.GetValue()}"
                                )
             textstr.append(f"file '{self.parent.file_src[-1]}'")
-            self.args = (f'"{ftext}" -vsync vfr -pix_fmt yuv420p '
+            self.args = (f'"{ftext}" -fps_mode vfr -pix_fmt yuv420p '
                          f'-profile:v baseline -map 0:v? -map_chapters 0 '
                          f'-map 0:s? -map 0:a? -map_metadata 0'
                          )

videomass/vdms_panels/presets_manager.py

@@ -7,7 +7,7 @@
 Author: Gianluca Pernigotto <[email protected]>
 Copyleft - 2024 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Feb.07.2024
+Rev: Feb.13.2024
 Code checker: flake8, pylint
 
 This file is part of Videomass.
@@ -80,16 +80,11 @@ def __init__(self, parent, appdata, icons):
         "Output_extension": "",
         }
         """
-        if 'wx.svg' in sys.modules:  # available only in wx version 4.1 to up
-            bmpnewprf = get_bmp(icons['profile_add'], ((16, 16)))
-            bmpeditprf = get_bmp(icons['profile_edit'], ((16, 16)))
-            bmpdelprf = get_bmp(icons['profile_del'], ((16, 16)))
-            bmpcopyprf = get_bmp(icons['profile_copy'], ((16, 16)))
-        else:
-            bmpnewprf = wx.Bitmap(icons['profile_add'], wx.BITMAP_TYPE_ANY)
-            bmpeditprf = wx.Bitmap(icons['profile_edit'], wx.BITMAP_TYPE_ANY)
-            bmpdelprf = wx.Bitmap(icons['profile_del'], wx.BITMAP_TYPE_ANY)
-            bmpcopyprf = wx.Bitmap(icons['profile_copy'], wx.BITMAP_TYPE_ANY)
+        bmpnewprf = get_bmp(icons['profile_add'], ((16, 16)))
+        bmpeditprf = get_bmp(icons['profile_edit'], ((16, 16)))
+        bmpdelprf = get_bmp(icons['profile_del'], ((16, 16)))
+        bmpcopyprf = get_bmp(icons['profile_copy'], ((16, 16)))
+
         self.appdata = appdata
         self.array = []  # Parameters of the selected profile
         self.src_prst = os.path.join(self.appdata['srcpath'], 'presets')

videomass/vdms_panels/sequence_to_video.py

@@ -6,7 +6,7 @@
 Author: Gianluca Pernigotto <[email protected]>
 Copyleft - 2024 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Feb.09.2023
+Rev: Feb.13.2024
 Code checker: flake8, pylint
 
 This file is part of Videomass.
@@ -101,14 +101,9 @@ def __init__(self, parent, icons):
                     "Interval": "", "Clock": "00:00:00:000",
                     "Preinput": "1/0", "Fps": ["fps=10,", "10"],
                     }
-        if 'wx.svg' in sys.modules:  # available only in wx version 4.1 to up
-            bmpresize = get_bmp(icons['scale'], ((16, 16)))
-            bmpatrack = get_bmp(icons['atrack'], ((16, 16)))
-            self.bmpreset = get_bmp(icons['clear'], ((16, 16)))
-        else:
-            bmpresize = wx.Bitmap(icons['scale'], wx.BITMAP_TYPE_ANY)
-            bmpatrack = wx.Bitmap(icons['atrack'], wx.BITMAP_TYPE_ANY)
-            self.bmpreset = wx.Bitmap(icons['clear'], wx.BITMAP_TYPE_ANY)
+        bmpresize = get_bmp(icons['scale'], ((16, 16)))
+        bmpatrack = get_bmp(icons['atrack'], ((16, 16)))
+        self.bmpreset = get_bmp(icons['clear'], ((16, 16)))
 
         wx.Panel.__init__(self, parent, -1, style=wx.BORDER_THEME)
         sizer = wx.BoxSizer(wx.VERTICAL)