From 9296faf0ffc411dd347ee61b6c9ca617f9421917 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Wed, 8 Jan 2025 19:13:31 +0800 Subject: [PATCH] mac menu --- app/actionmanager.cpp | 2 ++ app/mainwindow.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/actionmanager.cpp b/app/actionmanager.cpp index f8b44ff..71e202a 100644 --- a/app/actionmanager.cpp +++ b/app/actionmanager.cpp @@ -83,6 +83,8 @@ void ActionManager::setupAction(MainWindow *mainWindow) #undef CREATE_NEW_ACTION #undef CREATE_NEW_THEMEICON_ACTION + actionSettings->setMenuRole(QAction::PreferencesRole); + retranslateUi(mainWindow); QMetaObject::connectSlotsByName(mainWindow); diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index a025b6f..7faaad5 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -37,6 +37,8 @@ #include #include #include +#include +#include #ifdef HAVE_QTDBUS #include @@ -126,6 +128,14 @@ MainWindow::MainWindow(QWidget *parent) m_am->setupAction(this); + QMenuBar * menuBar = new QMenuBar(this); + QMenu* fileMenu = menuBar->addMenu("File"); + fileMenu->addAction(m_am->actionOpen); + fileMenu->addAction(m_am->actionSettings); + QMenu* helpMenu = menuBar->addMenu("Help"); + helpMenu->addAction(m_am->actionHelp); + layout()->setMenuBar(menuBar); + m_bottomButtonGroup = new BottomButtonGroup({ m_am->actionActualSize, m_am->actionToggleMaximize,