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

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

View file

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

View file

@ -15,7 +15,7 @@ sys.modules['FixTk'] = None
a = Analysis(['deemix-pyweb.py'],
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'],
hookspath=[],
runtime_hooks=[],

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB