aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--.vs/ProjectSettings.json3
-rw-r--r--.vs/VSWorkspaceState.json7
-rw-r--r--.vs/eehph2/v15/.suobin0 -> 11264 bytes
-rw-r--r--.vs/slnx.sqlitebin0 -> 233472 bytes
-rw-r--r--inno/EEHPH2_installer.exebin16945022 -> 16949444 bytes
-rw-r--r--manual_setup.exebin0 -> 5393269 bytes
-rw-r--r--manual_setup/icon.icobin0 -> 31020 bytes
-rw-r--r--manual_setup/manual_setup.py19
-rw-r--r--setup.iss2
-rw-r--r--setup.py3
11 files changed, 35 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 6dc7749..1ef3492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ on_install_setup/__pycache__/
cleanup/build/
cleanup/dist/
cleanup/__pycache__/
+manual_setup/build/
+manual_setup/dist/
+manual_setup/__pycache__/
#stuff below here is a template
# Byte-compiled / optimized / DLL files
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..f8b4888
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+ "CurrentProjectSetting": null
+} \ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..c507a06
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+ "ExpandedNodes": [
+ ""
+ ],
+ "SelectedNode": "\\EEHPH2_app.py",
+ "PreviewInSolutionExplorer": false
+} \ No newline at end of file
diff --git a/.vs/eehph2/v15/.suo b/.vs/eehph2/v15/.suo
new file mode 100644
index 0000000..bc8131e
--- /dev/null
+++ b/.vs/eehph2/v15/.suo
Binary files differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..8a97df7
--- /dev/null
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git a/inno/EEHPH2_installer.exe b/inno/EEHPH2_installer.exe
index 7ff4104..638cc0d 100644
--- a/inno/EEHPH2_installer.exe
+++ b/inno/EEHPH2_installer.exe
Binary files differ
diff --git a/manual_setup.exe b/manual_setup.exe
new file mode 100644
index 0000000..2399c43
--- /dev/null
+++ b/manual_setup.exe
Binary files differ
diff --git a/manual_setup/icon.ico b/manual_setup/icon.ico
new file mode 100644
index 0000000..b81e427
--- /dev/null
+++ b/manual_setup/icon.ico
Binary files differ
diff --git a/manual_setup/manual_setup.py b/manual_setup/manual_setup.py
new file mode 100644
index 0000000..59fc2da
--- /dev/null
+++ b/manual_setup/manual_setup.py
@@ -0,0 +1,19 @@
+import os
+
+location = input("Please copy in the path of the installation directory: ")
+appdata = os.path.join(os.environ['ALLUSERSPROFILE'], "EEHPH2")
+
+try:
+ if not os.path.exists(appdata):
+ os.mkdir(appdata)
+
+ file = open(os.path.join(appdata, "location.txt"), "w")
+ file.write(location)
+ file.close()
+
+ print("location saved to %s. You can change it by running this program again." % location)
+
+except PermissionError as e:
+ print("Failed because of insufficeint permissions. Try running as admin. Error:[%s]" % e)
+
+input("Press any key to close...") \ No newline at end of file
diff --git a/setup.iss b/setup.iss
index c5acb67..81a4e3f 100644
--- a/setup.iss
+++ b/setup.iss
@@ -1,5 +1,5 @@
#define MyAppName "EEHPH Photo Viewer v2"
-#define MyAppVersion "2.2.5"
+#define MyAppVersion "2.2.6"
#define MyAppPublisher "AE Computer Vision"
#define MyAppURL "https://aecomputervision.blogspot.co.uk/"
#define MyAppExeName "EEHPH2.exe"
diff --git a/setup.py b/setup.py
index 733a66d..c29675b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ include_files = [
"LICENSE.txt",
"on_install_setup.exe",
"cleanup.exe",
+ "manual_setup.exe",
"EEHPH2_app.py",
r"C:\Program Files (x86)\Python36_64\DLLs\tcl86t.dll",
r"C:\Program Files (x86)\Python36_64\DLLs\tk86t.dll",
@@ -27,7 +28,7 @@ exec_ = Executable(
setup(
name = "EEHPH Photo Viewer v2",
options = {"build_exe": {"packages": packages, "include_files": include_files}},
- version = "2.2.5",
+ version = "2.2.6",
description = "EEHPH2 by AE computer vision",
author = "Edward Attenborough",
executables = [exec_]