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

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
luoliangyi 2022-05-11 17:20:06 +08:00
parent e00456c6a6 6101ccbb3e
commit 3dba99c968
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/scanner/hg_settingdialog.cpp
View File

@ -914,25 +914,6 @@ void hg_settingdialog::updateUIStatus()
}
}
}
// Temporarily block the multi-stream output function
QVector<QWidget*> list_w;
for(int i = 0; i< m_list_widgets.size(); i++)
{
if (m_list_widgets.at(i) == nullptr) continue;
QWidget* w = m_list_widgets.at(i);
int id = w->property("controls_id").toInt();
const SANE_Option_Descriptor* opt = reinterpret_cast<const SANE_Option_Descriptor*>(m_list_defaultOptions.at(id - 1).first);
// if(strcmp(opt->title, "24位彩色图像-多流输出") == 0)
if(strcmp(opt->title, OPTION_TITLE_24WCSTX_DLSCCH) == 0)
{
QFormLayout* layout = reinterpret_cast<QFormLayout*>(w->parentWidget()->layout());
QWidget* w_label = layout->labelForField(w);
if(w_label != nullptr)
w_label->hide();
w->hide();
}
}
}
void hg_settingdialog::slot_checkedClicked()

6
app/scanner/mainwindow.cpp
View File

@ -2069,8 +2069,6 @@ void MainWindow::on_act_help_triggered()
void MainWindow::my_url_handler(const QUrl& url)
{
QMessageBox::about(this, "hello", url.url());
std::string to(url.url().toStdString());
if(to.find("://clear-roller") != std::string::npos)
@ -2131,7 +2129,9 @@ void MainWindow::on_act_about_triggered()
content += tr("<p>%1: <a href='%2'>%3</a>").arg(about->appendix[i].key).arg(about->appendix[i].url).arg(about->appendix[i].content);
else
content += tr("<p>%1: %2").arg(about->appendix[i].key).arg(about->appendix[i].content);
if(strcmp(about->appendix[i].key, "\346\273\232\350\275\264\345\274\240\346\225\260") == 0)
if(m_admin_loggedIn
&& strcmp(about->appendix[i].key, "\346\273\232\350\275\264\345\274\240\346\225\260") == 0
&& atoi(about->appendix[i].content) > 0)
{
char url[128] = {0};
sprintf(url, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=%s://clear-roller>\346\270\205\351\231\244</a>", MY_URL_SCHEME);