Merge branch 'fix/734-revert-gdiscaling' into main

ChangeLog.md

@@ -1,6 +1,12 @@
 This is the master changelog for Elite Dangerous Market Connector.  Entries are in reverse chronological order (latest first).
 ---
 
+Release 4.1.2
+===
+
+* Minor fix to EDMC.py to revert broken logic trying to detect when there is
+  neither commodities nor outfitting data for a station.
+  
 Release 4.1.1
 ===
 

EDMC.py

@@ -300,7 +300,7 @@ sys.path: {sys.path}'''
                 sys.exit(EXIT_LAGGING)
 
             # Ignore possibly missing shipyard info
-            elif not data['lastStarport'].get('commodities') or data['lastStarport'].get('modules'):
+            elif not (data['lastStarport'].get('commodities') or data['lastStarport'].get('modules')):
                 logger.error("No commodities or outfitting (modules) in CAPI data")
                 return
 

EDMarketConnector.manifest

@@ -23,10 +23,6 @@
 			<!-- Declare that we want to use the UTF-8 code page -->
 			<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
 		</asmv3:windowsSettings>
-		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">
-			<!-- gdiScaling needs to be under the 2017 schema -->
-			<gdiScaling>true</gdiScaling>
-		</asmv3:windowsSettings>
 	</asmv3:application>
 	<dependency>
 	</dependency>

config.py

@@ -13,7 +13,7 @@ appcmdname = 'EDMC'
 # appversion **MUST** follow Semantic Versioning rules:
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
-appversion = '4.1.1'  #-rc1+a872b5f'
+appversion = '4.1.2'  #-rc1+a872b5f'
 # For some things we want appversion without (possible) +build metadata
 appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
 copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'

edmarketconnector.xml

@@ -168,11 +168,35 @@
 		<!-- Windows -->
 
 		<item>
-			<title>Release 4.1.0</title>
+			<title>Release 4.1.1</title>
 			<description>
 				<![CDATA[
 <style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
 
+<h2>Release 4.1.2</h2>
+<ul>
+<li>Minor fix to EDMC.py to revert broken logic trying to detect when there is
+neither commodities nor outfitting data for a station.</li>
+</ul>
+
+<h2>Release 4.1.1</h2>
+<p>This release should get the program running again for everyone who had issues
+with 4.1.0.</p>
+<ul>
+<li>
+<p>Catch any exception when we try to set UTF-8 encoding.  We'll log where this
+fails but the program should continue running.</p>
+</li>
+<li>
+<p>The use of the tkinter.filedialog code is now contingent on a UTF-8
+encoding being set.  If it isn't then we'll revert to the previous
+non-tkinter file dialog code.  The older OSes that can't handle a UTF-8
+encoding will get that slightly worse file dialog (that was previously
+always the case before 4.1.0).  Everyone else gets to enjoy the more up to
+date file dialog with all the shortcuts etc.</p>
+</li>
+</ul>
+
 <h2>Release 4.1.0</h2>
 <p>This release contains the result of a lot of code cleanup on several files
 and the addition of a proper logging paradigm, which should aid us in tracking
@@ -769,11 +793,11 @@ If any of your plugins are listed in that section then they will need updating,
 				]]>
 			</description>
 			<enclosure
-				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.0/EDMarketConnector_win_4.1.0.msi"
+				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.2/EDMarketConnector_win_4.1.2.msi"
 				sparkle:os="windows"
 				sparkle:installerArguments="/passive LAUNCH=yes"
-				sparkle:version="4.1.0"
+				sparkle:version="4.1.2"
-				length="11354112"
+				length="11362304"
 				type="application/octet-stream"
 			/>
 		</item>