From: Shane Synan Date: Mon, 20 Jul 2020 05:27:30 +0000 (-0400) Subject: client: Switch infobar dialog-* icons to emblem-* X-Git-Tag: 0.14-rc1~26 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e567422cdd0e3c805d4bb37b81d532cb762b983e client: Switch infobar dialog-* icons to emblem-* Switch the icons representing whether a feature is supported or not from the "dialog-*" set of icons, which can be hard to distinguish at small sizes, to the "emblem-*" set of icons, which are much more distinguishable, and actually designed as emblems. This means older icon sets such as Ubuntu's Humanity will no longer have a custom icon available, but the Breeze icons aren't too far out of place. Oxygen does not provide these icons, so include a fallback to the previous icon names. --- diff --git a/3rdparty/icons/breeze-dark/emblems/16/emblem-information.svg b/3rdparty/icons/breeze-dark/emblems/16/emblem-information.svg new file mode 100644 index 00000000..e25606db --- /dev/null +++ b/3rdparty/icons/breeze-dark/emblems/16/emblem-information.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/3rdparty/icons/breeze-dark/emblems/16/emblem-question.svg b/3rdparty/icons/breeze-dark/emblems/16/emblem-question.svg new file mode 100644 index 00000000..293bd287 --- /dev/null +++ b/3rdparty/icons/breeze-dark/emblems/16/emblem-question.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/3rdparty/icons/breeze-dark/emblems/16/emblem-success.svg b/3rdparty/icons/breeze-dark/emblems/16/emblem-success.svg new file mode 100644 index 00000000..f52f7915 --- /dev/null +++ b/3rdparty/icons/breeze-dark/emblems/16/emblem-success.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/3rdparty/icons/breeze-dark/emblems/16/emblem-unavailable.svg b/3rdparty/icons/breeze-dark/emblems/16/emblem-unavailable.svg new file mode 100644 index 00000000..77683c97 --- /dev/null +++ b/3rdparty/icons/breeze-dark/emblems/16/emblem-unavailable.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/3rdparty/icons/breeze/emblems/16/emblem-information.svg b/3rdparty/icons/breeze/emblems/16/emblem-information.svg new file mode 100644 index 00000000..aa85e54c --- /dev/null +++ b/3rdparty/icons/breeze/emblems/16/emblem-information.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/3rdparty/icons/breeze/emblems/16/emblem-question.svg b/3rdparty/icons/breeze/emblems/16/emblem-question.svg new file mode 100644 index 00000000..bc2c2173 --- /dev/null +++ b/3rdparty/icons/breeze/emblems/16/emblem-question.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/3rdparty/icons/breeze/emblems/16/emblem-success.svg b/3rdparty/icons/breeze/emblems/16/emblem-success.svg new file mode 100644 index 00000000..b466e825 --- /dev/null +++ b/3rdparty/icons/breeze/emblems/16/emblem-success.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/3rdparty/icons/breeze/emblems/16/emblem-unavailable.svg b/3rdparty/icons/breeze/emblems/16/emblem-unavailable.svg new file mode 100644 index 00000000..a47db09b --- /dev/null +++ b/3rdparty/icons/breeze/emblems/16/emblem-unavailable.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp index 9a555d17..804d6702 100644 --- a/src/qtui/coreinfodlg.cpp +++ b/src/qtui/coreinfodlg.cpp @@ -43,7 +43,7 @@ CoreInfoDlg::CoreInfoDlg(QWidget* parent) coreInfoResynchronized(); // Warning icon - ui.coreUnsupportedIcon->setPixmap(icon::get("dialog-warning").pixmap(16)); + ui.coreUnsupportedIcon->setPixmap(icon::get({"emblem-unavailable", "dialog-warning"}).pixmap(16)); updateUptime(); startTimer(1000); diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp index b79e3e34..33774b87 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.cpp +++ b/src/qtui/settingspages/corehighlightsettingspage.cpp @@ -79,7 +79,7 @@ CoreHighlightSettingsPage::CoreHighlightSettingsPage(QWidget* parent) connect(Client::instance(), &Client::connected, this, &CoreHighlightSettingsPage::clientConnected); // Warning icon - ui.coreUnsupportedIcon->setPixmap(icon::get("dialog-warning").pixmap(16)); + ui.coreUnsupportedIcon->setPixmap(icon::get({"emblem-unavailable", "dialog-warning"}).pixmap(16)); // Set up client/monolithic remote highlights information // Local highlights are considered legacy diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp index 4a9b11da..2587b8ae 100644 --- a/src/qtui/settingspages/highlightsettingspage.cpp +++ b/src/qtui/settingspages/highlightsettingspage.cpp @@ -81,7 +81,7 @@ HighlightSettingsPage::HighlightSettingsPage(QWidget* parent) ui.highlightTable->horizontalHeader()->setSectionResizeMode(HighlightSettingsPage::ChanColumn, QHeaderView::ResizeToContents); // Information icon - ui.localHighlightsIcon->setPixmap(icon::get("dialog-information").pixmap(16)); + ui.localHighlightsIcon->setPixmap(icon::get({"emblem-information", "dialog-information"}).pixmap(16)); connect(ui.add, &QAbstractButton::clicked, this, [this]() { addNewRow(); }); connect(ui.remove, &QAbstractButton::clicked, this, &HighlightSettingsPage::removeSelectedRows); diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 6a36d0ee..468f2b57 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -67,8 +67,9 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget* parent) disconnectedIcon = icon::get("network-disconnect"); // Status icons - infoIcon = icon::get("dialog-information"); - warningIcon = icon::get("dialog-warning"); + successIcon = icon::get({"emblem-success", "dialog-information"}); + unavailableIcon = icon::get({"emblem-unavailable", "dialog-warning"}); + questionIcon = icon::get({"emblem-question", "dialog-question", "dialog-information"}); foreach (int mib, QTextCodec::availableMibs()) { QByteArray codec = QTextCodec::codecForMib(mib)->name(); @@ -706,23 +707,23 @@ void NetworksSettingsPage::setSASLStatus(const CapSupportStatus saslStatus) // There's no capability negotiation or network doesn't exist. Don't assume // anything. ui.saslStatusLabel->setText(QString("%1").arg(tr("Could not check if supported by network"))); - ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16)); + ui.saslStatusIcon->setPixmap(questionIcon.pixmap(16)); break; case CapSupportStatus::Disconnected: // Disconnected from network, no way to check. ui.saslStatusLabel->setText(QString("%1").arg(tr("Cannot check if supported when disconnected"))); - ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16)); + ui.saslStatusIcon->setPixmap(questionIcon.pixmap(16)); break; case CapSupportStatus::MaybeUnsupported: // The network doesn't advertise support for SASL PLAIN. Here be dragons. ui.saslStatusLabel->setText(QString("%1").arg(tr("Not currently supported by network"))); - ui.saslStatusIcon->setPixmap(warningIcon.pixmap(16)); + ui.saslStatusIcon->setPixmap(unavailableIcon.pixmap(16)); break; case CapSupportStatus::MaybeSupported: // The network advertises support for SASL PLAIN. Encourage using it! // Unfortunately we don't know for sure if it's desired or functional. ui.saslStatusLabel->setText(QString("%1").arg(tr("Supported by network"))); - ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16)); + ui.saslStatusIcon->setPixmap(successIcon.pixmap(16)); break; } } diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index 33e474cd..5c9efca0 100644 --- a/src/qtui/settingspages/networkssettingspage.h +++ b/src/qtui/settingspages/networkssettingspage.h @@ -137,7 +137,7 @@ private: QIcon connectedIcon, connectingIcon, disconnectedIcon; // Status icons - QIcon infoIcon, warningIcon; + QIcon successIcon, unavailableIcon, questionIcon; CapSupportStatus _saslStatusSelected; /// Status of SASL support for currently-selected network