Merge branch 'dtk' into dtk

linuxdeepin · Nov 13, 2023 · 4f0c242 · 4f0c242
2 parents 7326b76 + 7e19f91
commit 4f0c242
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/src/plugins/core/mainframe/windowkeeper.cpp b/src/plugins/core/mainframe/windowkeeper.cpp
@@ -105,6 +105,44 @@ void WindowKeeper::createHelpActions(DMenu *menu)
     qInfo() << __FUNCTION__;
     auto helpMenu = new DMenu(MWM_HELP);
     menu->addMenu(helpMenu);
+=======
+}
+
+void WindowKeeper::createAnalyzeActions(DMenuBar *menuBar)
+{
+    qInfo() << __FUNCTION__;
+    DMenu* analyzeMenu = new DMenu();
+    QAction* buildAction = menuBar->addMenu(analyzeMenu);
+    buildAction->setText(MWM_ANALYZE);
+}
+
+void WindowKeeper::createBuildActions(DMenuBar *menuBar)
+{
+    qInfo() << __FUNCTION__;
+    DMenu* buildMenu = new DMenu();
+    QAction* buildAction = menuBar->addMenu(buildMenu);
+    buildAction->setText(MWM_BUILD);
+}
+
+void WindowKeeper::createDebugActions(DMenuBar *menuBar)
+{
+    qInfo() << __FUNCTION__;
+    QAction* debugAction = menuBar->addMenu(new DMenu());
+    debugAction->setText(MWM_DEBUG);
+}
+
+void WindowKeeper::createToolsActions(DMenuBar *menuBar)
+{
+    qInfo() << __FUNCTION__;
+    auto toolsMenu = new DMenu(MWM_TOOLS);
+    menuBar->addMenu(toolsMenu);
+}
+
+void WindowKeeper::createHelpActions(DMenuBar *menuBar)
+{
+    qInfo() << __FUNCTION__;
+    auto helpMenu = new DMenu(MWM_HELP);
+    menuBar->addMenu(helpMenu);
 
     QAction *actionReportBug = new QAction(MWM_REPORT_BUG);
     ActionManager::getInstance()->registerAction(actionReportBug, "Help.Report.Bug",
@@ -198,6 +236,9 @@ void WindowKeeper::createMainMenu(DMenu *menu)
     menu->addSeparator();
 
     createHelpActions(menu);
+
+    DMenu* menuOpenProject = new DMenu(MWMFA_OPEN_PROJECT);
+    menu->addMenu(menuOpenProject);
 }
 
 void WindowKeeper::layoutWindow(DMainWindow *window)

diff --git a/src/plugins/core/mainframe/windowkeeper.h b/src/plugins/core/mainframe/windowkeeper.h
@@ -64,12 +64,21 @@ private :
     void createNavEdit(DToolBar *toolbar);
     void createNavRecent(DToolBar *toolbar);
     void createStatusBar(DMainWindow *window);
+
     void createHelpActions(DMenu *menu);
     void createToolsActions(DMenu *menu);
     void createDebugActions(DMenu *menu);
     void createBuildActions(DMenu *menu);
     void createFileActions(DMenu *menu);
     void createAnalyzeActions(DMenu *menu);
+
+    void createHelpActions(DMenuBar *menuBar);
+    void createToolsActions(DMenuBar *menuBar);
+    void createDebugActions(DMenuBar *menuBar);
+    void createBuildActions(DMenuBar *menuBar);
+    void createFileActions(DMenu *menu);
+    void createAnalyzeActions(DMenuBar *menuBar);
+
     void setNavActionChecked(const QString &actionName, bool checked);
 
     void createMainMenu(DMenu *mainMenu);