diff --git a/application-sdx.qrc b/application-sdx.qrc
index 09a5fd7..efb1f0c 100644
--- a/application-sdx.qrc
+++ b/application-sdx.qrc
@@ -59,6 +59,7 @@
res-drgx/css/default.css
res-drgx/css/light.css
res-drgx/css/midnight.css
+ res-drgx/css/dragonx.css
res-drgx/images/blue/unchecked.png
diff --git a/res-drgx/css/dragonx.css b/res-drgx/css/dragonx.css
new file mode 100644
index 0000000..e06b727
--- /dev/null
+++ b/res-drgx/css/dragonx.css
@@ -0,0 +1,110 @@
+QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow {
+ background-color: #232834;
+ color: #91a4b8;
+}
+ 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);
+}
+ 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;
+}
+ 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
+}
+ QHeaderView {
+ /* Table Header */
+ background-color:#232834;
+}
+ 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;
+ 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;
+}
+ QHeaderView::section:last {
+ border-right: 0px solid #d7d7d7;
+}
+ QScrollArea {
+ background:transparent;
+ border:0px;
+}
+ QTableView {
+ /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */
+ background:#232834;
+}
+ QTableView::item {
+ /* Table Item */
+ background-color:#232834;
+ border:1px solid #91a4b8;
+ font-size:12px;
+}
+ QTableView::item:selected {
+ /* Table Item Selected */
+ background-color:#91a4b8;
+ color:#232834;
+}
+ QMenuBar {
+ background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834);
+ color: #91a4b8;
+}
+ QMenuBar::item {
+ background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834);
+ color: #91a4b8;
+}
+ QMenuBar::item:selected {
+ background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #343F4B, stop: 1 #232834);
+}
+ QPushButton#startmining {
+ background-color: #343F4B;
+ border-width: 1px;
+ border-color: #91A4B8;
+ font: bold 18px;
+ min-width: 10em;
+ padding: 10px;
+}
+ QPushButton#startmining:pressed {
+ background-color: #232834;
+ border-style: inset;
+}
+ QPushButton#startmining:disabled {
+ background-color: #232834;
+ border-style: inset;
+}
+ QPushButton#stopmining {
+ background-color: #343F4B;
+ border-width: 1px;
+ border-color: #91A4B8;
+ font: bold 18px;
+ min-width: 10em;
+ padding: 10px;
+ margin-top: 10px;
+}
+ QPushButton#stopmining:pressed {
+ background-color: #232834;
+}
+ QPushButton#stopmining:disabled {
+ background-color: #232834;
+ border-style: inset;
+}
diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp
index d749d8b..81f199e 100644
--- a/src/balancestablemodel.cpp
+++ b/src/balancestablemodel.cpp
@@ -86,6 +86,9 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const
if (theme_name == "dark" || theme_name == "midnight") {
b.setColor(COLOR_WHITE);
return b;
+ }else if (theme_name == "dragonx"){
+ b.setColor(COLOR_DRAGONX_TEXT);
+ return b;
}else{
b.setColor(COLOR_BLACK);
return b;
diff --git a/src/fillediconlabel.cpp b/src/fillediconlabel.cpp
index 3161b0f..4f49597 100644
--- a/src/fillediconlabel.cpp
+++ b/src/fillediconlabel.cpp
@@ -32,6 +32,8 @@ void FilledIconLabel::resizeEvent(QResizeEvent*) {
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/guiconstants.h b/src/guiconstants.h
index 092f4ad..63e5f6f 100644
--- a/src/guiconstants.h
+++ b/src/guiconstants.h
@@ -7,6 +7,7 @@
#define COLOR_BLACK QColor(0, 0, 0)
#define COLOR_WHITE QColor(255, 255, 255)
#define COLOR_UNCONFIRMED_TX QColor(255, 0, 0)
+#define COLOR_DRAGONX_TEXT QColor(145, 164, 184)
// Theme background colors
#define COLOR_DEFAULT_BG QColor(229, 229, 229)
@@ -14,5 +15,6 @@
#define COLOR_LIGHT_BG QColor(218, 218, 218)
#define COLOR_DARK_BG QColor(48, 51, 53)
#define COLOR_MIDNIGHT_BG QColor(17, 17, 17)
+#define COLOR_DRAGONX_BG QColor(35, 40, 52)
#endif // GUICONSTANTS_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index daf111d..ba10baf 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2333,7 +2333,7 @@ void MainWindow::slot_change_theme(QString& theme_name)
qDebug() << __func__ << ": theme_name=" << theme_name;
if (theme_name == "dark" || theme_name == "default" || theme_name == "light" ||
- theme_name == "midnight" || theme_name == "blue") {
+ theme_name == "midnight" || theme_name == "blue" || theme_name == "dragonx") {
Settings::getInstance()->set_theme_name(theme_name);
} else {
qDebug() << __func__ << ": ignoring invalid theme_name=" << theme_name;
diff --git a/src/peerstablemodel.cpp b/src/peerstablemodel.cpp
index 4369146..9b32773 100644
--- a/src/peerstablemodel.cpp
+++ b/src/peerstablemodel.cpp
@@ -68,6 +68,9 @@ QVariant PeersTableModel::data(const QModelIndex &index, int role) const
if (theme_name == "dark" || theme_name == "midnight") {
b.setColor(COLOR_WHITE);
return b;
+ }else if (theme_name == "dragonx"){
+ b.setColor(COLOR_DRAGONX_TEXT);
+ return b;
}else{
b.setColor(COLOR_BLACK);
return b;
diff --git a/src/settings.ui b/src/settings.ui
index 5fd4fda..0600d62 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -26,7 +26,7 @@
-
- 0
+ 1
@@ -145,6 +145,120 @@
Options
+
-
+
+
+ Remember shielded transactions
+
+
+
+ -
+
+
+ Shield change from t-Addresses to your sapling address
+
+
+
+ -
+
+
+ Clear History
+
+
+
+ -
+
+
+ Connect to the internet to fetch prices
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
-
+
+ default
+
+
+ -
+
+ blue
+
+
+ -
+
+ light
+
+
+ -
+
+ dark
+
+
+ -
+
+ midnight
+
+
+ -
+
+ dragonx
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
@@ -161,6 +275,54 @@
+ -
+
+
+ Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent.
+
+
+ true
+
+
+
+ -
+
+
+ Check git.hush.is for updates at startup
+
+
+
+ -
+
+
+ Fetch prices
+
+
+
+ -
+
+
+ Connect to git.hush.is on startup to check for updates
+
+
+
+ -
+
+
+ Allow custom fees
+
+
+
+ -
+
+
+ Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab.
+
+
+ true
+
+
+
-
@@ -177,6 +339,20 @@
+ -
+
+
+ Connect via Tor
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
-
@@ -193,16 +369,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
-
@@ -428,95 +594,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
-
- default
-
-
- -
-
- blue
-
-
- -
-
- light
-
-
- -
-
- dark
-
-
- -
-
- midnight
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Connect via Tor
-
-
-
- -
-
-
- Check git.hush.is for updates at startup
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Remember shielded transactions
-
-
-
-
@@ -527,78 +604,6 @@
- -
-
-
- Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent.
-
-
- true
-
-
-
- -
-
-
- Clear History
-
-
-
- -
-
-
- Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab.
-
-
- true
-
-
-
- -
-
-
- Allow custom fees
-
-
-
- -
-
-
- Shield change from t-Addresses to your sapling address
-
-
-
- -
-
-
- Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.
-
-
- true
-
-
-
- -
-
-
- Connect to git.hush.is on startup to check for updates
-
-
-
- -
-
-
- Connect to the internet to fetch prices
-
-
-
- -
-
-
- Fetch prices
-
-
-
diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp
index 667daf0..0fdddf2 100644
--- a/src/txtablemodel.cpp
+++ b/src/txtablemodel.cpp
@@ -131,6 +131,8 @@ int TxTableModel::columnCount(const QModelIndex&) const
QColor color;
if (theme_name == "dark" || theme_name == "midnight") {
color = COLOR_WHITE;
+ }else if(theme_name == "dragonx"){
+ color = COLOR_DRAGONX_TEXT;
}else{
color = COLOR_BLACK;
}