RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128 from Robinhuett/wifiicon 

Use SignalStrength for format icons
pull/129/head
Alex 2018-12-25 21:07:25 +01:00 committed by GitHub
parent de0ee9fcb2 34df2b0695
commit 76bbdd0425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ALabel.cpp
View File

@ -90,7 +90,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage,
const std::string& alt) { const std::string& alt) {
auto format_icons = config_["format-icons"]; auto format_icons = config_["format-icons"];
if (format_icons.isObject()) { if (format_icons.isObject()) {
if (!alt.empty() && format_icons[alt].isString()) { if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
format_icons = format_icons[alt]; format_icons = format_icons[alt];
} else { } else {
format_icons = format_icons["default"]; format_icons = format_icons["default"];

7
src/modules/network.cpp
View File

@ -105,17 +105,21 @@ void waybar::modules::Network::worker()
auto waybar::modules::Network::update() -> void auto waybar::modules::Network::update() -> void
{ {
auto format = format_; auto format = format_;
std::string connectiontype;
if (ifid_ <= 0 || ipaddr_.empty()) { if (ifid_ <= 0 || ipaddr_.empty()) {
format = config_["format-disconnected"].isString() format = config_["format-disconnected"].isString()
? config_["format-disconnected"].asString() : format; ? config_["format-disconnected"].asString() : format;
label_.get_style_context()->add_class("disconnected"); label_.get_style_context()->add_class("disconnected");
connectiontype = "disconnected";
} else { } else {
if (essid_.empty()) { if (essid_.empty()) {
format = config_["format-ethernet"].isString() format = config_["format-ethernet"].isString()
? config_["format-ethernet"].asString() : format; ? config_["format-ethernet"].asString() : format;
connectiontype = "ethernet";
} else { } else {
format = config_["format-wifi"].isString() format = config_["format-wifi"].isString()
? config_["format-wifi"].asString() : format; ? config_["format-wifi"].asString() : format;
connectiontype = "wifi";
} }
label_.get_style_context()->remove_class("disconnected"); label_.get_style_context()->remove_class("disconnected");
} }
@ -126,7 +130,8 @@ auto waybar::modules::Network::update() -> void
fmt::arg("ifname", ifname_), fmt::arg("ifname", ifname_),
fmt::arg("netmask", netmask_), fmt::arg("netmask", netmask_),
fmt::arg("ipaddr", ipaddr_), fmt::arg("ipaddr", ipaddr_),
fmt::arg("cidr", cidr_) fmt::arg("cidr", cidr_),
fmt::arg("icon", getIcon(signal_strength_, connectiontype))
)); ));
} }