Make manual override slider bidirectional

AdaptiveBrightness/main_window.cpp

@@ -7,7 +7,6 @@
 
 #include <QCloseEvent>
 #include <QGroupBox>
-#include <QSlider>
 #include <QtDebug>
 #include <QtGlobal>
 
@@ -21,10 +20,10 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
     qDebug(ltr("Creating main window"));
 
     m_ui.setupUi(this);
-    auto slider = m_ui.centralWidget->findChild<QGroupBox*>("groupBox")->findChild<QSlider*>("horizontalSlider");
+    m_manualBrightnessSlider = m_ui.centralWidget->findChild<QGroupBox*>("groupBox")->findChild<QSlider*>("horizontalSlider");
 
-    if(slider) {
+    if(m_manualBrightnessSlider) {
-        connect(slider, &QSlider::valueChanged, [this](int value) {
+        connect(m_manualBrightnessSlider, &QSlider::valueChanged, [this](int value) {
             const auto mappedBrightness = utils::map(value, 0, 100, 0.f, 1.f);
             const auto newBrightness = std::clamp(mappedBrightness, 0.f, 1.f);
             qDebug(ltr("Overriding brightness with %1").arg(newBrightness));
@@ -61,6 +60,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
         m_trayIcon->setIcon(*m_errorIcon);
         m_trayIcon->setContextMenu(m_trayIconMenu);
         m_trayIcon->show();
+        m_trayIcon->setToolTip(tr("AdaptiveBrightness"));
+        connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::trayIconClicked);
 
         qDebug(ltr("Tray icon initialized"));
     }
@@ -195,4 +196,19 @@ void MainWindow::updateState()
     else if(m_trayIcon) {
         m_trayIcon->setIcon(*m_errorIcon);
     }
+
+    if(m_trayIcon) {
+        m_trayIcon->setToolTip(tr("AdaptiveBrightness - %1%").arg(m_brightness * 100, 0, 'f', 0));
+    }
+
+    if(m_manualBrightnessSlider) {
+        m_manualBrightnessSlider->setValue(utils::map(m_brightness, 0.f, 1.f, 0, 100));
+    }
+}
+
+void MainWindow::trayIconClicked(QSystemTrayIcon::ActivationReason reason)
+{
+    if(reason == QSystemTrayIcon::ActivationReason::Trigger) {
+        m_showHideAction->trigger();
+    }
 }

AdaptiveBrightness/main_window.hpp

@@ -8,6 +8,7 @@
 #include <QIcon>
 #include <QMainWindow>
 #include <QMenu>
+#include <QSlider>
 #include <QSystemTrayIcon>
 #include <QThread>
 #include <QTimer>
@@ -31,6 +32,8 @@ class MainWindow : public QMainWindow {
 
     void updateState();
 
+    void trayIconClicked(QSystemTrayIcon::ActivationReason reason);
+
     Ui::AdaptiveBrightnessClass m_ui;
 
     std::array<std::unique_ptr<QIcon>, 9> m_noSensorStateIcons;
@@ -45,6 +48,8 @@ class MainWindow : public QMainWindow {
     QThread* m_timerThread = nullptr;
     QTimer* m_timer = nullptr;
 
+    QSlider* m_manualBrightnessSlider = nullptr;
+
     float m_brightness = 0.5f;
 
     std::vector<Sensor> m_sensors;