parent
7af6e8413c
commit
f18eb71ad7
|
@ -79,7 +79,7 @@ def signal_handler(sig, frame):
|
||||||
def parse_arguments():
|
def parse_arguments():
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
|
|
||||||
# Increase verbosity with every occurence of -v
|
# Increase verbosity with every occurrence of -v
|
||||||
parser.add_argument('-v', '--verbose', action='count', default=0)
|
parser.add_argument('-v', '--verbose', action='count', default=0)
|
||||||
|
|
||||||
# Define for which player we're listening
|
# Define for which player we're listening
|
||||||
|
|
|
@ -16,7 +16,7 @@ using waybar::modules::waybar_time;
|
||||||
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
|
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
|
||||||
: ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true), fixed_time_zone_(false) {
|
: ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true), fixed_time_zone_(false) {
|
||||||
if (config_["timezone"].isString()) {
|
if (config_["timezone"].isString()) {
|
||||||
spdlog::warn("As using a timezone, some format args may be missing as the date library havn't got a release since 2018.");
|
spdlog::warn("As using a timezone, some format args may be missing as the date library haven't got a release since 2018.");
|
||||||
time_zone_ = date::locate_zone(config_["timezone"].asString());
|
time_zone_ = date::locate_zone(config_["timezone"].asString());
|
||||||
fixed_time_zone_ = true;
|
fixed_time_zone_ = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -469,7 +469,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_del_event && ifi->ifi_index == net->ifid_) {
|
if (!is_del_event && ifi->ifi_index == net->ifid_) {
|
||||||
// Update inferface information
|
// Update interface information
|
||||||
if (net->ifname_.empty() && ifname != NULL) {
|
if (net->ifname_.empty() && ifname != NULL) {
|
||||||
std::string new_ifname (ifname, ifname_len);
|
std::string new_ifname (ifname, ifname_len);
|
||||||
net->ifname_ = new_ifname;
|
net->ifname_ = new_ifname;
|
||||||
|
|
|
@ -35,7 +35,7 @@ void Tray::onRemove(std::unique_ptr<Item>& item) {
|
||||||
}
|
}
|
||||||
|
|
||||||
auto Tray::update() -> void {
|
auto Tray::update() -> void {
|
||||||
// Show tray only when items are availale
|
// Show tray only when items are available
|
||||||
box_.set_visible(!box_.get_children().empty());
|
box_.set_visible(!box_.get_children().empty());
|
||||||
// Call parent update
|
// Call parent update
|
||||||
AModule::update();
|
AModule::update();
|
||||||
|
|
|
@ -85,7 +85,7 @@ TEST_CASE("Load multiple bar config with include", "[config]") {
|
||||||
conf.load("test/config/include-multi.json");
|
conf.load("test/config/include-multi.json");
|
||||||
|
|
||||||
SECTION("bar config with sole include") {
|
SECTION("bar config with sole include") {
|
||||||
auto data = conf.getOutputConfigs("OUT-0", "Fake ouptut #0");
|
auto data = conf.getOutputConfigs("OUT-0", "Fake output #0");
|
||||||
REQUIRE(data.size() == 1);
|
REQUIRE(data.size() == 1);
|
||||||
REQUIRE(data[0]["height"].asInt() == 20);
|
REQUIRE(data[0]["height"].asInt() == 20);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue