DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request 'Replace a duplicate string & Update old animation' (#94) from onryo into dev

Browse Source 
Reviewed-on: https://git.hush.is/hush/SilentDragonLite/pulls/94
This commit is contained in:
Duke Leto
2022-11-13 13:04:17 +00:00
parent 7649418a7b 778158ec88
commit fe15384c10
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chatmodel.cpp
View File

@@ -868,8 +868,8 @@ void MainWindow::ContactRequest() {
auto d = new QDialog(this); auto d = new QDialog(this);
auto connD = new Ui_ConnectionDialog(); auto connD = new Ui_ConnectionDialog();
connD->setupUi(d); connD->setupUi(d);
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif"); QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif"); QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "Dark" || theme == "Midnight") { if (theme == "Dark" || theme == "Midnight") {
movie2->setScaledSize(QSize(512,512)); movie2->setScaledSize(QSize(512,512));

2
src/connection.cpp
View File

@@ -42,7 +42,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
connD->topIcon->setMovie(movie2); connD->topIcon->setMovie(movie2);
movie2->start(); movie2->start();
} else { } else {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup.gif");; QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie1->setScaledSize(size); movie1->setScaledSize(size);
qDebug() << "Animation light loaded"; qDebug() << "Animation light loaded";
connD->topIcon->setMovie(movie1); connD->topIcon->setMovie(movie1);

6
src/controller.cpp
View File

@@ -2015,15 +2015,15 @@ void Controller::shutdownhushd()
connD.topIcon->setMovie(movie2); connD.topIcon->setMovie(movie2);
movie2->start(); movie2->start();
connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit")); connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit"));
connD.statusDetail->setText(QObject::tr("Please wait for SilentDragonLite to exit")); connD.statusDetail->setText(QObject::tr("It may take several minutes"));
} else { } else {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup.gif");; QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie1->setScaledSize(size); movie1->setScaledSize(size);
qDebug() << "Animation light loaded"; qDebug() << "Animation light loaded";
connD.topIcon->setMovie(movie1); connD.topIcon->setMovie(movie1);
movie1->start(); movie1->start();
connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit")); connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit"));
connD.statusDetail->setText(QObject::tr("Please wait for SilentDragonLite to exit")); connD.statusDetail->setText(QObject::tr("It may take several minutes"));
} }
bool finished = false; bool finished = false;

4
src/sendtab.cpp
View File

@@ -845,8 +845,8 @@ void MainWindow::sendButton() {
auto d = new QDialog(this); auto d = new QDialog(this);
auto connD = new Ui_ConnectionDialog(); auto connD = new Ui_ConnectionDialog();
connD->setupUi(d); connD->setupUi(d);
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");; QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "Dark" || theme == "Midnight") { if (theme == "Dark" || theme == "Midnight") {
movie2->setScaledSize(QSize(512,512)); movie2->setScaledSize(QSize(512,512));