From a2b937031a6155bd0791e27018651eb3553342dc Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Sat, 3 Jun 2023 17:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83sane=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/saneui/hg_settingdialog.cpp | 18 ------------------ modules/saneui/hg_settingdialog.h | 2 -- 2 files changed, 20 deletions(-) diff --git a/modules/saneui/hg_settingdialog.cpp b/modules/saneui/hg_settingdialog.cpp index b027a80e..f16ed153 100644 --- a/modules/saneui/hg_settingdialog.cpp +++ b/modules/saneui/hg_settingdialog.cpp @@ -293,8 +293,6 @@ void hg_settingdialog::createUI() QPushButton *buttonAbout = new QPushButton(this); buttonAbout->setText(tr("about...")); - QPushButton *buttonScan = new QPushButton(this); - buttonScan->setText(tr("scan")); QPushButton *buttonOk = new QPushButton(this); buttonOk->setText(tr("ok")); QPushButton *buttonCancel = new QPushButton(this); @@ -302,25 +300,14 @@ void hg_settingdialog::createUI() QHBoxLayout *hlayoutOkAndCancel = new QHBoxLayout; hlayoutOkAndCancel->addStretch(); hlayoutOkAndCancel->addWidget(buttonAbout); - hlayoutOkAndCancel->addWidget(buttonScan); hlayoutOkAndCancel->addWidget(buttonOk); hlayoutOkAndCancel->addWidget(buttonCancel); QWidget *widgetOkAndCancel = new QWidget(); widgetOkAndCancel->setLayout(hlayoutOkAndCancel); connect(buttonAbout, SIGNAL(clicked(bool)), this, SLOT(slot_buttonAboutClicked())); - connect(buttonScan, SIGNAL(clicked(bool)), this, SLOT(slot_buttonScanClicked())); connect(buttonOk, SIGNAL(clicked(bool)), this, SLOT(slot_buttonOkClicked())); connect(buttonCancel, SIGNAL(clicked(bool)), this, SLOT(slot_buttonCancelClicked())); - if (!m_showScan) - { - buttonScan->setVisible(false); - } - else - { - buttonOk->setVisible(false); - } - QHBoxLayout *h = new QHBoxLayout(); QVBoxLayout *v1 = new QVBoxLayout(), *v2 = new QVBoxLayout(); @@ -1509,11 +1496,6 @@ void hg_settingdialog::slot_buttonAboutClicked() msg.exec(); } -void hg_settingdialog::slot_buttonScanClicked() -{ - save_scheme(); -} - void hg_settingdialog::slot_buttonOkClicked() { save_ = true; diff --git a/modules/saneui/hg_settingdialog.h b/modules/saneui/hg_settingdialog.h index a9003202..8d632512 100644 --- a/modules/saneui/hg_settingdialog.h +++ b/modules/saneui/hg_settingdialog.h @@ -62,7 +62,6 @@ private: static hg_settingdialog *hg_setting_ui_; SANEAPI m_saneAPI; SANE_Handle m_devHandle; - bool m_showScan; std::string m_devName; QTranslator m_translator; QTranslator m_translator_qt; @@ -106,7 +105,6 @@ private slots: void slot_word_list_comboBoxClicked(int value); void slot_lineEditInput(); void slot_buttonAboutClicked(); - void slot_buttonScanClicked(); void slot_buttonOkClicked(); void slot_buttonCancelClicked(); void slot_pushButton_scheme_management(void);