- One last attempt to find a workaround fix for #187

Main.py

@@ -259,6 +259,9 @@ def __init__(self, parent):
 
     def generate_unique_id(self):
         unique_id = self.current_menu_id
+        while unique_id == wx.ID_EXIT or unique_id == wx.ID_ABOUT:
+            self.current_menu_id += 1
+            unique_id = self.current_menu_id
         self.current_menu_id += 1
         return unique_id
 
@@ -1229,7 +1232,7 @@ def _build_menu_bar(self):
         # seperator
         file_menu.AppendSeparator()
         # Exit Menu
-        exit_item = file_menu.Append(wx.ID_ANY, "E&xit\tCtrl-Q", "Exit PixelFlasher")
+        exit_item = file_menu.Append(wx.ID_EXIT, "E&xit\tCtrl-Q", "Exit PixelFlasher")
         exit_item.SetBitmap(images.exit_24.GetBitmap())
         self.Bind(wx.EVT_MENU, self._on_exit_app, exit_item)
         # Set the ID of the "Exit" menu item on macOS
@@ -1560,7 +1563,7 @@ def _build_menu_bar(self):
         # seperator
         help_menu.AppendSeparator()
         # About
-        about_item = help_menu.Append(wx.ID_ANY, '&About PixelFlasher', 'About')
+        about_item = help_menu.Append(wx.ID_ABOUT, '&About PixelFlasher', 'About')
         about_item.SetBitmap(images.about_24.GetBitmap())
         self.Bind(wx.EVT_MENU, self._on_help_about, about_item)
 

build-on-mac.spec

@@ -28,6 +28,6 @@ exe = EXE(pyz,
           icon='images/icon-dark-256.icns')
 app = BUNDLE(exe,
              name='PixelFlasher.app',
-             version='6.9.2.1',
+             version='6.9.2.2',
              icon='./images/icon-dark-256.icns',
              bundle_identifier='com.badabing.pixelflasher')

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 rm -rf build dist
-VERSION=6.9.2.1
+VERSION=6.9.2.2
 NAME="PixelFlasher"
 DIST_NAME="PixelFlasher"
 

constants.py

@@ -2,7 +2,7 @@
 
 APPNAME = 'PixelFlasher'
 CONFIG_FILE_NAME = 'PixelFlasher.json'
-VERSION = '6.9.2.1'
+VERSION = '6.9.2.2'
 SDKVERSION = '33.0.3'
 MAIN_WIDTH = 1400
 MAIN_HEIGHT = 1040

modules.py

@@ -828,8 +828,8 @@ def process_file(self, file_type):
                     self.toast("Process action", f"Nothing to extract from {file_type}")
                     return
 
-                print(f"Extracting {boot_file_name} from {image_file_path} ...")
-                puml(f":Extract {boot_file_name};\n")
+                print(f"Extracting {files_to_extract} from {image_file_path} ...")
+                puml(f":Extract {files_to_extract};\n")
                 theCmd = f"\"{path_to_7z}\" x -bd -y -o\"{tmp_dir_full}\" \"{image_file_path}\" {files_to_extract}"
                 debug(f"{theCmd}")
                 res = run_shell(theCmd)

windows-metadata.yaml

@@ -1,6 +1,6 @@
 # https://github.com/DudeNr33/pyinstaller-versionfile
 # create-version-file windows-metadata.yaml --outfile windows-version-info.txt
-Version: 6.9.2.1
+Version: 6.9.2.2
 FileDescription: PixelFlasher
 InternalName: PixelFlasher
 OriginalFilename: PixelFlasher.exe

windows-version-info.txt

@@ -7,8 +7,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0. Must always contain 4 elements.
-    filevers=(6,9,2,1),
-    prodvers=(6,9,2,1),
+    filevers=(6,9,2,2),
+    prodvers=(6,9,2,2),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u''),
         StringStruct(u'FileDescription', u'PixelFlasher'),
-        StringStruct(u'FileVersion', u'6.9.2.1'),
+        StringStruct(u'FileVersion', u'6.9.2.2'),
         StringStruct(u'InternalName', u'PixelFlasher'),
         StringStruct(u'LegalCopyright', u''),
         StringStruct(u'OriginalFilename', u'PixelFlasher.exe'),
         StringStruct(u'ProductName', u'PixelFlasher'),
-        StringStruct(u'ProductVersion', u'6.9.2.1')])
+        StringStruct(u'ProductVersion', u'6.9.2.2')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]