scantool扫描时如果没有配置按键,则弹出按键配置窗口
This commit is contained in:
parent
07d8787fe7
commit
3a3369150d
|
@ -629,7 +629,9 @@ void MainWindow::StartScan(unsigned int buttonId)
|
|||
|
||||
if (!find)
|
||||
{
|
||||
// 手动扫描一定能找到配置,按键扫描不能提示
|
||||
// 手动扫描一定能找到配置,按键扫描需要弹出设置对话框
|
||||
Show();
|
||||
on_pushButtonAdd_clicked();
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1039,6 +1041,16 @@ void MainWindow::SaveImage(HGImage image)
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::Show()
|
||||
{
|
||||
show();
|
||||
if (isMaximized())
|
||||
showMaximized();
|
||||
else
|
||||
showNormal();
|
||||
raise();
|
||||
}
|
||||
|
||||
int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param)
|
||||
{
|
||||
(void)hdev;
|
||||
|
@ -1310,8 +1322,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
|
|||
}
|
||||
else if (QSystemTrayIcon::DoubleClick == reason)
|
||||
{
|
||||
show();
|
||||
raise();
|
||||
Show();
|
||||
}
|
||||
else if (QSystemTrayIcon::MiddleClick == reason)
|
||||
{
|
||||
|
@ -1321,8 +1332,7 @@ void MainWindow::on_trayActivated(QSystemTrayIcon::ActivationReason reason)
|
|||
|
||||
void MainWindow::on_showMainWindowDlg()
|
||||
{
|
||||
show();
|
||||
raise();
|
||||
Show();
|
||||
}
|
||||
|
||||
void MainWindow::on_pushButtonAdd_clicked()
|
||||
|
|
|
@ -41,6 +41,7 @@ private:
|
|||
void StartScan(unsigned int buttonId);
|
||||
void AddManualScanParam();
|
||||
void SaveImage(HGImage image);
|
||||
void Show();
|
||||
static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param);
|
||||
static void HGAPI ocrThreadFunc(HGThread thread, HGPointer param);
|
||||
static void HGAPI ocrMsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointer param);
|
||||
|
|
Loading…
Reference in New Issue