diff --git a/application-sdx.qrc b/application-sdx.qrc index f8ec24d..035b6a0 100644 --- a/application-sdx.qrc +++ b/application-sdx.qrc @@ -24,8 +24,7 @@ res-drgx/lock_closed.png - res-drgx/tropical-hush.png - res-drgx/tropical-hush-square.png + res/hushdlogo.png res-drgx/logobig.gif res-drgx/silentdragon-animated.gif res-drgx/silentdragon-animated-dark.gif diff --git a/application.qrc b/application.qrc index a93c3f2..f6867ed 100644 --- a/application.qrc +++ b/application.qrc @@ -24,8 +24,7 @@ res/lock_closed.png - res/tropical-hush.png - res/tropical-hush-square.png + res/hushdlogo.png res/logobig.gif res/silentdragon-animated.gif res/silentdragon-animated-dark.gif diff --git a/res/hushdlogo.png b/res/hushdlogo.png new file mode 100644 index 0000000..e3bdfc0 Binary files /dev/null and b/res/hushdlogo.png differ diff --git a/res/tropical-hush-square.png b/res/tropical-hush-square.png deleted file mode 100644 index e14e702..0000000 Binary files a/res/tropical-hush-square.png and /dev/null differ diff --git a/res/tropical-hush.png b/res/tropical-hush.png deleted file mode 100644 index d41b15f..0000000 Binary files a/res/tropical-hush.png and /dev/null differ diff --git a/src/connection.cpp b/src/connection.cpp index 4e2c474..b710de7 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -182,7 +182,7 @@ void ConnectionLoader::createHushConf() { Ui_createHushConf ui; ui.setupUi(&d); - QPixmap logo(":/img/tropical-hush-square.png"); + QPixmap logo(":/img/hushdlogo.png"); ui.lblTopIcon->setBasePixmap(logo.scaled(512,512, Qt::KeepAspectRatio, Qt::SmoothTransformation)); ui.btnPickDir->setEnabled(false); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ff2db2a..6bb033e 100755 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1802,7 +1802,7 @@ void MainWindow::setupPeersTab() { } void MainWindow::setupHushTab() { - QPixmap image(":/img/tropical-hush-square.png"); + QPixmap image(":/img/hushdlogo.png"); ui->hushlogo->setBasePixmap( image ); // image.scaled(600,600, Qt::KeepAspectRatioByExpanding, Qt::FastTransformation ) ); } /* diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 6a16cef..34a6559 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -121,7 +121,6 @@ - 75 true @@ -134,7 +133,6 @@ - 75 true @@ -160,7 +158,6 @@ - 75 true @@ -173,7 +170,6 @@ - 75 true @@ -388,8 +384,8 @@ 0 0 - 1447 - 860 + 1409 + 865 @@ -1007,7 +1003,7 @@ Peers - + @@ -1137,434 +1133,550 @@ - + - + 0 0 + + + 300 + 300 + + + + + 300 + 300 + + false + + Qt::AlignHCenter|Qt::AlignTop + + + + 0 + 0 + + - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - + + + + + 0 + 0 + - - - - - Loading... + P2P Port - - + + - Block height + | - - + + - Notarized Hash + | - - + + Loading... - + | - - - - Notarized txid + + + + + 0 + 0 + - - - - - Loading... + Notarized Hash - - + + | - - + + - Notarized Lag + Loading... - - + + + + + 0 + 0 + + - Loading... + Version - - + + - | + - - + + Loading... - - + + - | + Loading... - - - - Protocol Version + + + + Qt::Vertical - + + + 20 + 40 + + + - - + + - Loading... + | - - + + | - - + + - Version + Loading... - - + + Loading... - - + + + + + 0 + 0 + + - | + Chain Transactions - - + + - P2P Port + Loading... - - + + + + + 0 + 0 + + - Loading... + Connections - - + + + + + 0 + 0 + + - | + Block height - + + + + 0 + 0 + + RPC Port - - + + Loading... - - + + | - - + + - Client Name + | - - + + Loading... - - + + | - - - - Next Halving + + + + Qt::Horizontal - - + + + + + 0 + 0 + + - Loading... + TLS Support - - + + | - - + + - Local Services + Loading... - + Loading... - - + + + + + 0 + 0 + + + + Longest Chain + + + + + | - - + + + + + 0 + 0 + + - Longest Chain + Client Name - - + + Loading... - - + + | - - + + - Wallet Transactions + | - - + + Loading... - - + + | - - + + + + + 0 + 0 + + - Chain Transactions + Local Services - - + + - Loading... + | - - + + + + + 0 + 0 + + - | + Notarized Lag - - + + + + + 0 + 0 + + - TLS Support + Network solution rate - - + + Loading... - - + + + + + 0 + 0 + + - | + Next Halving - + + + + + 0 + 0 + + + + Wallet Transactions + + + + Loading... - - + + - Network solution rate + Loading... - - + + + + + 0 + 0 + + - Connections + Notarized txid - - + + Loading... - - - - Qt::Horizontal + + + + | - - - - Qt::Vertical - - - - 20 - 40 - + + + + | - + - - + + + + + 0 + 0 + + - | + Protocol Version - - + + - | + Loading... - + + + + 0 + 0 + + | @@ -1587,7 +1699,7 @@ 0 0 1487 - 30 + 24 diff --git a/src/settings.ui b/src/settings.ui index 32eedb9..2a6d37d 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -365,13 +365,6 @@ - - - - Qt::Horizontal - - -