Enabled macOS Menubar in Settings

But now there's a Dock icon Signed-off-by: Elsie Hupp <[email protected]>
nextcloud · Mar 2, 2021 · 57e4096 · 57e4096
1 parent a66db50
commit 57e4096
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -5,7 +5,7 @@
         <key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>LSUIElement</key>
-	<true/>
+	<false/>
 	<key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleExecutable</key>

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
@@ -26,6 +26,7 @@
 #include "accountmanager.h"
 
 #include <QLabel>
+#include <QMenuBar>
 #include <QStandardItemModel>
 #include <QStackedWidget>
 #include <QPushButton>
@@ -88,10 +89,14 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     ConfigFile cfg;
 
     _ui->setupUi(this);
+
+    _menuBar = new QMenuBar(parent);
+
     _toolBar = new QToolBar;
     _toolBar->setIconSize(QSize(32, 32));
     _toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    layout()->setMenuBar(_toolBar);
+    // layout()->addWidget(_toolBar);
+    layout()->setMenuBar(_menuBar);
 
     // People perceive this as a Window, so also make Ctrl+W work
     auto *closeWindowAction = new QAction(this);

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
@@ -23,6 +23,7 @@
 
 class QAction;
 class QActionGroup;
+class QMenuBar;
 class QToolBar;
 class QStandardItemModel;
 
@@ -89,6 +90,7 @@ private slots:
     // case the account avatar changes
     QHash<Account *, QAction *> _actionForAccount;
 
+    QMenuBar *_menuBar;
     QToolBar *_toolBar;
 
     ownCloudGui *_gui;