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

Title capitalization of all themes, fixed border for settings.ui, increased width of theme & currency boxes to accomodate longer theme names

Browse Source
This commit is contained in:
Charles
2020-06-10 01:32:41 -04:00
parent c44322a5e6
commit f8e295775a
13 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
application.qrc
View File

@@ -47,7 +47,6 @@
<file>res/addContactBlack.png</file> <file>res/addContactBlack.png</file>
<file>res/unknownBlack.png</file> <file>res/unknownBlack.png</file>
<file>res/unknownWhite.png</file> <file>res/unknownWhite.png</file>
</qresource> </qresource>
<qresource prefix="/img"> <qresource prefix="/img">
<file>res/hushdlogo.gif</file> <file>res/hushdlogo.gif</file>
@@ -59,21 +58,21 @@
<file>res/loaderwhite.gif</file> <file>res/loaderwhite.gif</file>
</qresource> </qresource>
<qresource prefix="/translations"> <qresource prefix="/translations">
<file>res/silentdragonlite_de.qm</file> <file>res/silentdragonlite_de.qm</file>
<file>res/silentdragonlite_es.qm</file> <file>res/silentdragonlite_es.qm</file>
<file>res/silentdragonlite_fr.qm</file> <file>res/silentdragonlite_fr.qm</file>
<file>res/silentdragonlite_pt.qm</file> <file>res/silentdragonlite_pt.qm</file>
<file>res/silentdragonlite_it.qm</file> <file>res/silentdragonlite_it.qm</file>
<file>res/silentdragonlite_hr.qm</file> <file>res/silentdragonlite_hr.qm</file>
<file>res/silentdragonlite_fa.qm</file> <file>res/silentdragonlite_fa.qm</file>
<file>res/silentdragonlite_id.qm</file> <file>res/silentdragonlite_id.qm</file>
</qresource> </qresource>
<qresource prefix="/css"> <qresource prefix="/css">
<file>res/css/blue.css</file> <file>res/css/Blue.css</file>
<file>res/css/dark.css</file> <file>res/css/Dark.css</file>
<file>res/css/default.css</file> <file>res/css/Default.css</file>
<file>res/css/light.css</file> <file>res/css/Light.css</file>
<file>res/css/midnight.css</file> <file>res/css/Midnight.css</file>
</qresource> </qresource>
<qresource prefix="/images/blue"> <qresource prefix="/images/blue">
<file>res/images/blue/unchecked.png</file> <file>res/images/blue/unchecked.png</file>

0
res/css/blue.css → res/css/Blue.css
View File

0
res/css/dark.css → res/css/Dark.css
View File

0
res/css/default.css → res/css/Default.css
View File

0
res/css/light.css → res/css/Light.css
View File

0
res/css/midnight.css → res/css/Midnight.css
View File

10
src/chatmodel.cpp
View File

@@ -101,7 +101,7 @@ void MainWindow::renderContactRequest(){
QString icon; QString icon;
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
icon = ":/icons/res/unknownWhite.png"; icon = ":/icons/res/unknownWhite.png";
}else{ }else{
icon = ":/icons/res/unknownBlack.png"; icon = ":/icons/res/unknownBlack.png";
@@ -587,7 +587,7 @@ void MainWindow::sendChat() {
movie1->setFileName(":/img/res/loaderwhite.gif"); movie1->setFileName(":/img/res/loaderwhite.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") {
connect(movie, &QMovie::frameChanged, [=]{ connect(movie, &QMovie::frameChanged, [=]{
ui->sendChatButton->setIcon(movie->currentPixmap()); ui->sendChatButton->setIcon(movie->currentPixmap());
@@ -616,7 +616,7 @@ void MainWindow::sendChat() {
QTimer::singleShot(1000, [=]() { QTimer::singleShot(1000, [=]() {
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -649,7 +649,7 @@ void MainWindow::sendChat() {
movie->stop(); movie->stop();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -881,7 +881,7 @@ void MainWindow::ContactRequest() {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif"); QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif"); QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-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));
connD->topIcon->setMovie(movie2); connD->topIcon->setMovie(movie2);
movie2->start(); movie2->start();

2
src/connection.cpp
View File

@@ -23,7 +23,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
qDebug() << theme << "theme has loaded"; qDebug() << theme << "theme has loaded";
auto size = QSize(512,512); auto size = QSize(512,512);
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie2->setScaledSize(size); movie2->setScaledSize(size);
qDebug() << "Animation dark loaded"; qDebug() << "Animation dark loaded";

2
src/controller.cpp
View File

@@ -2035,7 +2035,7 @@ void Controller::shutdownhushd()
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
auto size = QSize(512,512); auto size = QSize(512,512);
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie2->setScaledSize(size); movie2->setScaledSize(size);
qDebug() << "Animation dark loaded"; qDebug() << "Animation dark loaded";

10
src/mainwindow.cpp
View File

@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent) :
} }
catch (...) catch (...)
{ {
theme_name = "dark"; theme_name = "Dark";
} }
this->slot_change_theme(theme_name); this->slot_change_theme(theme_name);
@@ -1213,10 +1213,10 @@ void MainWindow::setupTransactionsTab() {
// Set up context menu on transactions tab // Set up context menu on transactions tab
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover"); ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");
} }
if (theme == "default") {ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");} if (theme == "Default") {ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");}
ui->listChat->setResizeMode(QListView::Adjust); ui->listChat->setResizeMode(QListView::Adjust);
ui->listChat->setWordWrap(true); ui->listChat->setWordWrap(true);
@@ -1316,7 +1316,7 @@ void MainWindow::setupchatTab() {
/////////////Setting Icons for Chattab and different themes /////////////Setting Icons for Chattab and different themes
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -1955,7 +1955,7 @@ void MainWindow::slot_change_theme(const QString& theme_name)
} }
catch (...) catch (...)
{ {
saved_theme_name = "dark"; saved_theme_name = "Dark";
} }
QFile qFile(":/css/res/css/" + saved_theme_name +".css"); QFile qFile(":/css/res/css/" + saved_theme_name +".css");

2
src/sendtab.cpp
View File

@@ -846,7 +846,7 @@ void MainWindow::sendButton() {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");; QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-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));
connD->topIcon->setMovie(movie2); connD->topIcon->setMovie(movie2);
movie2->start(); movie2->start();

2
src/settings.cpp
View File

@@ -230,7 +230,7 @@ void Settings::set_currency_name(QString currency_name) {
QString Settings::get_theme_name() { QString Settings::get_theme_name() {
// Load from the QT Settings. // Load from the QT Settings.
return QSettings().value("options/theme_name", "dark").toString(); return QSettings().value("options/theme_name", "Dark").toString();
} }
void Settings::set_theme_name(QString theme_name) { void Settings::set_theme_name(QString theme_name) {

36
src/settings.ui
View File

@@ -6,10 +6,28 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>733</width> <width>590</width>
<height>539</height> <height>443</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>590</width>
<height>443</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>590</width>
<height>443</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
@@ -85,7 +103,7 @@
<rect> <rect>
<x>80</x> <x>80</x>
<y>110</y> <y>110</y>
<width>80</width> <width>111</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
@@ -97,27 +115,27 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>dark</string> <string>Dark</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>default</string> <string>Midnight</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>blue</string> <string>Light</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>light</string> <string>Blue</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>midnight</string> <string>Default</string>
</property> </property>
</item> </item>
</widget> </widget>
@@ -241,7 +259,7 @@
<rect> <rect>
<x>80</x> <x>80</x>
<y>150</y> <y>150</y>
<width>80</width> <width>111</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>