This commit is contained in:
parent
7553fd9e85
commit
f483a44d09
|
@ -4,7 +4,7 @@
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
|
||||||
Dialog_Scan::Dialog_Scan(class MainWindow *mainWnd)
|
Dialog_Scan::Dialog_Scan(class MainWindow *mainWnd)
|
||||||
: QDialog(mainWnd)
|
: QDialog(nullptr)
|
||||||
, ui(new Ui::Dialog_Scan)
|
, ui(new Ui::Dialog_Scan)
|
||||||
, m_mainWnd(mainWnd)
|
, m_mainWnd(mainWnd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,8 +66,3 @@ void Dialog_WriteSettings::on_spin_jpg_quality_valueChanged(int arg1)
|
||||||
{
|
{
|
||||||
ui->slider_jpg_quality->setValue(arg1);
|
ui->slider_jpg_quality->setValue(arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Dialog_WriteSettings::on_buttonBox_accepted()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,8 +33,6 @@ private slots:
|
||||||
|
|
||||||
void on_spin_jpg_quality_valueChanged(int arg1);
|
void on_spin_jpg_quality_valueChanged(int arg1);
|
||||||
|
|
||||||
void on_buttonBox_accepted();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::Dialog_WriteSettings *ui;
|
Ui::Dialog_WriteSettings *ui;
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
m_scanAction = new QAction(tr("Scan Setting"), this);
|
m_scanAction = new QAction(tr("Scan Setting"), this);
|
||||||
connect(m_scanAction, &QAction::triggered, this, &MainWindow::on_showScanSettingDlg);
|
connect(m_scanAction, &QAction::triggered, this, &MainWindow::on_showScanSettingDlg);
|
||||||
m_btnAction = new QAction(tr("Button Setting"), this);
|
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);
|
m_quitAction = new QAction(tr("Exit"), this);
|
||||||
connect(m_quitAction, &QAction::triggered, this, &QCoreApplication::quit); //应用程序的退出
|
connect(m_quitAction, &QAction::triggered, this, &QCoreApplication::quit); //应用程序的退出
|
||||||
|
|
||||||
|
@ -161,6 +161,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
|
||||||
else if (QSystemTrayIcon::DoubleClick == reason)
|
else if (QSystemTrayIcon::DoubleClick == reason)
|
||||||
{
|
{
|
||||||
show();
|
show();
|
||||||
|
raise();
|
||||||
}
|
}
|
||||||
else if (QSystemTrayIcon::MiddleClick == reason)
|
else if (QSystemTrayIcon::MiddleClick == reason)
|
||||||
{
|
{
|
||||||
|
@ -171,6 +172,13 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
|
||||||
void MainWindow::on_showScanSettingDlg()
|
void MainWindow::on_showScanSettingDlg()
|
||||||
{
|
{
|
||||||
m_scanDlg->show();
|
m_scanDlg->show();
|
||||||
|
m_scanDlg->raise();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::on_showMainWindowDlg()
|
||||||
|
{
|
||||||
|
show();
|
||||||
|
raise();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_pushButtonAdd_clicked()
|
void MainWindow::on_pushButtonAdd_clicked()
|
||||||
|
|
|
@ -34,6 +34,7 @@ protected:
|
||||||
private slots:
|
private slots:
|
||||||
void on_trayActivated(QSystemTrayIcon::ActivationReason reason);
|
void on_trayActivated(QSystemTrayIcon::ActivationReason reason);
|
||||||
void on_showScanSettingDlg();
|
void on_showScanSettingDlg();
|
||||||
|
void on_showMainWindowDlg();
|
||||||
void on_pushButtonAdd_clicked();
|
void on_pushButtonAdd_clicked();
|
||||||
void on_pushButtonModify_clicked();
|
void on_pushButtonModify_clicked();
|
||||||
void on_pushButtonRemove_clicked();
|
void on_pushButtonRemove_clicked();
|
||||||
|
|
Loading…
Reference in New Issue