ZIP to ZXX merging added

EricGoldsteinNz · Jul 1, 2023 · b433cae · b433cae
1 parent 6599c8b
commit b433cae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set ver=0.1.1
+set ver=0.2.3
 rem build script for the distributable versions of tadpole
 if not exist "venv\" (
     py -m venv venv
@@ -10,13 +10,13 @@ if not exist "venv\Lib\site-packages\PyInstaller" (
 if not exist "venv\Lib\site-packages\PIL" (
     venv\Scripts\python -m pip install Pillow
 )
-pyinstaller.exe --onefile -F tadpole.py --icon frog.ico --clean --noconsole --version-file versioninfo
+pyinstaller.exe tadpole.py --onefile -F --icon frog.ico --clean --noconsole --version-file versioninfo
 copy README.md "dist\readme.md"
 copy LICENSE "dist\license.txt"
 copy tadpole.py "dist\tadpole.py"
 copy frogtool.py "dist\frogtool.py"
 copy tadpole_functions.py "dist\tadpole_functions.py"
 cd dist
-tar -a -cf tadpole-%ver%-win.zip tadpole.exe readme.txt license.txt
-tar -a -cf tadpole-%ver%-py.zip tadpole.py frogtool.py tadpole_functions.py readme.txt license.txt
+tar -a -cf tadpole-%ver%-win.zip tadpole.exe "readme.md" license.txt
+tar -a -cf tadpole-%ver%-py.zip tadpole.py frogtool.py tadpole_functions.py "readme.md" license.txt
 cd ../
diff --git a/tadpole.py b/tadpole.py
@@ -26,7 +26,8 @@ def RunFrogTool():
             QMessageBox.about(window,"Result",result)
     except frogtool.StopExecution:
         pass
-
+    loadROMsToTable()
+
 def reloadDriveList():
     available_drives = ['%s:' % d for d in string.ascii_uppercase if os.path.exists('%s:' % d)]
     window.combobox_drive.clear()
@@ -45,8 +46,8 @@ def loadROMsToTable():
         for i,f in enumerate(files):
             filesize = os.path.getsize(f"{roms_path}/{f}")
             humanReadableFileSize = "ERROR"
-            if filesize > 1024^2: #More than 1 Megabyte
-                humanReadableFileSize = f"{round(filesize/(1024^2),2)} MB"
+            if filesize > 1024*1024: #More than 1 Megabyte
+                humanReadableFileSize = f"{round(filesize/(1024*1024),2)} MB"
             elif filesize > 1024: #More than 1 Kilobyte
                 humanReadableFileSize = f"{round(filesize/1024,2)} KB"
             else: #Less than 1 Kilobyte
@@ -189,11 +190,12 @@ def UnderDevelopmentPopup(self):
 available_consoles_placeholder = "???"
 window.combobox_console.addItem(QIcon(),available_consoles_placeholder,available_consoles_placeholder)
 window.combobox_console.clear()
+#Add ALL to the list to add this fucntionality from frogtool
+window.combobox_console.addItem(QIcon(),"ALL","ALL")
 for console in frogtool.systems.keys():
     window.combobox_console.addItem(QIcon(),console,console)
 
-#Add ALL to the list to add this fucntionality from frogtool
-window.combobox_console.addItem(QIcon(),"ALL","ALL")
+
 
 
 

diff --git a/versioninfo b/versioninfo
@@ -15,12 +15,12 @@ VSVersionInfo(
         u'080904B0',
         [StringStruct(u'CompanyName', u'EricGoldstein'),
         StringStruct(u'FileDescription', u'tadpole'),
-        StringStruct(u'FileVersion', u'0.2.2'),
+        StringStruct(u'FileVersion', u'0.2.3'),
         StringStruct(u'InternalName', u'tadpole'),
         StringStruct(u'LegalCopyright', u'by EricGoldstein 2023'),
         StringStruct(u'OriginalFilename', u'tadpole.exe'),
         StringStruct(u'ProductName', u'tadpole'),
-        StringStruct(u'ProductVersion', u'0.2.2')])
+        StringStruct(u'ProductVersion', u'0.2.3')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [2057, 1200])])
   ]