Merge branch 'release/4.0.0' into master

adambonneruk · Sep 24, 2020 · 1b7382f · 1b7382f
2 parents af584ea + 2aa6bdb
commit 1b7382f
Show file tree

Hide file tree

Showing 47 changed files with 1,118 additions and 335 deletions.
diff --git a/.screenshot/docker.png b/.screenshot/docker.png
diff --git a/.screenshot/linux-about.png b/.screenshot/linux-about.png
diff --git a/.screenshot/linux-menu.png b/.screenshot/linux-menu.png
diff --git a/.screenshot/linux-options.png b/.screenshot/linux-options.png
diff --git a/.screenshot/linux-options_error.png b/.screenshot/linux-options_error.png
diff --git a/.screenshot/linux-options_warn.png b/.screenshot/linux-options_warn.png
diff --git a/.screenshot/linux.png b/.screenshot/linux.png
diff --git a/.screenshot/macos-about.png b/.screenshot/macos-about.png
diff --git a/.screenshot/macos-menu.png b/.screenshot/macos-menu.png
diff --git a/.screenshot/macos-options.png b/.screenshot/macos-options.png
diff --git a/.screenshot/macos.png b/.screenshot/macos.png
diff --git a/.screenshot/win10-about.png b/.screenshot/win10-about.png
diff --git a/.screenshot/win10-menu.png b/.screenshot/win10-menu.png
diff --git a/.screenshot/win10-options.png b/.screenshot/win10-options.png
diff --git a/.screenshot/win10.gif b/.screenshot/win10.gif
diff --git a/.screenshot/win10.png b/.screenshot/win10.png
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,5 @@
+FROM python:3
+WORKDIR /app
+COPY . /app
+
+ENTRYPOINT [ "python", "./unique/unique.py" ]
diff --git a/README.md b/README.md
diff --git a/build_python.bat b/build_python.bat
diff --git a/pyinstaller_make.bat b/pyinstaller_make.bat
@@ -0,0 +1,17 @@
+REM clear-down the ./dist/ folder
+IF EXIST dist ( ERASE /F /Q dist )
+
+REM copy unique.py to unique.pyw (we'll delete again at the end)
+COPY unique\unique_gui.py unique\unique_gui.pyw
+
+REM copy images and icons
+XCOPY unique\icon\ dist\icon\ /E
+
+REM run pyinstaller for unique.py to create .exe
+pyinstaller.exe --onefile --icon=.\unique\icon\icon.ico unique\unique.py
+
+REM run pyinstaller for unique_gui.pyw to create .exe (with no cli)
+pyinstaller.exe --onefile --hidden-import tkinter --icon=.\unique\icon\icon.ico unique\unique_gui.pyw
+
+REM remove the .pyw file
+ERASE unique\unique_gui.pyw
diff --git a/unique.py b/unique.py
diff --git a/icon/16.pdn → unique/icon/16.pdn b/icon/16.pdn → unique/icon/16.pdn
diff --git a/icon/16.png → unique/icon/16.png b/icon/16.png → unique/icon/16.png
diff --git a/icon/256.pdn → unique/icon/256.pdn b/icon/256.pdn → unique/icon/256.pdn
diff --git a/icon/256.png → unique/icon/256.png b/icon/256.png → unique/icon/256.png
diff --git a/icon/32.pdn → unique/icon/32.pdn b/icon/32.pdn → unique/icon/32.pdn
diff --git a/icon/32.png → unique/icon/32.png b/icon/32.png → unique/icon/32.png
diff --git a/icon/48.pdn → unique/icon/48.pdn b/icon/48.pdn → unique/icon/48.pdn
diff --git a/icon/48.png → unique/icon/48.png b/icon/48.png → unique/icon/48.png
diff --git a/icon/icon.ico → unique/icon/icon.ico b/icon/icon.ico → unique/icon/icon.ico
diff --git a/icon/sample.png → unique/icon/sample.png b/icon/sample.png → unique/icon/sample.png
diff --git a/unique/icon/vswin2019/CloseSolution_16x.png b/unique/icon/vswin2019/CloseSolution_16x.png
diff --git a/unique/icon/vswin2019/InformationSymbol_16x.png b/unique/icon/vswin2019/InformationSymbol_16x.png
diff --git a/unique/icon/vswin2019/LevelAll_16x.png b/unique/icon/vswin2019/LevelAll_16x.png
diff --git a/unique/icon/vswin2019/LevelFive_16x.png b/unique/icon/vswin2019/LevelFive_16x.png
diff --git a/unique/icon/vswin2019/LevelFour_16x.png b/unique/icon/vswin2019/LevelFour_16x.png
diff --git a/unique/icon/vswin2019/LevelOne_16x.png b/unique/icon/vswin2019/LevelOne_16x.png
diff --git a/unique/icon/vswin2019/LevelThree_16x.png b/unique/icon/vswin2019/LevelThree_16x.png
diff --git a/unique/icon/vswin2019/LevelTwo_16x.png b/unique/icon/vswin2019/LevelTwo_16x.png
diff --git a/unique/icon/vswin2019/NewFile_16x.png b/unique/icon/vswin2019/NewFile_16x.png
diff --git a/unique/icon/vswin2019/OpenFile_16x.png b/unique/icon/vswin2019/OpenFile_16x.png
diff --git a/unique/icon/vswin2019/SaveAs_16x.png b/unique/icon/vswin2019/SaveAs_16x.png
diff --git a/unique/icon/vswin2019/Save_16x.png b/unique/icon/vswin2019/Save_16x.png
diff --git a/unique/icon/vswin2019/Settings_16x.png b/unique/icon/vswin2019/Settings_16x.png