lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

多页时屏蔽菜单栏图像功能和隐藏侧边栏功能，调整设置界面快捷键

This commit is contained in:
yangjiaxuan 2023-08-11 18:02:49 +08:00
parent 72758246f5
commit 113497f993
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scanner2/mainwindow.cpp
View File

@ -1648,7 +1648,7 @@ void MainWindow::updateActionStatus()
&& (!m_isScanning));
ui->act_sortPages->setEnabled(0 != count && (!m_isScanning));
ui->act_imageEdit->setEnabled(nullptr != img);
ui->act_imageEdit->setEnabled(m_multiPageCount == 1 && nullptr != img);
ui->act_zoomIn->setEnabled(nullptr != img);
ui->act_zoomOut->setEnabled(nullptr != img);
ui->act_fullscreen->setEnabled(count > 0 && -1 != m_currIndex && -1 != m_multiIndex
@ -1661,8 +1661,8 @@ void MainWindow::updateActionStatus()
ui->act_180->setEnabled(nullptr != img);
ui->menu_Auto_Image_Size->setEnabled(nullptr != img);
ui->act_multiRotate->setEnabled(0 != count && (!m_isScanning));
ui->menu_Rotate->setEnabled((0 != count || nullptr != img) && (!m_isScanning));
ui->act_autoCrop->setEnabled(nullptr != img);
ui->menu_Rotate->setEnabled(m_multiPageCount == 1 && (0 != count || nullptr != img) && (!m_isScanning));
ui->act_autoCrop->setEnabled(m_multiPageCount == 1 && nullptr != img);
ui->act_signIn->setEnabled(!m_admin_loggedIn);
ui->act_passwordChange->setEnabled(m_admin_loggedIn);
@ -1688,12 +1688,12 @@ void MainWindow::updateActionStatus()
if (m_pbtn_push != nullptr && m_widget_sideBar!= nullptr)
{
m_pbtn_push->setVisible(nullptr != img);
m_widget_sideBar->setVisible(nullptr != img);
m_pbtn_push->setVisible(m_multiPageCount == 1 && nullptr != img);
m_widget_sideBar->setVisible(m_multiPageCount == 1 && nullptr != img);
}
m_cbtn_acquireIntoCfg->setEnabled(!m_isScanning);
ui->act_adjust->setEnabled(!m_bSideEditing && nullptr != img);
ui->act_adjust->setEnabled(m_multiPageCount == 1 && !m_bSideEditing && nullptr != img);
}
void MainWindow::startSaveMessageBox(QWidget* parent)

8
modules/twainui/hg_settingdialog.cpp
View File

@ -1938,10 +1938,12 @@ void hg_settingdialog::slot_buttonCancelClicked()
void hg_settingdialog::keyPressEvent(QKeyEvent *e)
{
if (e->key() == Qt::Key_Escape) {
e->ignore();
if (e->key() == Qt::Key_Return)
{
slot_buttonOkClicked();
}
else {
else
{
QDialog::keyPressEvent(e);
}
}

4
modules/twainui/hg_settingdialog.h
View File

@ -62,7 +62,6 @@ public:
void createUI();
void updateUIStatus();
QVector<QWidget*> find_control(int opt_num);
void keyPressEvent(QKeyEvent *e);
int get_changed_items(void);
int getCloseButtonCliked();
gb::sane_config_schm *getCurScheme();
@ -97,6 +96,9 @@ private:
QSettings *m_configIniWrite;
QSettings *m_configIniRead;
protected:
virtual void keyPressEvent(QKeyEvent* e) override;
private:
QString md5(QString key);
const void* find_option_description(int id); // return const SANE_Option_Descriptor* pointer