powerprofiles: Hide power profiles menu, when API not available

Author: palinek

src/PowerProfiles.cpp

@@ -60,9 +60,11 @@ namespace LXQt
         : QObject{parent}
         , mThread{new QThread}
         , mPropGetter{new DBusPropAsyncGetter{msDBusPPService, msDBusPPPath, msDBusPPInterface, QDBusConnection::systemBus()}}
+        , mMenuAction{new QAction}
         , mMenu{new QMenu}
 
     {
+        mMenuAction->setMenu(mMenu.get());
         mMenu->menuAction()->setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-performance")));
         mMenu->setTitle(tr("Power profile"));
 
@@ -99,9 +101,9 @@ namespace LXQt
         mThread->wait();
     }
 
-    QMenu * PowerProfiles::menu()
+    QAction * PowerProfiles::menuAction()
     {
-        return mMenu.get();
+        return mMenuAction.get();
     }
 
     void PowerProfiles::onFetched(const QString name, const QVariant value)
@@ -125,12 +127,13 @@ namespace LXQt
         if (profiles.empty())
         {
             mActions.reset(nullptr);
-            mMenu->addAction(tr("power-profiles-daemon not available"))->setDisabled(true);
+            mMenuAction->setVisible(false);
             return;
         }
 
+        mMenuAction->setVisible(true);
         mActions.reset(new QActionGroup(nullptr));
-        mActions->setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional);
+        mActions->setExclusionPolicy(QActionGroup::ExclusionPolicy::Exclusive);
 
         connect(mActions.get(), &QActionGroup::triggered, this, [this] (const QAction * a) {
             setActiveProfile(get<QString>(a->data()));

src/PowerProfiles.h

@@ -30,6 +30,7 @@
 #include <QObject>
 #include "dbus_types.h"
 
+class QAction;
 class QMenu;
 class QActionGroup;
 
@@ -57,7 +58,7 @@ namespace LXQt
         bool isValid() const;
         const QString & activeProfile() const;
         void setActiveProfile(const QString & value);
-        QMenu * menu();
+        QAction * menuAction();
 
     Q_SIGNALS:
         void needPropertyFetch(const QString & name);
@@ -83,6 +84,7 @@ namespace LXQt
         std::unique_ptr<QThread> mThread;
         std::unique_ptr<DBusPropAsyncGetter> mPropGetter;
 
+        std::unique_ptr<QAction> mMenuAction;
         std::unique_ptr<QMenu> mMenu;
         std::unique_ptr<QActionGroup> mActions;
         QString mActiveProfile;

src/trayicon.cpp

@@ -100,7 +100,7 @@ TrayIcon::TrayIcon(Solid::Battery *battery, QObject *parent)
     pauseMenu->addActions(mPauseActions->actions());
 
     // power-profiles actions
-    mContextMenu.addMenu(LXQt::PowerProfiles::instance().menu());
+    mContextMenu.addAction(LXQt::PowerProfiles::instance().menuAction());
 
     mContextMenu.addSeparator();