Compare commits
2 Commits
d265e6cc03
...
e91677590a
Author | SHA1 | Date |
---|---|---|
yangjiaxuan | e91677590a | |
luoliangyi | 87628a714a |
|
@ -18,6 +18,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
|
|
||||||
QRegExp rx("[^\\\\/:*?\"<>|]+$");
|
QRegExp rx("[^\\\\/:*?\"<>|]+$");
|
||||||
ui->lineEdit_fileName->setValidator(new QRegExpValidator(rx, this));
|
ui->lineEdit_fileName->setValidator(new QRegExpValidator(rx, this));
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@ Dialog_ImgProc_Adjust::Dialog_ImgProc_Adjust(HGImage img, QWidget *parent) :
|
||||||
ui(new Ui::Dialog_ImgProc_Adjust)
|
ui(new Ui::Dialog_ImgProc_Adjust)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
|
|
||||||
m_base_widget = new Widget_Imgproc_Base(this);
|
m_base_widget = new Widget_Imgproc_Base(this);
|
||||||
reinterpret_cast<QVBoxLayout*>(this->layout())->insertWidget(2, m_base_widget);
|
reinterpret_cast<QVBoxLayout*>(this->layout())->insertWidget(2, m_base_widget);
|
||||||
|
|
|
@ -23,6 +23,7 @@ Dialog_ImgProc_AutoCrop::Dialog_ImgProc_AutoCrop(QWidget *parent)
|
||||||
, m_indent(5)
|
, m_indent(5)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
setWindowTitle(tr("Image crop"));
|
setWindowTitle(tr("Image crop"));
|
||||||
|
|
||||||
m_btnGroup_polygon.addButton(ui->rbtn_convex);
|
m_btnGroup_polygon.addButton(ui->rbtn_convex);
|
||||||
|
|
|
@ -10,6 +10,8 @@ Dialog_InsertIndex::Dialog_InsertIndex(QWidget *parent) :
|
||||||
button_group(new QButtonGroup)
|
button_group(new QButtonGroup)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
|
|
||||||
button_group->addButton(ui->rbtn_first, 0);
|
button_group->addButton(ui->rbtn_first, 0);
|
||||||
button_group->addButton(ui->rbtn_beforeCurr, 1);
|
button_group->addButton(ui->rbtn_beforeCurr, 1);
|
||||||
button_group->addButton(ui->rbtn_afterCurr, 2);
|
button_group->addButton(ui->rbtn_afterCurr, 2);
|
||||||
|
|
|
@ -6,6 +6,7 @@ Dialog_OpenImageIndex::Dialog_OpenImageIndex(int total, int currentIndex, QWidge
|
||||||
, ui(new Ui::Dialog_OpenImageIndex)
|
, ui(new Ui::Dialog_OpenImageIndex)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
|
|
||||||
ui->spinBox->setMinimum(1);
|
ui->spinBox->setMinimum(1);
|
||||||
ui->spinBox->setMaximum(total);
|
ui->spinBox->setMaximum(total);
|
||||||
|
|
|
@ -12,6 +12,7 @@ Dialog_PasswordChange::Dialog_PasswordChange(const QString &old_password, QWidge
|
||||||
m_new_password("")
|
m_new_password("")
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||||
QRegExp rx("[a-zA-Z0-9!@#%^&*()_]+$"); //创建一个正则表达式对象rx
|
QRegExp rx("[a-zA-Z0-9!@#%^&*()_]+$"); //创建一个正则表达式对象rx
|
||||||
qReg = new QRegExpValidator(rx, this); //创建一个过滤器对象
|
qReg = new QRegExpValidator(rx, this); //创建一个过滤器对象
|
||||||
m_lineEditList<<ui->lineEdit_oldPassword<<ui->lineEdit_newPassword<<ui->lineEdit_confirmPassword;
|
m_lineEditList<<ui->lineEdit_oldPassword<<ui->lineEdit_newPassword<<ui->lineEdit_confirmPassword;
|
||||||
|
|
|
@ -151,6 +151,9 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
||||||
|
|
||||||
ui->toolBar->addAction(ui->act_scannerSettings);
|
ui->toolBar->addAction(ui->act_scannerSettings);
|
||||||
ui->toolBar->addAction(ui->act_acquire);
|
ui->toolBar->addAction(ui->act_acquire);
|
||||||
|
m_act_acquireInto2 = new QAction(QIcon(":/images/image_rsc/actions/scan.png"), tr("act_acquireInto"), this);
|
||||||
|
connect(m_act_acquireInto2, SIGNAL(triggered()), this, SLOT(on_AcquireInto2()));
|
||||||
|
ui->toolBar->addAction(m_act_acquireInto2);
|
||||||
ui->toolBar->addSeparator();
|
ui->toolBar->addSeparator();
|
||||||
ui->toolBar->addAction(ui->act_fitWindowWidth);
|
ui->toolBar->addAction(ui->act_fitWindowWidth);
|
||||||
ui->toolBar->addAction(ui->act_fitWindowSize);
|
ui->toolBar->addAction(ui->act_fitWindowSize);
|
||||||
|
@ -599,6 +602,101 @@ void MainWindow::on_act_autoSave_triggered()
|
||||||
saveCfgValue("save", "autoSave", auto_save_changes_);
|
saveCfgValue("save", "autoSave", auto_save_changes_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::on_AcquireInto2()
|
||||||
|
{
|
||||||
|
if (!dev_que_.is_online() || m_isScanning)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int count = 0;
|
||||||
|
m_thumb->getItemCount(&count);
|
||||||
|
if (count != 0)
|
||||||
|
{
|
||||||
|
int result = startScanMessageBox(this);
|
||||||
|
if (cancelScan == result)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Dialog_AquireInto dlg(this);
|
||||||
|
if (1)
|
||||||
|
{
|
||||||
|
m_singleScan = false;
|
||||||
|
m_scanType = 2;
|
||||||
|
m_aquireIntoSaveParam = dlg.getSaveParam();
|
||||||
|
m_aquireIntoInBlank = true;
|
||||||
|
m_aquireIntoBatchStartIndex = 0;
|
||||||
|
m_aquireIntoPageIndex = 0;
|
||||||
|
m_aquireIntoMultiPageCount = 0;
|
||||||
|
|
||||||
|
QDateTime dateTime = QDateTime::currentDateTime();
|
||||||
|
if (m_aquireIntoSaveParam.m_isUseSubfolderByTime)
|
||||||
|
{
|
||||||
|
m_aquireIntoSaveParam.m_savePath = getStdFileName(m_aquireIntoSaveParam.m_savePath + dateTime.toString("yyyy-MM-dd") + "/");
|
||||||
|
}
|
||||||
|
|
||||||
|
// m_aquireIntoSaveParam.m_savePath = getStdFileName(m_aquireIntoSaveParam.m_savePath + dateTime.toString("yyyyMMddhhmmss") + "/");
|
||||||
|
|
||||||
|
|
||||||
|
if(!isLimitAccessFolder(2))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
startSaveMessageBox(this);
|
||||||
|
|
||||||
|
m_dpi = getDpi();
|
||||||
|
SANE_Status ret = sane_start(dev_que_.handle());
|
||||||
|
if (ret != SANE_STATUS_GOOD)
|
||||||
|
{
|
||||||
|
m_dialogLog->updateStatus(dev_que_.is_online() && 0 != m_scanType, m_isScanning);
|
||||||
|
m_wndStatusBar->setDeviceStatusInfo(tr("start failed"), true);
|
||||||
|
m_dialogLog->addLog(tr("start failed") + "(" + QString(sane_err_desc(ret)) + ")", true);
|
||||||
|
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "%s", getStdString(tr("start failed")).c_str());
|
||||||
|
|
||||||
|
if(ret == SCANNER_ERR_DEVICE_SLEEPING)
|
||||||
|
{
|
||||||
|
ui->menu_scan->setEnabled(false);
|
||||||
|
ui->act_acquire->setEnabled(false);
|
||||||
|
ui->act_scannerSettings->setEnabled(false);
|
||||||
|
m_dialogLog->updateStatus(false, false);
|
||||||
|
m_dialogLog->show();
|
||||||
|
|
||||||
|
if ("439" == getDevPid() || "9220" == getDevPid())
|
||||||
|
{
|
||||||
|
m_dialogLog->addLog(tr("Please wake up the device manually"), true);
|
||||||
|
m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QTime curTimer = QTime::currentTime().addMSecs(10000);
|
||||||
|
while (QTime::currentTime() < curTimer)
|
||||||
|
{
|
||||||
|
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_dialogLog->addLog(tr("already waked up device"), false);
|
||||||
|
m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->menu_scan->setEnabled(true);
|
||||||
|
ui->act_acquire->setEnabled(true);
|
||||||
|
ui->act_scannerSettings->setEnabled(true);
|
||||||
|
m_dialogLog->updateStatus(true, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_isScanning = true;
|
||||||
|
m_thumb->setAcceptDrops(false);
|
||||||
|
m_dialogLog->updateStatus(dev_que_.is_online() && 0 != m_scanType, m_isScanning);
|
||||||
|
updateActionStatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_dialogLog->show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::on_itemCountChanged(int count)
|
void MainWindow::on_itemCountChanged(int count)
|
||||||
{
|
{
|
||||||
m_wndStatusBar->setPageInfo(count, m_currIndex);
|
m_wndStatusBar->setPageInfo(count, m_currIndex);
|
||||||
|
@ -1669,7 +1767,7 @@ void MainWindow::updateActionStatus()
|
||||||
ui->act_lastPage->setEnabled(-1 != m_currIndex && m_multiPageCount > 0 && m_multiIndex != m_multiPageCount - 1
|
ui->act_lastPage->setEnabled(-1 != m_currIndex && m_multiPageCount > 0 && m_multiIndex != m_multiPageCount - 1
|
||||||
&& (!dev_que_.is_online() || !m_isScanning));
|
&& (!dev_que_.is_online() || !m_isScanning));
|
||||||
m_multiPageLineEdit->setText(QString("%1/%2").arg(m_multiIndex + 1).arg(m_multiPageCount));
|
m_multiPageLineEdit->setText(QString("%1/%2").arg(m_multiIndex + 1).arg(m_multiPageCount));
|
||||||
ui->toolBar->actions().at(16)->setVisible(-1 != m_currIndex && m_multiPageCount > 1 && -1 != m_multiIndex
|
ui->toolBar->actions().at(17)->setVisible(-1 != m_currIndex && m_multiPageCount > 1 && -1 != m_multiIndex
|
||||||
&& (!dev_que_.is_online() || !m_isScanning));
|
&& (!dev_que_.is_online() || !m_isScanning));
|
||||||
ui->act_sortPages->setEnabled(0 != count && (!dev_que_.is_online() || !m_isScanning));
|
ui->act_sortPages->setEnabled(0 != count && (!dev_que_.is_online() || !m_isScanning));
|
||||||
|
|
||||||
|
@ -1699,6 +1797,7 @@ void MainWindow::updateActionStatus()
|
||||||
ui->act_clearRoller->setEnabled(m_admin_loggedIn);
|
ui->act_clearRoller->setEnabled(m_admin_loggedIn);
|
||||||
|
|
||||||
ui->act_acquireInto->setEnabled(dev_que_.is_online() && !m_isScanning);
|
ui->act_acquireInto->setEnabled(dev_que_.is_online() && !m_isScanning);
|
||||||
|
m_act_acquireInto2->setEnabled(dev_que_.is_online() && !m_isScanning);
|
||||||
ui->act_acquireSingle->setEnabled(dev_que_.is_online() && !m_isScanning);
|
ui->act_acquireSingle->setEnabled(dev_que_.is_online() && !m_isScanning);
|
||||||
ui->act_acquire->setEnabled(dev_que_.is_online() && !m_isScanning);
|
ui->act_acquire->setEnabled(dev_que_.is_online() && !m_isScanning);
|
||||||
ui->act_scannerSettings->setEnabled(dev_que_.is_online() && !m_isScanning);
|
ui->act_scannerSettings->setEnabled(dev_que_.is_online() && !m_isScanning);
|
||||||
|
|
|
@ -123,6 +123,7 @@ signals:
|
||||||
void fwUpgradeAndDevLock_Finish();
|
void fwUpgradeAndDevLock_Finish();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void on_AcquireInto2();
|
||||||
void on_itemCountChanged(int count);
|
void on_itemCountChanged(int count);
|
||||||
void on_itemSelectingChanged();
|
void on_itemSelectingChanged();
|
||||||
void on_currItemChanged(int index);
|
void on_currItemChanged(int index);
|
||||||
|
@ -277,6 +278,7 @@ private:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
|
QAction *m_act_acquireInto2;
|
||||||
QString m_currLang;
|
QString m_currLang;
|
||||||
VersionDll *m_versionDll;
|
VersionDll *m_versionDll;
|
||||||
QString m_password;
|
QString m_password;
|
||||||
|
|
|
@ -299,6 +299,10 @@
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="act_acquireInto">
|
<action name="act_acquireInto">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="Scanner_resource.qrc">
|
||||||
|
<normaloff>:/images/image_rsc/actions/scan.png</normaloff>:/images/image_rsc/actions/scan.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>act_acquireInto</string>
|
<string>act_acquireInto</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
Loading…
Reference in New Issue