diff --git a/SilentDragonXLite b/SilentDragonXLite new file mode 100755 index 0000000..f8fbb64 Binary files /dev/null and b/SilentDragonXLite differ diff --git a/application.qrc b/application.qrc index 3decf62..e104034 100644 --- a/application.qrc +++ b/application.qrc @@ -103,7 +103,7 @@ res/css/Default.css res/css/Light.css res/css/Midnight.css - res/css/test.css + res/css/dragonx.css res/images/blue/unchecked.png diff --git a/res/css/dragonx.css b/res/css/dragonx.css index 99ba5dc..cfbcb20 100644 --- a/res/css/dragonx.css +++ b/res/css/dragonx.css @@ -1,114 +1,535 @@ +/* +colors + background: rgb(24, 12, 12) + object-background: #45505e + object-background-hover: #1f242b + object-background-press: #0c0e11 + text-main: white + text-secondary: rgba(255, 255, 255, 0.75) + text-dark: rgb(24, 12, 12) + border: rgb(216, 38, 82) +*/ + + QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow { - background-color: #232834; - color: #91a4b8; + color: white; + border: 0px solid rgba(0, 0, 0, 0); + background-color: rgb(24, 21, 21); } + + +/* window menu options */ +QMenu { + color: white; + border: 1px solid rgba(216, 38, 82, .5); + border-radius: 8px; + background-color: rgba(24, 21, 21, 1); +} + +QMenuBar { + color: rgb(216, 38, 82); + color: white; +} + +QMenuBar::item { + color: rgb(216, 38, 82); + color: white; +} + + +#title { + margin-bottom: 8px; +} + +QTabWidget QTabBar { + background-color: rgba(41, 21, 21, .25); + width: 600px; +} + QTabWidget QTabBar::tab { - padding-left:20px; - padding-right:20px; - padding-top:5px; - padding-bottom:5px; - border: 1px solid #343F4B; - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); + margin: 12px 4px; + padding: 6px 4px; + font-size: 20px; + border: 0px solid white; + border-radius: 9px; + background-color: rgba(41, 21, 21, 1); + min-width: 130px; } +QTabWidget QTabBar::tab::last { + min-width: 280px; +} + QTabWidget QTabBar::tab:selected { - min-height: 10px; - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); - color:#91a4b8; - border: 1px ridge #91a4b8; + color: rgba(255, 255, 255, 0.85); + border: 1px solid rgba(216, 38, 82, 0.85); + background-color: rgba(216, 38, 82, 0.25); } + QTabWidget QTabBar::tab:hover { - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); - color:#91a4b8; - border: 1px ridge #91a4b8; - min-height: 20px + color: white; + border: 1px solid rgba(216, 38, 82, 1); + background-color: rgba(216, 38, 82, 0.4); } + QHeaderView { /* Table Header */ - background-color:#232834; + background-color: rgba(0, 0, 0, 0); } + QHeaderView::section { /* Table Header Sections */ - qproperty-alignment:center; - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); - color:#91a4b8; + /* qproperty-alignment:center; */ min-height:25px; - font-weight:bold; - font-size:11px; outline:0; - border:1px solid #343F4B; - border-right:1px solid #91a4b8; - border-left:1px solid #91a4b8; padding-left:5px; padding-right:5px; padding-top:2px; padding-bottom:2px; + color:#91a4b8; + font-weight:bold; + font-size:11px; + border:1px solid rgb(41, 21, 21); + border-right:1px solid #91a4b8; + border-left:1px solid #91a4b8; } -QHeaderView::section:last { - border-right: 0px solid #d7d7d7; + + +QTabBar { + margin-bottom: 16px; } -QScrollArea { - background:transparent; - border:0px; + +QLabel { + color: rgba(255, 255, 255, 0.75); + border: 0px solid rgba(255, 255, 255, 0); + background-color: rgba(255, 255, 255, 0); } + + + +QLineEdit { + padding: 2px 4px; + color: white; + border: 1px solid rgb(216, 38, 82); + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + background-color: rgba(41, 21, 21, 0.75); +} + + +QGroupBox{ + padding: 12px; + padding-top: 32px; + background-color: rgba(24, 12, 12, 0.45); + border: 1px solid rgba(216, 38, 82, 0.6); + border-radius: 8px; + font-size: 18px; +} + + +QGroupBox::title { + padding: 4px 12px; + color: rgba(255, 255, 255, 0.85); + border: 1px solid rgba(216, 38, 82, 0.25); + border-top-left-radius: 8px; + border-bottom-right-radius: 8px; + background-color: rgba(216, 38, 82, 0.05); +} + +QGroupBox#groupBox QLabel { + font-size: 16px; +} + +QPushButton { + padding: 6px 10px; + color: rgba(255, 255, 255, 0.5); + border: 1px solid rgba(216, 38, 82, 0.5); + border-radius: 4px; + background-color: rgba(216, 38, 82, 0.15); + font-size: 16px; +} +QPushButton:hover { + color: rgba(255, 255, 255, 0.75); + border: 1px solid rgba(216, 38, 82, 0.55); + background-color: rgba(216, 38, 82, 0.45); +} +QPushButton:selected { + color: rgba(255, 255, 255, 0.75); + border: 1px solid rgba(216, 38, 82, 0.75); + background-color: rgba(216, 38, 82, 0.75); +} +QPushButton:disabled { + color: rgba(255, 255, 255, 0.15); + border: 1px solid rgba(216, 38, 82, 0.15); + background-color: rgba(255, 255, 255, 0.796); + opacity: 25%; +} + +QComboBox{ + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); +} + +QScrollArea#sendToScrollArea QWidget { + border: 0px solid rgb(216, 38, 82, 0); + background-color: rgba(24, 12, 12, 0.45); +} + + +QScrollBar { + border: 0px solid rgba(216, 38, 82, 0); + background-color: rgba(24, 12, 12, 0); +} + +QScrollBar:vertical { + width: 22px; + margin: 0 2px; + border: 2px solid rgba(216, 38, 82, 0); + background-color: rgba(0, 0, 0 , 0); +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal { + border: 1px solid rgba(216, 38, 82, 1); + border-radius: 6px; + background-color: rgba(216, 38, 82, 0.25); +} +QScrollBar::handle:vertical { + border-radius: 6px; +} + +QScrollBar::add-line { + height: 0px; + subcontrol-position: bottom; + subcontrol-origin: margin; + +} +QScrollBar::sub-line { + height: 0px; + subcontrol-position: top; + subcontrol-origin: margin; + +} + +QScrollBar::add-page, QScrollBar::sub-page { + background: none; +} + +QComboBox QAbstractItemView { + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); + selection-background-color: rgb(118, 132, 153); +} + +QComboBox QAbstractItemView::item{ + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.25); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); + outline: none; +} +QComboBox QAbstractItemView::item:selected{ + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); + outline:none; +} +QComboBox QAbstractItemView::item:hover { + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.75); + outline:none; +} + + +QListView{ + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); +} + + +/* TAB 1 - HUSHCHAT */ + +/* chat window */ +QListView#listChat, +QListView#listContactWidget { + border-radius: 8px; + border: 1px solid rgba(216, 38, 82, 0.5); + background-color: rgba(216, 38, 82, 0.05); +} + +QPushButton#emojiButton, +QPushButton#pushContact, +QPushButton#safeContactRequest, +QPushButton#givemeZaddr, +QPushButton#sendChatButton { + border-radius: 4px; +} + +QLabel#lblMessage { + color: white; + border: 1px solid rgba(216, 38, 82, 0.5); + background-color: rgba(216, 38, 82, 0.05); +} +QLabel#lblMessage{ + color: rgb(24, 21, 21); + border: 1px solid rgba(255, 255, 255, 0.5); + background-color: rgba(216, 38, 82, 0.05); +} + + + + + + +/* SEND TAB */ +QWidget#tab_2 QLabel{ + border: 0px solid white; + background-color: rgba(255, 255, 255, 0); + +} + + + + +/* MEMO */ +QWidget#tab_2 QLabel#MemoTxt1, +QWidget#tab_2 QLabel#MemoTxt2, +QWidget#tab_2 QLabel#MemoTxt3, +QWidget#tab_2 QLabel#MemoTxt4, +QWidget#tab_2 QLabel#MemoTxt5, +QWidget#tab_2 QLabel#MemoTxt6 { + border: 1px solid rgba(216, 38, 82, 0.25); + background-color: rgba(24, 12, 12, 0.25); + border-radius: 4px; + padding: 4px 2px; +} + +QWidget#tab_2 QLineEdit { + border: 1px solid rgb(216, 38, 82); + padding: 2px 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + background-color: rgba(24, 12, 12, 0.75); +} + + /* From Section */ + + /* drop down address menu */ +AddressCombo { + margin: 0; + padding: 2px 4px; + border: 1px solid rgba(216, 38, 82, 0.75); + border-radius: 2px; + background-color: rgba(24, 12, 12, 0.5); +} + + /* Send To Section */ + + /* Recipient sub-section */ +QWidget#tab_2 QGroupBox{ + border: 1px solid rgba(216, 38, 82, 0.5); + border-radius: 4px; + background-color: rgba(216, 38, 82, 0.1); +} +QWidget#tab_2 QGroupBox::title { + margin-left: 24px; + font-size: 6px; + border-radius: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} + + /* To Section */ +QWidget#tab_2 QGroupBox#groupBox_3, +QWidget#tab_2 QGroupBox#groupBox_4 { + border: 1px solid rgba(216, 38, 82, 0.6); + border-radius: 8px; + background-color: rgba(24, 12, 12, 0.45); +} +QWidget#tab_2 QGroupBox#groupBox_3::title, +QWidget#tab_2 QGroupBox#groupBox_4::title { + border-radius: 0; + border-top-left-radius: 8px; + border-bottom-right-radius: 8px; + margin: 0; +} + + /* Max Available */ +QCheckBox#Max1 { + padding: 4px; + border-radius: 4px; + background-color: rgba(24, 12, 12, 0.25); +} +QCheckBox#Max1:hover { + border: 1px solid rgba(216, 38, 82, 0.25); + background-color: rgba(216, 38, 82, 0.25); +} +QCheckBox#Max1:pressed, +QCheckBox#Max1:checked { + border: 1px solid rgba(216, 38, 82, 0.75); + background-color: rgba(216, 38, 82, 0.5); + color: white; +} + +QLabel#AmtUSD1, +QLabel#txtAvailableUSD { + border: 0px solid rgba(216, 38, 82, 0.25); + background-color: rgba(255, 255, 255, 0.15); + border-radius: 2px; +} + + +QWidget#tab_2 QGroupBox#groupBox_4 { + height: 12px; + padding: 0; + margin: 0; + border: 1px solid rgba(216, 38, 82, 0.25); + color: white; +} + +QWidget#tab_2 QPushButton { + color: rgba(255, 255, 255, 0.75); + border: 1px solid rgba(216, 38, 82, 0.25); + background-color: rgba(216, 38, 82, 0.25); +} +QWidget#tab_2 QPushButton:hover { + color: rgba(255, 255, 255, 0.75); + border: 1px solid rgba(216, 38, 82, 0.55); + background-color: rgba(216, 38, 82, 0.45); +} +QWidget#tab_2 QPushButton:selected { + color: rgba(255, 255, 255, 1); + border: 1px solid rgba(216, 38, 82, 0.75); + background-color: rgba(216, 38, 82, 0.5); +} +QWidget#tab_2 QPushButton:disabled { + color: rgba(24, 12, 12, 0.75); + border: 1px solid rgba(216, 38, 82, 0.05); + background-color: rgba(255, 255, 255, 0.15); +} + + + + + + + QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background:#232834; + qproperty-showGrid: "false"; + padding-right: 8px; + color: rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0); + } + +QTableView QTableCornerButton::section { + border: 0px solid rgba(0, 0, 0, 0); + background-color:rgba(0, 0, 0, 0); +} + + + QTableView::item { /* Table Item */ - background-color:#232834; - border:1px solid #91a4b8; + padding: 2px; + color: white; font-size:12px; + border: 1px solid rgba(216, 38, 82, .5); + background-color:rgba(216, 38, 82, 0.25); + } + + + QTableView::item:selected { /* Table Item Selected */ - background-color:#91a4b8; - color:#232834; + margin: 4px 0; + color:rgb(41, 21, 21); + border: 1px solid rgba(216, 38, 82, .75); + background-color:rgba(216, 38, 82, 0.5); } -QMenuBar { - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); - color: #91a4b8; + +QTableView { outline:none; } + + +QTableView#balancesTable { + /* background-color: rgba(255, 255, 255, 0); */ + } -QMenuBar::item { - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); - color: #91a4b8; +QTableView#balancesTable::item { + /* background-color: rgba(255, 255, 255, 0); */ + border: 1px solid rgba(216, 38, 82, 0.25); } -QMenuBar::item:selected { - background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834); + +QHeaderView::section { + border: 1px solid rgba(216, 38, 82, 0.5); + background-color: rgba(0, 0, 0, 0); } -QPushButton#startmining { - background-color: #343F4B; - border-color: #91A4B8; - padding: 10px; + +QHeaderView::section::first { + border-top-left-radius: 10px; + background-color: rgb(41, 21, 21); } -QPushButton#startmining:hover { - background-color: #232834; + +QHeaderView::section::middle { + background-color: rgb(41, 21, 21); } -QPushButton#startmining:pressed { - background-color: #232834; + +QHeaderView::section::last { + border: 1px solid rgba(216, 38, 82, 0.5); + border-top-right-radius: 10px; + background-color: rgb(41, 21, 21); } -QPushButton#startmining:disabled { - background-color: #232834; + +QHeaderView::section::vertical { + border: 0px solid rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0); } -QPushButton#stopmining { - background-color: #343F4B; - border-color: #91A4B8; - padding: 10px; - margin-top: 7px; + + + + + +QDialog#requestDialog { + min-width: 820; + min-height: 520; } -QPushButton#stopmining:hover { - background-color: #232834; + + +QDialog#requestDialog QLabel#label_8 + { +min-height: 25; +padding-top: 7px; } -QPushButton#stopmining:pressed { - background-color: #232834; + +QDialog#requestDialog QLabel#label_7{ + padding-left: 2px; + min-height: 25; } -QPushButton#stopmining:disabled { - background-color: #232834; +QDialog#requestDialog QLabel#label_5, +QDialog#requestDialog QLabel#label_6 { +min-height: 25; +padding-top: 2px; } -QComboBox#genproclimit{ - font-size: 24px; - height: 40px; -} -QMenu::item:selected{ - background-color: #343F4B + +QDialog#requestDialog QPushButton { + min-height: 32; } +QDialog#requestDialog QPushButton#addContact { + min-width: 150px; +} \ No newline at end of file diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp index 5da187c..796dbc6 100644 --- a/src/balancestablemodel.cpp +++ b/src/balancestablemodel.cpp @@ -105,7 +105,7 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const QString theme_name = Settings::getInstance()->get_theme_name(); QBrush b; QColor color; - if (theme_name == "Dark" || theme_name == "Midnight") { + if (theme_name == "Dark" || theme_name == "Midnight" || theme_name == "dragonx") { color = COLOR_WHITE; }else{ color = COLOR_BLACK; diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index e2bcd26..3d05d0a 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -97,7 +97,7 @@ void MainWindow::renderContactRequest(){ QString icon; auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { icon = ":/icons/res/unknownWhite.png"; }else{ icon = ":/icons/res/unknownBlack.png"; @@ -571,7 +571,7 @@ void MainWindow::sendChat() { movie1->setFileName(":/img/res/loaderwhite.gif"); auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { connect(movie, &QMovie::frameChanged, [=]{ ui->sendChatButton->setIcon(movie->currentPixmap()); @@ -603,7 +603,7 @@ void MainWindow::sendChat() { QTimer::singleShot(1000, [=]() { - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -640,7 +640,7 @@ void MainWindow::sendChat() { movie->stop(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -870,7 +870,7 @@ void MainWindow::ContactRequest() { QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif"); QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif"); auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { movie2->setScaledSize(QSize(512,512)); connD->topIcon->setMovie(movie2); movie2->start(); diff --git a/src/connection.cpp b/src/connection.cpp index d635c67..6388766 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -37,7 +37,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc) //DEBUG("theme " << theme << " has loaded"); auto size = QSize(512,512); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie2->setScaledSize(size); qDebug() << "Animation dark loaded"; diff --git a/src/controller.cpp b/src/controller.cpp index c2e7328..cfebd46 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -2032,7 +2032,7 @@ void Controller::shutdownhushd() auto theme = Settings::getInstance()->get_theme_name(); auto size = QSize(512,512); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; movie2->setScaledSize(size); qDebug() << "Animation dark loaded"; diff --git a/src/fillediconlabel.cpp b/src/fillediconlabel.cpp index 894f97f..c091281 100644 --- a/src/fillediconlabel.cpp +++ b/src/fillediconlabel.cpp @@ -28,12 +28,10 @@ void FilledIconLabel::resizeEvent(QResizeEvent*) { color = COLOR_BLUE_BG; }else if(theme_name == "Light"){ color = COLOR_LIGHT_BG; - }else if(theme_name == "Dark"){ + }else if(theme_name == "Dark" || theme_name == "dragonx"){ color = COLOR_DARK_BG; }else if(theme_name =="Midnight"){ color = COLOR_MIDNIGHT_BG; - }else if(theme_name =="dragonx"){ - color = COLOR_DRAGONX_BG; }else{ color = COLOR_DEFAULT_BG; } diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp index c2009e3..d3c05a5 100644 --- a/src/firsttimewizard.cpp +++ b/src/firsttimewizard.cpp @@ -36,7 +36,7 @@ void FirstTimeWizard::slot_change_theme(const QString& theme_name) { } catch (...) { - saved_theme_name = "Dark"; + saved_theme_name = "dragonx"; } QFile qFile(":/css/res/css/" + saved_theme_name +".css"); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f576169..edd8a0a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -71,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent) : } catch (...) { - theme_name = "Dark"; + theme_name = "dragonx"; } this->slot_change_theme(theme_name); @@ -1486,7 +1486,7 @@ void MainWindow::setupchatTab() { /////////////Setting Icons for Chattab and different themes auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -2003,7 +2003,7 @@ void MainWindow::sendMoneyChat() { movie1->setFileName(":/img/res/loaderwhite.gif"); auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { connect(movie, &QMovie::frameChanged, [=]{ ui->sendChatButton->setIcon(movie->currentPixmap()); @@ -2033,7 +2033,7 @@ void MainWindow::sendMoneyChat() { QTimer::singleShot(1000, [=]() { - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -2071,7 +2071,7 @@ void MainWindow::sendMoneyChat() { ui->memoTxtChat->setEnabled(true); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -2292,7 +2292,7 @@ void MainWindow::sendMoneyRequestChat() { movie1->setFileName(":/img/res/loaderwhite.gif"); auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { connect(movie, &QMovie::frameChanged, [=]{ ui->sendChatButton->setIcon(movie->currentPixmap()); @@ -2321,7 +2321,7 @@ void MainWindow::sendMoneyRequestChat() { QTimer::singleShot(1000, [=]() { - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -2354,7 +2354,7 @@ void MainWindow::sendMoneyRequestChat() { movie->stop(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); @@ -2692,7 +2692,7 @@ void MainWindow::slot_change_theme(const QString& theme_name) { Settings::getInstance()->set_theme_name(theme_name); } else { qDebug() << __func__ << ": ignoring invalid theme_name=" << theme_name; - Settings::getInstance()->set_theme_name("Dark"); + Settings::getInstance()->set_theme_name("dragonx"); } // Include css @@ -2701,7 +2701,7 @@ void MainWindow::slot_change_theme(const QString& theme_name) { saved_theme_name = Settings::getInstance()->get_theme_name(); } catch (const std::exception& e) { qDebug() << QString("Ignoring theme change Exception! : "); - saved_theme_name = "Dark"; + saved_theme_name = "dragonx"; } QString filename = ":/css/res/css/" + saved_theme_name +".css"; diff --git a/src/sendtab.cpp b/src/sendtab.cpp index db62db9..78a5a93 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -864,7 +864,7 @@ void MainWindow::sendButton() { QMovie *movie1 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonxlite-animated-startup-dark.gif");; auto theme = Settings::getInstance()->get_theme_name(); - if (theme == "Dark" || theme == "Midnight") { + if (theme == "Dark" || theme == "Midnight" || theme == "dragonx") { movie2->setScaledSize(QSize(512,512)); connD->topIcon->setMovie(movie2); movie2->start(); diff --git a/src/settings.cpp b/src/settings.cpp index 65164c8..c048ce2 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -277,7 +277,7 @@ void Settings::set_currency_name(QString currency_name) { QString Settings::get_theme_name() { // Load from the QT Settings. - return QSettings().value("options/theme_name", "Dark").toString(); + return QSettings().value("options/theme_name", "dragonx").toString(); } void Settings::set_theme_name(QString theme_name) { diff --git a/src/settings.ui b/src/settings.ui index b40a4d9..e93b08a 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -127,6 +127,11 @@ 0 + + + dragonx + + Dark @@ -152,6 +157,7 @@ Default + diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index 04ea0dd..b1c184a 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -93,7 +93,7 @@ QVariant TxTableModel::data(const QModelIndex &index, int role) const { QString theme_name = Settings::getInstance()->get_theme_name(); QBrush b; QColor color; - if (theme_name == "Dark" || theme_name == "Midnight") { + if (theme_name == "Dark" || theme_name == "Midnight" || theme_name == "dragonx") { color = COLOR_WHITE; }else{ color = COLOR_BLACK;