From f50c55521c497b54d66e16b3bc2317c4a181c081 Mon Sep 17 00:00:00 2001
From: RemixDev <RemixDev64@gmail.com>
Date: Sat, 8 Aug 2020 18:05:58 +0200
Subject: [PATCH] Removed confirm_close workaround + repo cleanup

---
 README.md           | 12 +++++-------
 deemix_gui.py       |  2 +-
 requirements.txt    |  2 +-
 requirements_qt.txt |  2 +-
 startup.sh          |  3 ---
 5 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 startup.sh

diff --git a/README.md b/README.md
index 78a07b7..d984641 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,11 @@ NOTES:
 	- You'll need to install cefpython as well: `python3 -m pip install cefpython3 --user`
 	- You also might need [.NET 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17718) installed
 
-After installing Python open a terminal/command prompt and install the dependencies using `python3 -m pip install -U -r requirements.txt --user`<br>
-If you're using git to get this repo you should use `git submodule update --init --recursive` as well. If you're just downloading the archive.zip, make sure you download and extract [deemix-webui](https://codeberg.org/RemixDev/deemix-webui) into the webui folder.<br>
+After installing Python open a terminal/command prompt in the app folder and install the dependencies using `python3 -m pip install -U -r requirements.txt --user`<br>
+If you're on linux you can choose if you want to use GTK or QT (GTK is the primary choice, QT is the fallback). Instead of the plain requirements.txt you should use the respective requirements file for the Toolkit you want to use.
+
+If you're using git to get this repo you should use `git submodule update --init --recursive` as well. If you're just downloading the archive.zip, make sure you download and extract [deemix-webui](https://codeberg.org/RemixDev/deemix-webui) into the webui folder.
+
 Run `python3 server.py` to start the server and then connect to `127.0.0.1:6595`. The GUI should show up.<br>
 If you don't want to use your browser you can start the GUI by using `python3 deemix_gui.py`<br>
 
@@ -21,11 +24,6 @@ Having an hard time following these steps? You could try these [tools](https://c
 ## Feature requests
 Before asking for a feature [check this out](https://codeberg.org/RemixDev/deemix-pyweb/src/branch/main/FEATURES.md)
 
-## What's left to do?
-- Add an auto updater
-- Add installer for windows
-- AppImage builds
-
 # License
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/deemix_gui.py b/deemix_gui.py
index 480d601..14f5e82 100644
--- a/deemix_gui.py
+++ b/deemix_gui.py
@@ -80,7 +80,7 @@ if __name__ == '__main__':
             w = 800
             h = 600
         window = webview.create_window('deemix', 'http://'+url+':'+str(port),
-            confirm_close=True, x=x, y=y, width=w, height=h, text_select=True)
+            x=x, y=y, width=w, height=h, text_select=True)
         window.closing += save_position
         if sys.platform == "win32":
             from webview.platforms.cef import settings
diff --git a/requirements.txt b/requirements.txt
index e94761d..fa7b616 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 deemix>=1.1.28
 flask
 flask-socketio
-pywebview>=3.3.1
+pywebview>=3.3.2
 cefpython3; platform_system == "Windows"
diff --git a/requirements_qt.txt b/requirements_qt.txt
index 984b585..9a1a31d 100644
--- a/requirements_qt.txt
+++ b/requirements_qt.txt
@@ -1,4 +1,4 @@
 -r requirements.txt
 PyQt5
 PyQtWebEngine
-pywebview[qt]>=3.3.1
+pywebview[qt]>=3.3.2
diff --git a/startup.sh b/startup.sh
deleted file mode 100644
index 135fef1..0000000
--- a/startup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cd "$(dirname "$0")"
-source venv/Scripts/activate
-python deemix_gui.py
\ No newline at end of file