From f483a44d092e49f5acf20ab0f43b4b6024c13d58 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Wed, 24 Apr 2024 15:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/dialog_scan.cpp          |  2 +-
 app/scantool/dialog_writesettings.cpp |  5 -----
 app/scantool/dialog_writesettings.h   |  2 --
 app/scantool/mainwindow.cpp           | 10 +++++++++-
 app/scantool/mainwindow.h             |  1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/scantool/dialog_scan.cpp b/app/scantool/dialog_scan.cpp
index 31ecd604..67a426de 100644
--- a/app/scantool/dialog_scan.cpp
+++ b/app/scantool/dialog_scan.cpp
@@ -4,7 +4,7 @@
 #include "mainwindow.h"
 
 Dialog_Scan::Dialog_Scan(class MainWindow *mainWnd)
-    : QDialog(mainWnd)
+    : QDialog(nullptr)
     , ui(new Ui::Dialog_Scan)
     , m_mainWnd(mainWnd)
 {
diff --git a/app/scantool/dialog_writesettings.cpp b/app/scantool/dialog_writesettings.cpp
index c8b9786b..f22b9463 100644
--- a/app/scantool/dialog_writesettings.cpp
+++ b/app/scantool/dialog_writesettings.cpp
@@ -66,8 +66,3 @@ void Dialog_WriteSettings::on_spin_jpg_quality_valueChanged(int arg1)
 {
     ui->slider_jpg_quality->setValue(arg1);
 }
-
-void Dialog_WriteSettings::on_buttonBox_accepted()
-{
-
-}
diff --git a/app/scantool/dialog_writesettings.h b/app/scantool/dialog_writesettings.h
index a27d4ca0..61e8e93f 100644
--- a/app/scantool/dialog_writesettings.h
+++ b/app/scantool/dialog_writesettings.h
@@ -33,8 +33,6 @@ private slots:
 
     void on_spin_jpg_quality_valueChanged(int arg1);
 
-    void on_buttonBox_accepted();
-
 private:
     Ui::Dialog_WriteSettings *ui;
 };
diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index a4861292..cb5288e5 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_scanAction = new QAction(tr("Scan Setting"), this);
     connect(m_scanAction, &QAction::triggered, this, &MainWindow::on_showScanSettingDlg);
     m_btnAction = new QAction(tr("Button Setting"), this);
-    connect(m_btnAction, &QAction::triggered, this, &MainWindow::show);
+    connect(m_btnAction, &QAction::triggered, this, &MainWindow::on_showMainWindowDlg);
     m_quitAction = new QAction(tr("Exit"), this);
     connect(m_quitAction, &QAction::triggered, this, &QCoreApplication::quit);   //应用程序的退出
 
@@ -161,6 +161,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
     else if (QSystemTrayIcon::DoubleClick == reason)
     {
         show();
+        raise();
     }
     else if (QSystemTrayIcon::MiddleClick == reason)
     {
@@ -171,6 +172,13 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
 void MainWindow::on_showScanSettingDlg()
 {
     m_scanDlg->show();
+    m_scanDlg->raise();
+}
+
+void MainWindow::on_showMainWindowDlg()
+{
+    show();
+    raise();
 }
 
 void MainWindow::on_pushButtonAdd_clicked()
diff --git a/app/scantool/mainwindow.h b/app/scantool/mainwindow.h
index 956ef832..5d84f32e 100644
--- a/app/scantool/mainwindow.h
+++ b/app/scantool/mainwindow.h
@@ -34,6 +34,7 @@ protected:
 private slots:
     void on_trayActivated(QSystemTrayIcon::ActivationReason reason);
     void on_showScanSettingDlg();
+    void on_showMainWindowDlg();
     void on_pushButtonAdd_clicked();
     void on_pushButtonModify_clicked();
     void on_pushButtonRemove_clicked();