Browse Source
fixed setBasePixmap after UI change for animations, plus updated string to The Dragon Awakens...
pull/110/head
Charles
4 years ago
No known key found for this signature in database
GPG Key ID: 251655CC546D9787
2 changed files with
5 additions and
12 deletions
-
src/connection.ui
-
src/controller.cpp
|
|
|
@ -9,8 +9,8 @@ |
|
|
|
<rect> |
|
|
|
<x>0</x> |
|
|
|
<y>0</y> |
|
|
|
<width>513</width> |
|
|
|
<height>201</height> |
|
|
|
<width>512</width> |
|
|
|
<height>513</height> |
|
|
|
</rect> |
|
|
|
</property> |
|
|
|
<property name="windowTitle"> |
|
|
|
@ -33,7 +33,7 @@ |
|
|
|
<number>0</number> |
|
|
|
</property> |
|
|
|
<item> |
|
|
|
<widget class="FilledIconLabel" name="topIcon"> |
|
|
|
<widget class="QLabel" name="topIcon"> |
|
|
|
<property name="sizePolicy"> |
|
|
|
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> |
|
|
|
<horstretch>0</horstretch> |
|
|
|
@ -55,7 +55,7 @@ |
|
|
|
<item> |
|
|
|
<widget class="QLabel" name="status"> |
|
|
|
<property name="text"> |
|
|
|
<string>Starting Up</string> |
|
|
|
<string>The Dragon Awakens...</string> |
|
|
|
</property> |
|
|
|
<property name="alignment"> |
|
|
|
<set>Qt::AlignCenter</set> |
|
|
|
@ -84,13 +84,6 @@ |
|
|
|
</item> |
|
|
|
</layout> |
|
|
|
</widget> |
|
|
|
<customwidgets> |
|
|
|
<customwidget> |
|
|
|
<class>FilledIconLabel</class> |
|
|
|
<extends>QLabel</extends> |
|
|
|
<header>fillediconlabel.h</header> |
|
|
|
</customwidget> |
|
|
|
</customwidgets> |
|
|
|
<resources/> |
|
|
|
<connections/> |
|
|
|
</ui> |
|
|
|
|
|
|
|
@ -1523,7 +1523,7 @@ void Controller::shutdownhushd() |
|
|
|
QDialog d(main); |
|
|
|
Ui_ConnectionDialog connD; |
|
|
|
connD.setupUi(&d); |
|
|
|
connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); |
|
|
|
connD.topIcon->setPixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); |
|
|
|
connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit")); |
|
|
|
connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit")); |
|
|
|
bool finished = false; |
|
|
|
|
