v1.0.25

README.md

@@ -22,6 +22,7 @@ Tonino Resources
 
 Version History
 ---------------
+- v1.0.25 Adds Windows dark mode support
 - v1.0.24 Adds Agtron default scale support
 - v1.0.23 Adds support for M1 Macs and logging
 - v1.0.22 Adds PRECAL support<br>(last version supporting macOS 10.13 and Windows 8)</br>

src/build-mac3.sh

@@ -21,14 +21,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export MACOSX_DEPLOYMENT_TARGET=10.15
+export MACOSX_DEPLOYMENT_TARGET=11.0
 export PYTHON=/Library/Frameworks/Python.framework/Versions/3.11
 
 export PYTHONPATH=$PYTHON/lib/python3.11/site-packages
 
 export PATH=$PYTHON/bin:$PYTHON:/lib:$PATH
 
-export QT_PATH=~/Qt/6.4.1/macos
+export QT_PATH=~/Qt/6.5.1/macos
 export PATH=$PATH:$QT_PATH/bin:$QT_PATH/lib
 #export DYLD_FRAMEWORK_PATH=$QT_PATH/lib # this works only if Qt version of PyQt is the same as in QT_PATH
 

src/conf/Info.plist

@@ -38,19 +38,19 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.24</string>
+	<string>1.0.25</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>Tonino 1.0.24</string>
+	<string>Tonino 1.0.25</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSArchitecturePriority</key>
 	<string>x86_64</string>
 	<key>LSHasLocalizedDisplayName</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
+	<string>11.0</string>
 	<key>LSMultipleInstancesProhibited</key>
 	<string>false</string>
 	<key>LSPrefersPPC</key>

src/lib/__init__.py

@@ -21,4 +21,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.0.24'
+__version__ = '1.0.25'

src/lib/main.py

@@ -2267,7 +2267,9 @@ def closeEvent(self, event:QCloseEvent | None) -> None:
 app.setApplicationName('Tonino')                  #needed by QSettings() to store windows geometry in operating system
 app.setOrganizationName('myTonino')               #needed by QSettings() to store windows geometry in operating system
 app.setOrganizationDomain('my-tonino.com')        #needed by QSettings() to store windows geometry in operating system
-if platform.system() == 'Windows':
+if platform.system().startswith('Windows'):
+    # on Windows we use the Fusion style which supports the dark mode
+    app.setStyle('Fusion')
     app.setWindowIcon(QIcon('tonino.png'))
     if resources.main_is_frozen():
         try:

src/requirements-win.txt

@@ -1,4 +1,4 @@
-pyinstaller==5.11.0
+pyinstaller==5.12.0
 pyserial==3.5
 pyyaml==6.0
 numpy==1.24.3

src/setup-install3-pi.nsi

@@ -1,7 +1,7 @@
 ;
 ; setup-install.nsi
 ;
-; Copyright (c) 2016, Paul Holleis, Marko Luther
+; Copyright (c) 2023, Paul Holleis, Marko Luther
 ; All rights reserved.
 ;
 ;
@@ -95,7 +95,7 @@ RequestExecutionLevel admin
 !define pyinstallerOutputDir 'dist/tonino'
 !define PRODUCT_NAME "Tonino"
 !define PRODUCT_EXE "tonino.exe"
-!define PRODUCT_VERSION "1.0.24.0"
+!define PRODUCT_VERSION "1.0.25.0"
 !define PRODUCT_PUBLISHER "Marko Luther, Paul Holleis"
 !define PRODUCT_WEB_SITE "http://my-tonino.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"
@@ -236,7 +236,7 @@ FunctionEnd
 Function un.onInit
 
     IfSilent +3
-        MessageBox MB_ICONQUESTION|MB_YESNO|MB_TOPMOST "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+        MessageBox MB_ICONQUESTION|MB_YESNO|MB_TOPMOST "Are you sure you want to remove $(^Name) and all of its components?" IDYES +2
         Abort
     HideWindow
 
@@ -289,7 +289,8 @@ Section Uninstall
   RMDir /r "$INSTDIR\scipy.libs"
   RMDir /r "$INSTDIR\altgraph-0.17.2.dist-info"
   RMDir /r "$INSTDIR\kiwisolver"
-  RMDir /r "$INSTDIR\matplotlib"
+  RMDir /r "$INSTDIR\matplotlib"
+  RMDir /r "$INSTDIR\matplotlib.libs"
   RMDir /r "$INSTDIR\numpy"
   RMDir /r "$INSTDIR\PIL"
   RMDir /r "$INSTDIR\pyinstaller-5.3.dist-info"