From 6ead5eedf7596e10c31969b464bcb219962f8972 Mon Sep 17 00:00:00 2001 From: HeXiaodong Date: Fri, 17 Nov 2023 14:54:59 +0800 Subject: [PATCH] feat: Remove the option button of top toolbar Remove the option button of top toolbar and thie titlebar of edit mainwindow. --- .../codeeditor/mainframe/naveditmainwindow.cpp | 3 +-- src/plugins/option/optioncore/optioncore.cpp | 13 +------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/plugins/codeeditor/mainframe/naveditmainwindow.cpp b/src/plugins/codeeditor/mainframe/naveditmainwindow.cpp index 96a11f39e..0629dabcc 100644 --- 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 index 8992c03ba..45c0bbe46 100644 --- a/src/plugins/option/optioncore/optioncore.cpp +++ b/src/plugins/option/optioncore/optioncore.cpp @@ -55,14 +55,6 @@ 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, @@ -70,13 +62,10 @@ bool OptionCore::start() 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