From 08499625f53ac583bb10b4ce09ddd66aa029b219 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Wed, 12 May 2021 14:41:06 +0100
Subject: [PATCH] 5.0.0: Include --reset-ui .bat, and mention killswitches docs
---
ChangeLog.md | 6 ++++++
EDMarketConnector.wxs | 4 ++++
setup.py | 3 +--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 52c22958..1ccdcd91 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -75,6 +75,9 @@ Changes and Enhancements
The intention is this can be used if you've lost sight of the main window
due to tweaking these options.
+
+ There is a new file `EDMarketConnector - reset-ui.bat` to make utilising
+ this easy on Windows.
* New CL arg for EDMarketConnector.exe `--force-edmc-protocol`.
This is really only of use to core developers (its purpose being to force
@@ -118,6 +121,9 @@ Changes and Enhancements
If we ever have to use this we'll announce it clearly and endeavour to
get a fixed version of the program released ASAP. We will **NOT** be
using this merely to try and get some laggards to upgrade.
+
+ Plugin Developers: See [Killswitches.md](./docs/Killswitches.md) for more
+ information about this.
* Our logging code will make best efforts to still show class name and
other such fields if it has trouble finding any of the required data for
diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 67fa5366..c24a594f 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -239,6 +239,9 @@
<Component Id="EDMarketConnector_localserver_auth.bat" Guid="*">
<File KeyPath="yes" Source="SourceDir\EDMarketConnector - localserver-auth.bat" />
</Component>
+ <Component Id="EDMarketConnector_localserver_resetui.bat" Guid="*">
+ <File KeyPath="yes" Source="SourceDir\EDMarketConnector - reset-ui.bat" />
+ </Component>
<Component Id="gitversion" Guid="*">
<File KeyPath="yes" Source="SourceDir\.gitversion" />
</Component>
@@ -621,6 +624,7 @@
<ComponentRef Id="WinSparkle.dll" />
<ComponentRef Id="EDMarketConnector_TRACE.bat" />
<ComponentRef Id="EDMarketConnector_localserver_auth.bat" />
+ <ComponentRef Id="EDMarketConnector_localserver_resetui.bat" />
<ComponentRef Id="zh_CN.strings" />
<ComponentRef Id="auto.tcl" />
<ComponentRef Id="clock.tcl" />
diff --git a/setup.py b/setup.py
index 525dc313..372b4477 100755
--- a/setup.py
+++ b/setup.py
@@ -18,8 +18,6 @@ from os.path import exists, isdir, join
from tempfile import gettempdir
from typing import Any, Generator, Set
-import semantic_version
-
from config import (
appcmdname, applongname, appname, appversion, appversion_nobuild, copyright, git_shorthash_from_head, update_feed,
update_interval
@@ -223,6 +221,7 @@ elif sys.platform == 'win32':
f'{appname}.ico',
'EDMarketConnector - TRACE.bat',
'EDMarketConnector - localserver-auth.bat',
+ 'EDMarketConnector - reset-ui.bat',
]),
('L10n', [join('L10n', x) for x in os.listdir('L10n') if x.endswith('.strings')]),
('plugins', PLUGINS),