From 06697b44760a6944dc87b043d6fdc9912a517228 Mon Sep 17 00:00:00 2001 From: brige Date: Mon, 27 Oct 2025 23:25:31 +0800 Subject: [PATCH] modify systemmanager menu --- src/translations/Dyt_zh_CN.ts | 4 ++-- src/ui/MainFrame.cpp | 2 +- src/ui/MainWindow.cpp | 4 ---- src/ui/MainWindow.h | 3 --- src/ui/Menu/SystemManagerMenu.cpp | 1 + 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index d0ff280b..10c08122 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -2909,12 +2909,12 @@ - + question - + are you sure to exit diff --git a/src/ui/MainFrame.cpp b/src/ui/MainFrame.cpp index 0e69b60b..d5679ab9 100644 --- a/src/ui/MainFrame.cpp +++ b/src/ui/MainFrame.cpp @@ -126,7 +126,7 @@ void MainFrame::InitUI() { connect(fileMenu, &FileManagerMenu::LoadDyt, viewWidget, &OsgWidget::OnLoadDyt); connect(viewWidget, &OsgWidget::signalResetWorkSpace, mainWindow, &MainWindow::slotResetWorkSpace); - connect(system_, &SystemManagerMenu::signalShowUISetting, mainWindow, &MainWindow::slotShowUISetting); + //connect(system_, &SystemManagerMenu::signalShowUISetting, mainWindow, &MainWindow::slotShowUISetting); if (ui->menuWidget->count() > 0) { ui->menuWidget->setCurrentIndex(0); diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp index 8c517284..60dacba1 100644 --- a/src/ui/MainWindow.cpp +++ b/src/ui/MainWindow.cpp @@ -249,10 +249,6 @@ void MainWindow::UninitUI() { } } -void MainWindow::slotShowUISetting() { - pSettingUI->show(); -} - void MainWindow::slotResetWorkSpace() { QString wavePath = "", speedPath = "", rdPath = ""; diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index e7868529..2c1e54f4 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -43,8 +43,6 @@ public: return dataPanelManager_; } - void slotShowUISetting(); - public slots: void slotResetWorkSpace(); @@ -67,7 +65,6 @@ private: class FitCurveDialog* fitCurveDlg_{ nullptr }; class FitCurveDialog* fitYLgCurveDlg_{ nullptr }; class SurfaceDialog* surfaceDlg_{ nullptr }; - class LayoutSettingUI* pSettingUI{ nullptr }; class TargetListWgt* targetUITable_{ nullptr }; class QTabWidget* tabWidget_{ nullptr }; class SignalIndicatorLampUI* signalIndicatorLampUI_{ nullptr }; diff --git a/src/ui/Menu/SystemManagerMenu.cpp b/src/ui/Menu/SystemManagerMenu.cpp index 8f3b1010..dce603a7 100644 --- a/src/ui/Menu/SystemManagerMenu.cpp +++ b/src/ui/Menu/SystemManagerMenu.cpp @@ -17,6 +17,7 @@ SystemManagerMenu::SystemManagerMenu(QWidget* parent) LOG_INFO("SystemManagerMenu init"); windowManagerMenu_ = new QMenu(this); windowManagerMenu_->setWindowFlags(windowManagerMenu_->windowFlags() | Qt::FramelessWindowHint); + ui->menu_uisetting->setVisible(false); } SystemManagerMenu::~SystemManagerMenu() {