hush
/
SilentDragon
9
1
Fork 7
Code Issues 73 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

UI tweaks

custom_themes
fekt 1 year ago
parent
4d667fe6b2
commit
cab39801e7
9 changed files with 298 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      application-sdx.qrc
  2. 3
      application.qrc
  3. BIN
      res/hushdlogo.png
  4. BIN
      res/tropical-hush-square.png
  5. BIN
      res/tropical-hush.png
  6. 2
      src/connection.cpp
  7. 2
      src/mainwindow.cpp
  8. 476
      src/mainwindow.ui
  9. 7
      src/settings.ui

3
application-sdx.qrc
View File

@ -24,8 +24,7 @@
<file alias="lock_closed.png">res-drgx/lock_closed.png</file>
</qresource>
<qresource prefix="/img">
<file alias="tropical-hush.png">res-drgx/tropical-hush.png</file>
<file alias="tropical-hush-square.png">res-drgx/tropical-hush-square.png</file>
<file alias="hushdlogo.png">res/hushdlogo.png</file>
<file alias="logobig.gif">res-drgx/logobig.gif</file>
<file alias="silentdragon-animated.gif">res-drgx/silentdragon-animated.gif</file>
<file alias="silentdragon-animated-dark.gif">res-drgx/silentdragon-animated-dark.gif</file>

3
application.qrc
View File

@ -24,8 +24,7 @@
<file alias="lock_closed.png">res/lock_closed.png</file>
</qresource>
<qresource prefix="/img">
<file alias="tropical-hush.png">res/tropical-hush.png</file>
<file alias="tropical-hush-square.png">res/tropical-hush-square.png</file>
<file alias="hushdlogo.png">res/hushdlogo.png</file>
<file alias="logobig.gif">res/logobig.gif</file>
<file alias="silentdragon-animated.gif">res/silentdragon-animated.gif</file>
<file alias="silentdragon-animated-dark.gif">res/silentdragon-animated-dark.gif</file>

BIN
res/hushdlogo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
res/tropical-hush-square.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

BIN
res/tropical-hush.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

2
src/connection.cpp
View File

@ -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);

2
src/mainwindow.cpp
View File

@ -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 ) );
}
/*

476
src/mainwindow.ui
View File

@ -121,7 +121,6 @@
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -134,7 +133,6 @@
<widget class="QLabel" name="balTotal">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -160,7 +158,6 @@
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -173,7 +170,6 @@
<widget class="QLabel" name="balUSDTotal">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -388,8 +384,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1447</width>
<height>860</height>
<width>1409</width>
<height>865</height>
</rect>
</property>
<layout class="QVBoxLayout" name="sendToLayout">
@ -1007,7 +1003,7 @@
<attribute name="title">
<string>Peers</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_8">
<layout class="QVBoxLayout" name="verticalLayout_81">
<item>
<widget class="QLabel" name="currentPeersLabel">
<property name="text">
@ -1137,434 +1133,550 @@
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<item alignment="Qt::AlignTop">
<widget class="FilledIconLabel" name="hushlogo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>300</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>300</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_51">
<item row="5" column="0" colspan="3">
<widget class="QLabel" name="mining">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
<item row="11" column="0">
<widget class="QLabel" name="p2pportlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</spacer>
</item>
<item row="2" column="2">
<widget class="QLabel" name="numconnections">
<property name="text">
<string>Loading...</string>
<string>P2P Port</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="heightLabel">
<item row="17" column="1">
<widget class="QLabel" name="txcountspacer">
<property name="text">
<string>Block height</string>
<string>|</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="notarizedhashlabel">
<item row="14" column="1">
<widget class="QLabel" name="halvingspacer">
<property name="text">
<string>Notarized Hash</string>
<string>|</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLabel" name="notarizedhashvalue">
<item row="14" column="2">
<widget class="QLabel" name="halving">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="notarizedhashspacer">
<widget class="QLabel" name="lagspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="notarizedtxidlabel">
<property name="text">
<string>Notarized txid</string>
<item row="5" column="0">
<widget class="QLabel" name="notarizedhashlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="notarizedtxidvalue">
<property name="text">
<string>Loading...</string>
<string>Notarized Hash</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="notarizedtxidspacer">
<item row="13" column="1">
<widget class="QLabel" name="clientnamespacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="laglabel">
<item row="9" column="2">
<widget class="QLabel" name="protocolversion">
<property name="text">
<string>Notarized Lag</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLabel" name="lagvalue">
<item row="10" column="0">
<widget class="QLabel" name="versionlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Loading...</string>
<string>Version</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="lagspacer">
<item row="4" column="0" colspan="3">
<widget class="QLabel" name="mining">
<property name="text">
<string>|</string>
<string/>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLabel" name="kmdversion">
<item row="7" column="2">
<widget class="QLabel" name="lagvalue">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLabel" name="kmdversionspacer">
<item row="16" column="2">
<widget class="QLabel" name="longestchain">
<property name="text">
<string>|</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="protocolversionlabel">
<property name="text">
<string>Protocol Version</string>
<item row="20" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="11" column="2">
<widget class="QLabel" name="protocolversion">
<item row="2" column="1">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Loading...</string>
<string>|</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLabel" name="protocolversionspacer">
<item row="5" column="1">
<widget class="QLabel" name="notarizedhashspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="versionlabel">
<item row="1" column="2">
<widget class="QLabel" name="numconnections">
<property name="text">
<string>Version</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="12" column="2">
<widget class="QLabel" name="version">
<item row="8" column="2">
<widget class="QLabel" name="kmdversion">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLabel" name="versionspacer">
<item row="18" column="0">
<widget class="QLabel" name="chaintxcountlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
<string>Chain Transactions</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="p2pportlabel">
<item row="6" column="2">
<widget class="QLabel" name="notarizedtxidvalue">
<property name="text">
<string>P2P Port</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QLabel" name="p2pport">
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Loading...</string>
<string>Connections</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLabel" name="p2pportspacer">
<item row="0" column="0">
<widget class="QLabel" name="heightLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
<string>Block height</string>
</property>
</widget>
</item>
<item row="14" column="0">
<item row="12" column="0">
<widget class="QLabel" name="rpcportlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>RPC Port</string>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLabel" name="rpcport">
<item row="11" column="2">
<widget class="QLabel" name="p2pport">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="rpcportspacer">
<item row="19" column="1">
<widget class="QLabel" name="tlssupportspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="clientnamelabel">
<item row="1" column="1">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Client Name</string>
<string>|</string>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QLabel" name="clientname">
<item row="19" column="2">
<widget class="QLabel" name="tlssupport">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="clientnamespacer">
<item row="16" column="1">
<widget class="QLabel" name="longestchainspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="halvinglabel">
<property name="text">
<string>Next Halving</string>
<item row="3" column="0" colspan="3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="16" column="2">
<widget class="QLabel" name="halving">
<item row="19" column="0">
<widget class="QLabel" name="tlssupportlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Loading...</string>
<string>TLS Support</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="halvingspacer">
<item row="6" column="1">
<widget class="QLabel" name="notarizedtxidspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QLabel" name="localserviceslabel">
<item row="12" column="2">
<widget class="QLabel" name="rpcport">
<property name="text">
<string>Local Services</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="17" column="2">
<widget class="QLabel" name="localservices">
<widget class="QLabel" name="txcount">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QLabel" name="localservicesspacer">
<item row="16" column="0">
<widget class="QLabel" name="longestchainlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Longest Chain</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLabel" name="versionspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="longestchainlabel">
<item row="13" column="0">
<widget class="QLabel" name="clientnamelabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Longest Chain</string>
<string>Client Name</string>
</property>
</widget>
</item>
<item row="18" column="2">
<widget class="QLabel" name="longestchain">
<item row="13" column="2">
<widget class="QLabel" name="clientname">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="QLabel" name="longestchainspacer">
<item row="8" column="1">
<widget class="QLabel" name="kmdversionspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QLabel" name="txcountlabel">
<item row="11" column="1">
<widget class="QLabel" name="p2pportspacer">
<property name="text">
<string>Wallet Transactions</string>
<string>|</string>
</property>
</widget>
</item>
<item row="19" column="2">
<widget class="QLabel" name="txcount">
<item row="18" column="2">
<widget class="QLabel" name="chaintxcount">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="QLabel" name="txcountspacer">
<item row="12" column="1">
<widget class="QLabel" name="rpcportspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QLabel" name="chaintxcountlabel">
<item row="15" column="0">
<widget class="QLabel" name="localserviceslabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Chain Transactions</string>
<string>Local Services</string>
</property>
</widget>
</item>
<item row="20" column="2">
<widget class="QLabel" name="chaintxcount">
<item row="9" column="1">
<widget class="QLabel" name="protocolversionspacer">
<property name="text">
<string>Loading...</string>
<string>|</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="QLabel" name="chaintxcountspacer">
<item row="7" column="0">
<widget class="QLabel" name="laglabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
<string>Notarized Lag</string>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="tlssupportlabel">
<item row="2" column="0">
<widget class="QLabel" name="label_12">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TLS Support</string>
<string>Network solution rate</string>
</property>
</widget>
</item>
<item row="21" column="2">
<widget class="QLabel" name="tlssupport">
<item row="10" column="2">
<widget class="QLabel" name="version">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="21" column="1">
<widget class="QLabel" name="tlssupportspacer">
<item row="14" column="0">
<widget class="QLabel" name="halvinglabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
<string>Next Halving</string>
</property>
</widget>
</item>
<item row="3" column="2">
<item row="17" column="0">
<widget class="QLabel" name="txcountlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Wallet Transactions</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="solrate">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_12">
<item row="15" column="2">
<widget class="QLabel" name="localservices">
<property name="text">
<string>Network solution rate</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<item row="6" column="0">
<widget class="QLabel" name="notarizedtxidlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Connections</string>
<string>Notarized txid</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="blockheight">
<item row="5" column="2">
<widget class="QLabel" name="notarizedhashvalue">
<property name="text">
<string>Loading...</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="18" column="1">
<widget class="QLabel" name="chaintxcountspacer">
<property name="text">
<string>|</string>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
<item row="15" column="1">
<widget class="QLabel" name="localservicesspacer">
<property name="text">
<string>|</string>
</property>
</spacer>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_9">
<item row="9" column="0">
<widget class="QLabel" name="protocolversionlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
<string>Protocol Version</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_11">
<item row="0" column="2">
<widget class="QLabel" name="blockheight">
<property name="text">
<string>|</string>
<string>Loading...</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="QLabel" name="label_13">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>|</string>
</property>
@ -1587,7 +1699,7 @@
<x>0</x>
<y>0</y>
<width>1487</width>
<height>30</height>
<height>24</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">

7
src/settings.ui
View File

@ -365,13 +365,6 @@
</property>
</widget>
</item>
<item row="15" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="langlabel">
<property name="sizePolicy">

Write Preview
Loading…
Cancel
Save