Skip to content

Commit

Permalink
Update QT styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobpepers
bobpepers committed May 10, 2023
1 parent a07479c commit 9a4870c
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 49 deletions.
8 changes: 4 additions & 4 deletions src/qt/bitcoinunits.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ QString BitcoinUnits::longName(int unit)
case BTC: return QString("RUNES");
case mBTC: return QString("CHUNKS");
case uBTC: return QString::fromUtf8("CHIPS (bits)");
case SAT: return QString("Satoshi (sat)");
case SAT: return QString("DUST (sat)");
default: return QString("???");
}
}
Expand All @@ -52,8 +52,8 @@ QString BitcoinUnits::shortName(int unit)
{
switch(unit)
{
case uBTC: return QString::fromUtf8("bits");
case SAT: return QString("sat");
case uBTC: return QString::fromUtf8("CHIPS");
case SAT: return QString("DUST");
default: return longName(unit);
}
}
Expand All @@ -65,7 +65,7 @@ QString BitcoinUnits::description(int unit)
case BTC: return QString("RUNES");
case mBTC: return QString("CHUNKS (1 / 1" THIN_SP_UTF8 "000)");
case uBTC: return QString("CHIPS (bits) (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
case SAT: return QString("Satoshi (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
case SAT: return QString("DUST (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
default: return QString("???");
}
}
Expand Down
89 changes: 59 additions & 30 deletions src/qt/res/styles/theme3/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ Main Window CSS
QMainWindow{
background-color: #4f9fde;
border: 0px solid transparent;
background-image: url(":/styles/theme3/app-icons/bg");
background-position: bottom left;
background-repeat: no-repeat;
border-image: url(":/styles/theme3/app-icons/bg") 0 0 0 0 stretch stretch;
}
QMainWindow .QFrame{
border: 1px solid transparent;
Expand All @@ -26,15 +24,17 @@ QMainWindow::separator {
padding: 0px;
margin: 0px;
}
QMainWindow .QFrame#frameBalances,
#frameOtherTokens,
QMainWindow .QFrame#frameBalances{
background-color: transparent;
}
QMainWindow #frameOtherTokens,
#frameRecentTransactions,
#frameRequest,
#frameFee{
background-color: #f2f7fd;
background-color: rgba(242, 247, 253, 80%);
}
QMainWindow .QFrame#frameContract{
background-color: #f2f7fd;
/* background-color: #f2f7fd; */
}
QFrame#hLine,
#hLine2,
Expand All @@ -45,14 +45,19 @@ QFrame#hLine,
QFrame#hContractLine,
#hContractLine2,
#OverviewPage #hLine{
border-top: 4px solid #e4ebf5;
border-top: 4px solid #61a9e1;
}
QFrame#vLine,
#vLine2{
border-left: 1px solid transparent;
}
WalletFrame{
background-color: #f2f7fd;
border-width: 1px;
border-style: solid;
border-color: #61a9e1;
border-top-style: none;
border-bottom-style: none;
border-right-style: none;
}
QDialog{
background-color: #f2f7fd;
Expand Down Expand Up @@ -186,7 +191,7 @@ QGroupBox
{
border: 0px solid transparent;
margin-top: 20px;
background-color: #f2f7fd;
/* background-color: rgba(242, 247, 253, 80%); */
}
QGroupBox::title {
color: #6b80af;
Expand Down Expand Up @@ -480,7 +485,7 @@ QHeaderView::up-arrow {
}
QTableView{
color: #6b80af;
background-color: #ffffff;
background-color: rgba(242, 247, 253, 80%);
border: none;
font: normal;
qproperty-showGrid: false;
Expand Down Expand Up @@ -645,8 +650,21 @@ QTabWidget::pane {
TitleBar QTabBar::tab {
padding: 5px 0px;
}
#widgetTitle, #widgetWallet {
background-color: #f2f7fd;
#widgetWallet {
/* border-width: 1px;
border-style: solid;
border-color: #006daf;
border-top-style: none;
border-bottom-style: none;
border-right-style: none; */
}
#widgetTitle{
border-width: 1px;
border-style: solid;
border-color: #61a9e1;
border-top-style: none;
border-bottom-style: none;
border-right-style: none;
}
/*--------------------------------------------
MenuBar CSS
Expand Down Expand Up @@ -996,18 +1014,28 @@ QToolButton#tabBarTool::hover{
Stake Page Widget CSS
--------------------------------------------*/
#StakePage QLabel{
color: #b5bfd7;
color: #000000;
}
#frameStakeInfo {
background-color: #ffffff;
background-color: rgba(242, 247, 253, 80%);
border: 1px dotted #b5bfd7;
color: #b5bfd7;
color: #000000;
border-radius: 4px;
}
#StakePage QLabel #labelRecordsText{
color: #fff;
font-weight: bold;
}
#StakePage #labelRecordsText{
color: #fff;
font-weight: bold;
}
#frameStakeInfo #labelAssets{
color: #000000;
color: #c2b82f;
font: 17pt;
font-weight: bold;
}

#frameStakeInfo #labelHeight,
#frameStakeInfo #labelWeight,
#frameStakeInfo #labelReward,
Expand All @@ -1023,8 +1051,9 @@ Overview Page Widget CSS
--------------------------------------------*/
#widgetWallet #widgetTotal QLabel,
#widgetWatch #widgetWatchTotal QLabel{
color: #000000;
color: #c2b82f;
font: 23pt;
font-weight: bold;
}
#widgetPending #vLine,
#widgetImmature #vLine_2,
Expand Down Expand Up @@ -1081,7 +1110,7 @@ Token Page Widget CSS
border: 1px solid rgba(209, 219, 231, 20%);
}
#tokenItemFrame, #delegationItemFrame, #superStakerItemFrame{
background-color: #ffffff;
background-color: rgba(242, 247, 253, 80%);
border-radius: 6px;
}
TokenListWidget{
Expand All @@ -1100,45 +1129,45 @@ TokenItemWidget #senderAddress{
font: 10pt;
}
TokenItemWidget #tokenLogo{
background-color: #a1daff;
background-color: #241850;
border-radius: 20px;
}
DelegationListWidget{
background-color: #e4ebf5;
background-color: rgba(242, 247, 253, 80%);
}
DelegationItemWidget #labelFee{
color: #6b80af;
font: 13pt;
}
DelegationItemWidget #labelStaker{
color: #000000;
color: #3d113b;
font: 13pt;
}
DelegationItemWidget #labelAddress{
color: #d5dde9;
color: #000000;
font: 10pt;
}
DelegationItemWidget #delegationLogo{
background-color: #a1daff;
background-color: #241850;
border-radius: 20px;
}
SuperStakerListWidget{
background-color: #e4ebf5;
background-color: rgba(242, 247, 253, 80%);
}
SuperStakerItemWidget #labelFee{
color: #6b80af;
font: 13pt;
}
SuperStakerItemWidget #labelStaker{
color: #000000;
color: #3d113b;
font: 13pt;
}
SuperStakerItemWidget #labelAddress{
color: #d5dde9;
color: #000000;
font: 10pt;
}
SuperStakerItemWidget #superStakerLogo{
background-color: #a1daff;
background-color: #241850;
border-radius: 20px;
}
SuperStakerItemWidget #buttonDelegations{
Expand Down Expand Up @@ -1188,10 +1217,10 @@ SendCoinsDialog QAbstractScrollArea::corner {
Delegate and Staker Page Widget CSS
--------------------------------------------*/
#widgetStakingAssets QLabel{
color: #b5bfd7;
color: #000000;
}
#widgetStakingAssets #labelAssets{
color: #000000;
color: #c2b82f;
font: 13pt;
}
#vLineAssets{
Expand Down
4 changes: 2 additions & 2 deletions src/qt/res/styles/theme3/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ background-image=:/styles/theme3/app-icons/splash_bg
version=3
single-color=#008ac8
text-color=#e6f0f0
menu-color=#c22f2f
menu-color=#c2b82f
table-color-normal=#6f80ab
table-color-input=#6f80ab
table-color-inout=#6f80ab
Expand Down Expand Up @@ -53,7 +53,7 @@ logo-space=20
color-enabled=#58abdf
color-pressed=#ffffff
color-hover=#94ccf2
color-disabled=#c22f2f
color-disabled=#c2b82f
sub-icon=:/styles/theme2/app-icons/right_arrow
sub-padding-right=10
sub-padding-left=70
Expand Down
11 changes: 7 additions & 4 deletions src/qt/res/styles/theme3/navbutton.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
Tool Button Black CSS
--------------------------------------------*/
QToolButton {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: transparent;
border: 0px solid transparent;
border-radius: 0px;
padding: 10px;
}
QToolButton:checked {
border-right: 3px solid #ffffff;
border-right: 3px solid #61a9e1;
}
QToolButton:pressed, QToolButton:hover:pressed, QToolButton:checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
}
QToolButton:hover:!checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
}
QToolButton:disabled {
Expand Down
11 changes: 7 additions & 4 deletions src/qt/res/styles/theme3/navgroupbutton.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@
Tool Button Black CSS
--------------------------------------------*/
QToolButton {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: transparent;
border: 0px solid transparent;
border-radius: 0px;
padding: 10px 20px 10px 10px;
}
QToolButton:checked {
border-right: 3px solid #006daf;
border-right: 3px solid #61a9e1;
padding: 3px 20px 5px 10px;
}
QToolButton:pressed, QToolButton:hover:pressed, QToolButton:checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
}
QToolButton:hover:!checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
}
QToolButton:disabled {
Expand Down
11 changes: 7 additions & 4 deletions src/qt/res/styles/theme3/navsubgroupbutton.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@
Tool Button Black CSS
--------------------------------------------*/
QToolButton {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
border: 0px solid transparent;
border-radius: 0px;
padding: 6px 20px 6px 6px;
border-right: 3px solid #006daf;
border-right: 3px solid #61a9e1;
}
QToolButton:pressed, QToolButton:hover:pressed, QToolButton:checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
}
QToolButton:hover:!checked {
color: #c22f2f;
color: #c2b82f;
font-weight: bold;
background: rgba(34, 76, 138, 0.3);
}
QToolButton:disabled {
Expand Down
2 changes: 1 addition & 1 deletion src/qt/test/rpcnestedtests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void RPCNestedTests::rpcNestedTests()
QVERIFY(result == result2);

RPCConsole::RPCExecuteCommandLine(*node, result, "getblock(getbestblockhash())[tx][0]", &filtered);
QVERIFY(result == "ed34050eb5909ee535fcb07af292ea55f3d2f291187617b44d3282231405b96d");
QVERIFY(result == "4d050108faee132d46f0c26c346fee17e804d20f658e0b61afe3fd083c8281af");
QVERIFY(filtered == "getblock(getbestblockhash())[tx][0]");

RPCConsole::RPCParseCommandLine(nullptr, result, "importprivkey", false, &filtered);
Expand Down

0 comments on commit 9a4870c

Please sign in to comment.