微调部分显示不全的界面,设备断开不再自动登出用户
This commit is contained in:
parent
cb07d9e8ec
commit
f12bc89fa4
|
@ -396,8 +396,6 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
ui->act_autoSave->setToolTip(tr("when switching pictures, save the edited pictures directly without reminding"));
|
||||
|
||||
auto_save_info_.index = 0;
|
||||
ui->act_device_log->setEnabled(false);
|
||||
ui->act_driver_log->setEnabled(false);
|
||||
|
||||
m_pbtn_push = new QPushButton(this);
|
||||
m_pbtn_push->setVisible(false);
|
||||
|
@ -1733,7 +1731,7 @@ void MainWindow::updateActionStatus()
|
|||
ui->act_insertFromScanner->setEnabled(!m_isScanning && (m_devUser != nullptr));
|
||||
ui->menu_scan->setEnabled(!m_isScanning);
|
||||
ui->act_device_log->setEnabled(m_admin_loggedIn && !m_isScanning && (m_devUser != nullptr));
|
||||
ui->act_driver_log->setEnabled(m_admin_loggedIn && (m_devUser != nullptr));
|
||||
ui->act_driver_log->setEnabled(m_admin_loggedIn);
|
||||
// if(m_dialogLog != nullptr)
|
||||
// m_dialogLog->pbtn_export->setEnabled(ui->act_Export->isEnabled());
|
||||
|
||||
|
@ -4444,12 +4442,6 @@ void MainWindow::on_act_deleteFile_triggered()
|
|||
|
||||
void MainWindow::on_act_selectDevice_triggered()
|
||||
{
|
||||
if (m_admin_loggedIn)
|
||||
{
|
||||
m_admin_loggedIn = false;
|
||||
m_versionDll->PostUserLogoutInfo(HGVERSION_APPNAME_SCANNER, m_oemName);
|
||||
}
|
||||
|
||||
if (nullptr != m_devUser)
|
||||
{
|
||||
disconnect(m_devUser, SIGNAL(newImage(void*)), this, SLOT(on_newImage(void*)));
|
||||
|
|
|
@ -106,6 +106,12 @@
|
|||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBox_2">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>120</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>毫米(mm)</string>
|
||||
|
|
|
@ -382,7 +382,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
|
|||
|
||||
m_pbtn_addNew = new QPushButton(this);
|
||||
m_pbtn_addNew->setText(tr("Add new"));
|
||||
m_pbtn_addNew->setFixedWidth(width / 2);
|
||||
m_pbtn_addNew->setFixedWidth(100);
|
||||
layout->addWidget(m_pbtn_addNew);
|
||||
connect(m_pbtn_addNew, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
|
||||
|
||||
|
@ -390,7 +390,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
|
|||
|
||||
m_pbtn_Save = new QPushButton(this);
|
||||
m_pbtn_Save->setText(tr("Save"));
|
||||
m_pbtn_Save->setFixedWidth(width / 2);
|
||||
m_pbtn_Save->setFixedWidth(100);
|
||||
layout->addWidget(m_pbtn_Save);
|
||||
connect(m_pbtn_Save, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
|
||||
|
||||
|
@ -399,7 +399,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
|
|||
m_deleteCur = new QPushButton(this);
|
||||
m_deleteCur->setText(tr("Delete"));
|
||||
m_deleteCur->setEnabled(enabled);
|
||||
m_deleteCur->setFixedWidth(width / 2);
|
||||
m_deleteCur->setFixedWidth(100);
|
||||
layout->addWidget(m_deleteCur);
|
||||
connect(m_deleteCur, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
|
||||
|
||||
|
@ -408,7 +408,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
|
|||
m_deleteAll = new QPushButton(this);
|
||||
m_deleteAll->setText(tr("Delete all"));
|
||||
m_deleteAll->setEnabled(enabled);
|
||||
m_deleteAll->setFixedWidth(width / 2);
|
||||
m_deleteAll->setFixedWidth(100);
|
||||
layout->addWidget(m_deleteAll);
|
||||
connect(m_deleteAll, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
|
||||
|
||||
|
@ -422,7 +422,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
|
|||
|
||||
m_pbtn_restore = new QPushButton(this);
|
||||
m_pbtn_restore->setText(tr("Restore"));
|
||||
m_pbtn_restore->setFixedWidth(width / 2);
|
||||
m_pbtn_restore->setFixedWidth(100);
|
||||
layout->addWidget(m_pbtn_restore);
|
||||
connect(m_pbtn_restore, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
|
||||
|
||||
|
|
|
@ -113,13 +113,14 @@ void setPicClrTool::setRgbAndColorType(int rgbTypeIndex, int colorTypeIndex)
|
|||
{
|
||||
if (0 == m_colorMode)
|
||||
{
|
||||
ui->comboBox->setCurrentIndex(rgbTypeIndex);
|
||||
if (1 != colorTypeIndex)
|
||||
if (rgbTypeIndex >= 0 && rgbTypeIndex <= 4)
|
||||
ui->comboBox->setCurrentIndex(rgbTypeIndex);
|
||||
if (0 == colorTypeIndex || (colorTypeIndex >= 2 && colorTypeIndex <= 4))
|
||||
ui->colorSetCmb->setCurrentIndex(colorTypeIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (2 != rgbTypeIndex)
|
||||
if ((rgbTypeIndex >= 0 && rgbTypeIndex <= 1) || (rgbTypeIndex >= 3 && rgbTypeIndex <= 4))
|
||||
ui->comboBox->setCurrentIndex(rgbTypeIndex);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue