diff --git a/app/scanner2/HGImgThumb.cpp b/app/scanner2/HGImgThumb.cpp index e01992e6..25ae88a6 100644 --- a/app/scanner2/HGImgThumb.cpp +++ b/app/scanner2/HGImgThumb.cpp @@ -13,6 +13,7 @@ #include "base/HGUtility.h" #include "imgfmt/HGImgFmt.h" #include "HGUIGlobal.h" +#include "dialog_clrcache.h" HGImgThumb::HGImgThumb(QWidget* parent) @@ -2762,6 +2763,17 @@ void HGImgThumb::paintEvent(QPaintEvent* e) painter.setPen(itemIndexPen); painter.drawText(itemIndexRect, Qt::AlignHCenter | Qt::AlignVCenter, itemIndex); + //绘制Item标记 + if (0 == m_frontItems[i]->fileName.indexOf(Dialog_ClrCache::getCachePath())) + { + QRect markIndexRect(pt.x(), pt.y(), 20, 20); + QFont markIndexFont("微软雅黑", 10); + painter.setFont(markIndexFont); + QPen markPen(QColor(0, 0, 0, 255)); + painter.setPen(markPen); + painter.drawText(markIndexRect, Qt::AlignHCenter | Qt::AlignVCenter, QString("*")); + } + // 绘制文件名 HGChar fileName[256] = {0}; HGBase_GetFileName(m_frontItems[i]->fileName.toStdString().c_str(), fileName, 256); @@ -3425,9 +3437,9 @@ void HGImgThumb::mouseDoubleClickEvent(QMouseEvent *e) MouseStatus mouseMoveStatus = MouseStatus_Null; int index = getItemIndex(e->pos(), mouseMoveStatus); - if (MouseStatus_Null == mouseMoveStatus && -1 != index) + if (MouseStatus_Null == mouseMoveStatus) { - if (m_curItemIndex == index && m_frontItems[index]->selected) +// if (m_curItemIndex == index && m_frontItems[index]->selected) emit itemDoubleClicked(index); } else diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index e1827599..d4002f00 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -817,6 +817,7 @@ void MainWindow::on_currItemChanged(int index) void MainWindow::on_itemDoubleClicked(int index) { (void)index; + on_act_open_triggered(); } void MainWindow::on_thumbContextMenu(int index) diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index 774db0c1..64b9e329 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -754,6 +754,7 @@ void hg_settingdialog::createUI() } //for + hlayoutOkAndCancel->insertWidget(0, buttonAbout, 0, Qt::AlignRight); updateUIStatus(); scrollArea->setWidget(widget);