mirrors/deemix-gui-pyweb
1
0
Fork 0
mirror of https://gitlab.com/RemixDev/deemix-gui-pyweb.git synced 2024-12-28 18:36:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted addition of splash screen, as it's not working well on all OSs

Browse source
This commit is contained in:
RemixDev 2020-09-20 23:15:04 +02:00
parent 299582e48a
commit d13e3ad27d
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
deemix-pyweb.py
View file

@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QDialog, QVBoxLayout, QSplashScreen from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QDialog, QVBoxLayout
from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage, QWebEngineProfile from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage, QWebEngineProfile
from PyQt5.QtCore import QUrl, pyqtSignal from PyQt5.QtCore import QUrl, pyqtSignal
from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtGui import QIcon
import json import json
import webbrowser import webbrowser
@ -225,10 +225,8 @@ if __name__ == '__main__':
if not server: if not server:
app = QApplication([]) app = QApplication([])
splash = QSplashScreen(QPixmap(path.join(appDir, 'splash.png')))
configFolder = portable or getConfigFolder() configFolder = portable or getConfigFolder()
x,y,w,h = get_position() x,y,w,h = get_position()
splash.show()
window = MainWindow('deemix', 'http://'+url+':'+str(port), x,y,w,h) window = MainWindow('deemix', 'http://'+url+':'+str(port), x,y,w,h)
t = Thread(target=run_server, args=(port, url, portable, window)) t = Thread(target=run_server, args=(port, url, portable, window))
else: else:
@ -240,7 +238,6 @@ if __name__ == '__main__':
while not url_ok(url, port): while not url_ok(url, port):
sleep(1) sleep(1)
window.showWindow() window.showWindow()
splash.finish(window)
app.exec_() app.exec_()
conn = HTTPConnection(url, port) conn = HTTPConnection(url, port)
conn.request('GET', '/shutdown') conn.request('GET', '/shutdown')

2
deemix-pyweb.spec
View file

@ -15,7 +15,7 @@ sys.modules['FixTk'] = None
a = Analysis(['deemix-pyweb.py'], a = Analysis(['deemix-pyweb.py'],
binaries=[], binaries=[],
datas=[('webui/public', 'webui'), ('icon.ico', '.'), ('splash.png', '.'), ('version.txt', '.')], datas=[('webui/public', 'webui'), ('icon.ico', '.'), ('version.txt', '.')],
hiddenimports=['PyQt5', 'engineio.async_drivers.threading', 'pkg_resources.py2_warn', 'eventlet.hubs.epolls', 'eventlet.hubs.kqueue', 'eventlet.hubs.selects', 'dns', 'dns.dnssec', 'dns.e164', 'dns.hash', 'dns.namedict', 'dns.tsigkeyring', 'dns.update', 'dns.version', 'dns.zone'], hiddenimports=['PyQt5', 'engineio.async_drivers.threading', 'pkg_resources.py2_warn', 'eventlet.hubs.epolls', 'eventlet.hubs.kqueue', 'eventlet.hubs.selects', 'dns', 'dns.dnssec', 'dns.e164', 'dns.hash', 'dns.namedict', 'dns.tsigkeyring', 'dns.update', 'dns.version', 'dns.zone'],
hookspath=[], hookspath=[],
runtime_hooks=[], runtime_hooks=[],

BIN
splash.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB