Merge pull request #1810 from pinselimo/revert-1120

Alexays · Nov 24, 2022 · 748c612 · 748c612
2 parents 74fa131 + 235861f
commit 748c612
Show file tree

Hide file tree

Showing 46 changed files with 272 additions and 465 deletions.
diff --git a/include/AButton.hpp b/include/AButton.hpp
diff --git a/include/modules/backlight.hpp b/include/modules/backlight.hpp
@@ -5,7 +5,7 @@
 #include <string_view>
 #include <vector>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/json.hpp"
 #include "util/sleeper_thread.hpp"
 
@@ -14,7 +14,7 @@ struct udev_device;
 
 namespace waybar::modules {
 
-class Backlight : public AButton {
+class Backlight : public ALabel {
   class BacklightDev {
    public:
     BacklightDev() = default;

diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
@@ -26,7 +26,7 @@ namespace fs = std::experimental::filesystem;
 namespace fs = std::filesystem;
 #endif
 
-class Battery : public AButton {
+class Battery : public ALabel {
  public:
   Battery(const std::string&, const Json::Value&);
   ~Battery();

diff --git a/include/modules/bluetooth.hpp b/include/modules/bluetooth.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #ifdef WANT_RFKILL
 #include "util/rfkill.hpp"
 #endif
@@ -12,7 +12,7 @@
 
 namespace waybar::modules {
 
-class Bluetooth : public AButton {
+class Bluetooth : public ALabel {
   struct ControllerInfo {
     std::string path;
     std::string address;

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
@@ -2,7 +2,7 @@
 
 #include <date/tz.h>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar {
@@ -14,7 +14,7 @@ namespace modules {
 const std::string kCalendarPlaceholder = "calendar";
 const std::string KTimezonedTimeListPlaceholder = "timezoned_time_list";
 
-class Clock : public AButton {
+class Clock : public ALabel {
  public:
   Clock(const std::string&, const Json::Value&);
   ~Clock() = default;

diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp
@@ -9,12 +9,12 @@
 #include <utility>
 #include <vector>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Cpu : public AButton {
+class Cpu : public ALabel {
  public:
   Cpu(const std::string&, const Json::Value&);
   ~Cpu() = default;

diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp
@@ -5,14 +5,14 @@
 #include <csignal>
 #include <string>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Custom : public AButton {
+class Custom : public ALabel {
  public:
   Custom(const std::string&, const std::string&, const Json::Value&);
   ~Custom();

diff --git a/include/modules/disk.hpp b/include/modules/disk.hpp
@@ -5,13 +5,13 @@
 
 #include <fstream>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/format.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Disk : public AButton {
+class Disk : public ALabel {
  public:
   Disk(const std::string&, const Json::Value&);
   ~Disk() = default;

diff --git a/include/modules/hyprland/backend.hpp b/include/modules/hyprland/backend.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <list>
 #include <functional>
+#include <list>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -9,7 +9,7 @@
 namespace waybar::modules::hyprland {
 
 class EventHandler {
-public:
+ public:
   virtual void onEvent(const std::string& ev) = 0;
   virtual ~EventHandler() = default;
 };

diff --git a/include/modules/hyprland/language.hpp b/include/modules/hyprland/language.hpp
@@ -1,14 +1,13 @@
 #include <fmt/format.h>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::hyprland {
 
-class Language : public waybar::AButton,
-public EventHandler {
+class Language : public waybar::ALabel, public EventHandler {
  public:
   Language(const std::string&, const waybar::Bar&, const Json::Value&);
   ~Language();

diff --git a/include/modules/hyprland/window.hpp b/include/modules/hyprland/window.hpp
@@ -9,8 +9,7 @@
 
 namespace waybar::modules::hyprland {
 
-class Window : public waybar::ALabel,
- public EventHandler {
+class Window : public waybar::ALabel, public EventHandler {
  public:
   Window(const std::string&, const waybar::Bar&, const Json::Value&);
   ~Window();

diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp
@@ -2,13 +2,13 @@
 
 #include <fmt/format.h>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
 
 namespace waybar::modules {
 
-class IdleInhibitor : public AButton {
+class IdleInhibitor : public ALabel {
   sigc::connection timeout_;
 
  public:

diff --git a/include/modules/inhibitor.hpp b/include/modules/inhibitor.hpp
@@ -4,12 +4,12 @@
 
 #include <memory>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "bar.hpp"
 
 namespace waybar::modules {
 
-class Inhibitor : public AButton {
+class Inhibitor : public ALabel {
  public:
   Inhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
   ~Inhibitor() override;

diff --git a/include/modules/memory.hpp b/include/modules/memory.hpp
@@ -5,12 +5,12 @@
 #include <fstream>
 #include <unordered_map>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Memory : public AButton {
+class Memory : public ALabel {
  public:
   Memory(const std::string&, const Json::Value&);
   ~Memory() = default;

diff --git a/include/modules/mpd/mpd.hpp b/include/modules/mpd/mpd.hpp
@@ -7,12 +7,12 @@
 #include <condition_variable>
 #include <thread>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "modules/mpd/state.hpp"
 
 namespace waybar::modules {
 
-class MPD : public AButton {
+class MPD : public ALabel {
   friend class detail::Context;
 
   // State machine

diff --git a/include/modules/mpd/state.hpp b/include/modules/mpd/state.hpp
@@ -7,7 +7,7 @@
 #include <condition_variable>
 #include <thread>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 class MPD;

diff --git a/include/modules/network.hpp b/include/modules/network.hpp
@@ -10,15 +10,15 @@
 
 #include <optional>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 #ifdef WANT_RFKILL
 #include "util/rfkill.hpp"
 #endif
 
 namespace waybar::modules {
 
-class Network : public AButton {
+class Network : public ALabel {
  public:
   Network(const std::string&, const Json::Value&);
   ~Network();

diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp
@@ -7,11 +7,11 @@
 #include <algorithm>
 #include <array>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Pulseaudio : public AButton {
+class Pulseaudio : public ALabel {
  public:
   Pulseaudio(const std::string&, const Json::Value&);
   ~Pulseaudio();

diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp
@@ -2,12 +2,12 @@
 
 #include <fmt/chrono.h>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Clock : public AButton {
+class Clock : public ALabel {
  public:
   Clock(const std::string&, const Json::Value&);
   ~Clock() = default;

diff --git a/include/modules/sndio.hpp b/include/modules/sndio.hpp
@@ -4,12 +4,12 @@
 
 #include <vector>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Sndio : public AButton {
+class Sndio : public ALabel {
  public:
   Sndio(const std::string &, const Json::Value &);
   ~Sndio();

diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp
@@ -6,15 +6,15 @@
 #include <map>
 #include <string>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Language : public AButton, public sigc::trackable {
+class Language : public ALabel, public sigc::trackable {
  public:
   Language(const std::string& id, const Json::Value& config);
   ~Language() = default;

diff --git a/include/modules/sway/mode.hpp b/include/modules/sway/mode.hpp
@@ -2,15 +2,15 @@
 
 #include <fmt/format.h>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
 
 namespace waybar::modules::sway {
 
-class Mode : public AButton, public sigc::trackable {
+class Mode : public ALabel, public sigc::trackable {
  public:
   Mode(const std::string&, const Json::Value&);
   ~Mode() = default;

diff --git a/include/modules/temperature.hpp b/include/modules/temperature.hpp
@@ -4,12 +4,12 @@
 
 #include <fstream>
 
-#include "AButton.hpp"
+#include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-class Temperature : public AButton {
+class Temperature : public ALabel {
  public:
   Temperature(const std::string&, const Json::Value&);
   ~Temperature() = default;