微调

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

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

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

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

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