feat: Remove the option button of top toolbar

Remove the option button of top toolbar and thie titlebar of edit mainwindow.
linuxdeepin · Nov 17, 2023 · abe6244 · abe6244
1 parent 899f6c6
commit abe6244
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/plugins/codeeditor/mainframe/naveditmainwindow.cpp b/src/plugins/codeeditor/mainframe/naveditmainwindow.cpp
@@ -82,8 +82,7 @@ NavEditMainWindow::NavEditMainWindow(QWidget *parent, Qt::WindowFlags flags)
     addDockWidget(Qt::DockWidgetArea::BottomDockWidgetArea, qDockWidgetContext);
     mainToolBar = new ToolBarManager(tr("toolbar"));
 
-    titlebar()->setParent(nullptr);
-    titlebar()->hide();
+    titlebar()->setFixedHeight(0);
 }
 
 NavEditMainWindow::~NavEditMainWindow()

diff --git a/src/plugins/option/optioncore/optioncore.cpp b/src/plugins/option/optioncore/optioncore.cpp
@@ -55,28 +55,17 @@ bool OptionCore::start()
 
     if (windowService && windowService->addAction && windowService->addToolBarActionItem) {
         auto actionOptions = new QAction(MWMTA_OPTIONS);
-        auto actionOptionsNoIcon = new QAction(MWMTA_OPTIONS);
-        ActionManager::getInstance()->registerAction(actionOptions,
-                                                     "Tools.Options",
-                                                     MWMTA_OPTIONS,
-                                                     QKeySequence(Qt::Modifier::CTRL |
-                                                                  Qt::Modifier::SHIFT |
-                                                                  Qt::Key::Key_H),
-                                                     ":/optioncore/images/setting.png");
         ActionManager::getInstance()->registerAction(actionOptions,
                                                      "Tools.Options",
                                                      MWMTA_OPTIONS,
                                                      QKeySequence(Qt::Modifier::CTRL |
                                                                   Qt::Modifier::SHIFT |
                                                                   Qt::Key::Key_H),
                                                      QString());
-        windowService->addAction(MWM_TOOLS, new AbstractAction(actionOptionsNoIcon));
-        windowService->addToolBarActionItem("Options", actionOptions, "Option.End");
+        windowService->addAction(MWM_TOOLS, new AbstractAction(actionOptions));
 
         QObject::connect(actionOptions, &QAction::triggered,
                          optionDialog, &QDialog::show);
-        QObject::connect(actionOptionsNoIcon, &QAction::triggered,
-                         optionDialog, &QDialog::show);
     }
 
     DPF_USE_NAMESPACE