mirror of
https://gitlab.com/RemixDev/deemix-gui-pyweb.git
synced 2024-12-28 18:36:07 +00:00
Added splash screen
This commit is contained in:
parent
e927912965
commit
299582e48a
|
@ -1,8 +1,8 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QDialog, QVBoxLayout
|
from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QDialog, QVBoxLayout, QSplashScreen
|
||||||
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
|
from PyQt5.QtGui import QIcon, QPixmap
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import webbrowser
|
import webbrowser
|
||||||
|
@ -224,9 +224,11 @@ if __name__ == '__main__':
|
||||||
dev = '--dev' in sys.argv
|
dev = '--dev' in sys.argv
|
||||||
|
|
||||||
if not server:
|
if not server:
|
||||||
|
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()
|
||||||
app = QApplication([])
|
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:
|
||||||
|
@ -238,6 +240,7 @@ 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')
|
||||||
|
|
|
@ -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', '.'), ('version.txt', '.')],
|
datas=[('webui/public', 'webui'), ('icon.ico', '.'), ('splash.png', '.'), ('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
Executable file
BIN
splash.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
Loading…
Reference in a new issue