Skip to content

fix(qt): fix few gui issues #5351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 2, 2023
Merged

fix(qt): fix few gui issues #5351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9f1d26
feat: introduce TS_WARNING and use it in intro / 17453 backport follo…
UdjinM6 Apr 25, 2023
394e6cb
fix(trivial): adjust description for TS_SUCCESS
UdjinM6 Apr 25, 2023
746a370
fix(qt): remove ugly borders in statusbar
UdjinM6 Apr 26, 2023
127286d
fix(qt): remove overviewscreen border in "no wallet" mode
UdjinM6 Apr 26, 2023
abe830d
use TS_WARNING in sendcoinsdialog
UdjinM6 May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/qt/guiutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ static const std::map<ThemedColor, QColor> themedDarkColors = {
static const std::map<ThemedStyle, QString> themedStyles = {
{ ThemedStyle::TS_INVALID, "background:#a84832;" },
{ ThemedStyle::TS_ERROR, "color:#a84832;" },
{ ThemedStyle::TS_WARNING, "color:#999900;" },
{ ThemedStyle::TS_SUCCESS, "color:#5e8c41;" },
{ ThemedStyle::TS_COMMAND, "color:#008de4;" },
{ ThemedStyle::TS_PRIMARY, "color:#333;" },
Expand All @@ -183,6 +184,7 @@ static const std::map<ThemedStyle, QString> themedStyles = {
static const std::map<ThemedStyle, QString> themedDarkStyles = {
{ ThemedStyle::TS_INVALID, "background:#a84832;" },
{ ThemedStyle::TS_ERROR, "color:#a84832;" },
{ ThemedStyle::TS_WARNING, "color:#999900;" },
{ ThemedStyle::TS_SUCCESS, "color:#5e8c41;" },
{ ThemedStyle::TS_COMMAND, "color:#00599a;" },
{ ThemedStyle::TS_PRIMARY, "color:#c7c7c7;" },
Expand Down
4 changes: 3 additions & 1 deletion src/qt/guiutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ namespace GUIUtil
enum class ThemedStyle {
/* Invalid field background style */
TS_INVALID,
/* Warning text style */
TS_WARNING,
/* Failed operation text style */
TS_ERROR,
/* Failed operation text style */
/* Successful operation text style */
TS_SUCCESS,
/* Command text style */
TS_COMMAND,
Expand Down
4 changes: 2 additions & 2 deletions src/qt/intro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@ void Intro::UpdateFreeSpaceLabel()
QString freeString = tr("%n GB of free space available", "", m_bytes_available / GB_BYTES);
if (m_bytes_available < m_required_space_gb * GB_BYTES) {
freeString += " " + tr("(of %n GB needed)", "", m_required_space_gb);
ui->freeSpace->setStyleSheet("QLabel { color: #800000 }");
ui->freeSpace->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
} else if (m_bytes_available / GB_BYTES - m_required_space_gb < 10) {
freeString += " " + tr("(%n GB needed for full chain)", "", m_required_space_gb);
ui->freeSpace->setStyleSheet("QLabel { color: #999900 }");
ui->freeSpace->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING));
} else {
ui->freeSpace->setStyleSheet("");
}
Expand Down
10 changes: 9 additions & 1 deletion src/qt/res/css/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ QSlider::add-page:horizontal {
QStatusBar
******************************************************/

QStatusBar {
QStatusBar::item {
background-color: #323233;
color: #c7c7c7;
}
Expand Down Expand Up @@ -870,6 +870,14 @@ QDialog#OptionsDialog #frame {
border-color: #4a4a4b;
}

/******************************************************
OverviewPage
******************************************************/

QWidget#no_wallet_group {
background-color: #cc323232;
}

/******************************************************
OverviewPage Balances
******************************************************/
Expand Down
4 changes: 4 additions & 0 deletions src/qt/res/css/general.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,10 @@ QWidget#OverviewPage QLabel#labelAlerts {
padding: 5px;
}

QWidget#no_wallet_group {
border: 0;
}

/******************************************************
OverviewPage Balances
******************************************************/
Expand Down
10 changes: 9 additions & 1 deletion src/qt/res/css/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ QSlider::add-page:horizontal {
QStatusBar
******************************************************/

QStatusBar {
QStatusBar::item {
background-color: #f2f2f4;
color: #555;
}
Expand Down Expand Up @@ -854,6 +854,14 @@ QDialog#OptionsDialog #frame {
border-color: #dcdcdc;
}

/******************************************************
OverviewPage
******************************************************/

QWidget#no_wallet_group {
background-color: #f2f2f4;
}

/******************************************************
OverviewPage Balances
******************************************************/
Expand Down
4 changes: 2 additions & 2 deletions src/qt/sendcoinsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients)

if (displayedEntries < messageEntries) {
questionString.append("<br />");
questionString.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR) + "'>");
questionString.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING) + "'>");
questionString.append(tr("<b>(%1 of %2 entries displayed)</b>").arg(displayedEntries).arg(messageEntries));
questionString.append("</span>");
}
Expand Down Expand Up @@ -421,7 +421,7 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients)
// warn about potential privacy issues when spending too many inputs at once
if (nInputs >= 10 && m_coin_control->IsUsingCoinJoin()) {
questionString.append("<br />");
questionString.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR) + "'>");
questionString.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING) + "'>");
questionString.append(tr("Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended").arg(strCoinJoinName).arg(10));
questionString.append("<a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
questionString.append(tr("Click to learn more"));
Expand Down
1 change: 1 addition & 0 deletions src/qt/walletframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ WalletFrame::WalletFrame(BitcoinGUI* _gui) :

// hbox for no wallet
no_wallet_group = new QGroupBox(walletStack);
no_wallet_group->setObjectName("no_wallet_group");
QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group);

QLabel *noWallet = new QLabel(tr("No wallet has been loaded.\nGo to File > Open Wallet to load a wallet.\n- OR -"));
Expand Down