Merge pull request #52 from scratchcpp/linux_native_menu_bar

Implement Linux native menu bar

Author: adazem009

CMakeLists.txt

@@ -10,6 +10,11 @@ option(SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS "Build unit tests" ON)
 find_package(Qt6 6.6 COMPONENTS Quick QuickControls2 Widgets OpenGLWidgets REQUIRED)
 set(QT_LIBS Qt6::Quick Qt6::QuickControls2 Qt6::Widgets Qt6::OpenGLWidgets)
 
+if (LINUX)
+ find_package(Qt6 6.6 COMPONENTS DBus REQUIRED)
+ set(QT_LIBS ${QT_LIBS} Qt6::DBus)
+endif()
+
 if (SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS)
  set(GTEST_DIR thirdparty/googletest)
  add_subdirectory(${PROJECT_SOURCE_DIR}/${GTEST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${GTEST_DIR})

src/ui/internal/uiengine.cpp

@@ -2,6 +2,10 @@
 
 #include <QCoreApplication>
 #include <QPushButton>
+#ifdef Q_OS_LINUX
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
+#endif
 
 #include "uiengine.h"
 
@@ -66,3 +70,24 @@ void UiEngine::setActiveFocusItem(QQuickItem *newActiveFocusItem)
  m_activeFocusItem = newActiveFocusItem;
  emit activeFocusItemChanged();
 }
+
+bool UiEngine::useNativeMenuBar() const
+{
+#if defined(Q_OS_MACOS)
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
+ return true;
+#else
+ // Since Qt 6.8, Qt Quick Controls menu bar is native
+ return false;
+#endif
+#elif defined(Q_OS_LINUX)
+ const QDBusConnection connection = QDBusConnection::sessionBus();
+ static const QString registrarService = QStringLiteral("com.canonical.AppMenu.Registrar");
+ if (const auto iface = connection.interface())
+ return iface->isServiceRegistered(registrarService);
+ else
+ return false;
+#else
+ return false;
+#endif
+}

src/ui/internal/uiengine.h

@@ -19,6 +19,7 @@ class UiEngine
 {
  Q_OBJECT
  Q_PROPERTY(QQuickItem *activeFocusItem READ activeFocusItem WRITE setActiveFocusItem NOTIFY activeFocusItemChanged)
+ Q_PROPERTY(bool useNativeMenuBar READ useNativeMenuBar NOTIFY useNativeMenuBarChanged FINAL)
 
  public:
  explicit UiEngine(QObject *parent = nullptr);
@@ -34,8 +35,11 @@ class UiEngine
  QQuickItem *activeFocusItem() const;
  void setActiveFocusItem(QQuickItem *newActiveFocusItem);
 
+ bool useNativeMenuBar() const;
+
  signals:
  void activeFocusItemChanged();
+ void useNativeMenuBarChanged();
 
  private:
  static std::shared_ptr<UiEngine> m_instance;

src/uicomponents/CustomMenuBar.qml

@@ -2,6 +2,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import Qt.labs.platform as Platform
 import ScratchCPP.Ui
 import ScratchCPP.UiComponents
 
@@ -22,8 +23,7 @@ MenuBar {
  }
 
  function getComponentString(typeName) {
- //var imports = "import QtQuick; import QtQuick.Controls; import Qt.labs.platform as Platform;"
- var imports = "import QtQuick; import QtQuick.Controls;"
+ var imports = "import QtQuick; import QtQuick.Controls; import Qt.labs.platform as Platform;"
  return imports + " " + typeName + " {}";
  }
 
@@ -103,11 +103,11 @@ MenuBar {
  }
 
  function reload() {
- /*if(nativeMenuBarEnabled)
+ if(UiEngine.useNativeMenuBar)
  {
  root.visible = false;
  return;
- }*/
+ }
 
  var oldObjects = [];
 
@@ -132,14 +132,14 @@ MenuBar {
 
  Component.onCompleted: reload();
 
- /*onEnabledChanged: {
+ onEnabledChanged: {
  if(platformMenuBarLoader.active)
  platformMenuBarLoader.item.reload();
  }
 
  Loader {
  id: platformMenuBarLoader
- active: // whether the native menu bar is active
+ active: UiEngine.useNativeMenuBar
 
  sourceComponent: Platform.MenuBar {
  id: platformMenuBar
@@ -149,14 +149,14 @@ MenuBar {
  createMenuBar(platformMenuBar, "Platform.Menu", "Platform.MenuItem", "Platform.MenuSeparator");
  }
 
- Connections {
- target: QmlUtils
+ /*Connections {
+ target: // TODO: Add a class for the menu bar reload signal
  function onMenuBarReloadTriggered() {
  platformMenuBar.reload();
  }
- }
+ }*/
 
  Component.onCompleted: reload();
  }
- }*/
+ }
 }