PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_osg' of http://brigecode.icu:16623/PM/DYTSrouce into new_osg

Browse Source
This commit is contained in:
pimin 2025-10-27 23:26:22 +08:00
commit ff5e3e74ad
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/translations/Dyt_zh_CN.ts
View File

@ -2909,12 +2909,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="57"/>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="58"/>
<source>question</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="57"/>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="58"/>
<source>are you sure to exit</source>
<translation type="unfinished"></translation>
</message>

2
src/ui/MainFrame.cpp
View File

@ -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);

4
src/ui/MainWindow.cpp
View File

@ -249,10 +249,6 @@ void MainWindow::UninitUI() {
}
}
void MainWindow::slotShowUISetting() {
pSettingUI->show();
}
void MainWindow::slotResetWorkSpace()
{
QString wavePath = "", speedPath = "", rdPath = "";

3
src/ui/MainWindow.h
View File

@ -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 };

1
src/ui/Menu/SystemManagerMenu.cpp
View File

@ -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() {