添加更新升级菜单界面
This commit is contained in:
parent
96c02776b1
commit
434e0c09ff
|
@ -78,7 +78,7 @@ void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
|
|||
#endif
|
||||
|
||||
emit p->finish();
|
||||
emit p->upgradeApp(p->m_savePath);
|
||||
emit p->upgrade(p->m_savePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -25,7 +25,7 @@ private:
|
|||
signals:
|
||||
void updateProgress(int value);
|
||||
void finish();
|
||||
void upgradeApp(QString pkgPath);
|
||||
void upgrade(QString pkgPath);
|
||||
private slots:
|
||||
void on_updateProgress(int value);
|
||||
void on_finish();
|
||||
|
|
|
@ -0,0 +1,158 @@
|
|||
#include "dialog_upgrade.h"
|
||||
#include "ui_dialog_upgrade.h"
|
||||
#include "base/HGUtility.h"
|
||||
#include <QCryptographicHash>
|
||||
#include <QMessageBox>
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
|
||||
Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, QWidget *parent) :
|
||||
QDialog(parent)
|
||||
, ui(new Ui::Dialog_upgrade)
|
||||
, m_versionDll(versionDll)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
setWindowTitle(tr("upgrade online"));
|
||||
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
|
||||
this->layout()->setSizeConstraint(QLayout::SetFixedSize);
|
||||
|
||||
ui->listWidget->setVisible(false);
|
||||
ui->pbtn_upgrade->setVisible(false);
|
||||
ui->pbtn_install->setVisible(false);
|
||||
ui->pbtn_cancel->setVisible(false);
|
||||
ui->label->setVisible(false);
|
||||
|
||||
HGVersionInfo *versionInfo = NULL;
|
||||
HGUInt versionCount = 0;
|
||||
m_versionDll->GetVersionList(HGVERSION_APPNAME_SCANNER, &versionInfo, &versionCount);
|
||||
|
||||
for(HGUInt i = 0; i < versionCount; ++i)
|
||||
{
|
||||
QListWidgetItem *listwidgetItem = new QListWidgetItem;
|
||||
listwidgetItem->setText(QString(versionInfo[i].version));
|
||||
listwidgetItem->setData(Qt::UserRole, versionInfo[i].url);
|
||||
listwidgetItem->setData(Qt::UserRole+1, versionInfo[i].md5);
|
||||
listwidgetItem->setToolTip(tr("upgrade contents: ") + versionInfo[i].desc + tr(" bug description: ") + versionInfo[i].bugInfo);
|
||||
ui->listWidget->addItem(listwidgetItem);
|
||||
}
|
||||
|
||||
if(ui->listWidget->count() > 0)
|
||||
{
|
||||
QListWidgetItem *item = ui->listWidget->item(0);
|
||||
item->setSelected(true);
|
||||
}
|
||||
|
||||
HGChar currVersion[64] = {0};
|
||||
m_versionDll->GetCurrVersion(HGVERSION_APPNAME_SCANNER, currVersion, 64);
|
||||
HGInt result = 0;
|
||||
std::string newestVersionNum = ui->listWidget->item(0)->text().toStdString().c_str();
|
||||
m_versionDll->CompareVersion(currVersion, newestVersionNum.c_str(), &result);
|
||||
if(result == 0)
|
||||
{
|
||||
ui->label_detectResult->setText(tr("The current version is the latest! The current version number is : ") + currVersion);
|
||||
ui->pbtn_upgrade->setVisible(false);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->pbtn_upgrade->setVisible(true);
|
||||
ui->label_detectResult->setText(tr("Discover the new version : ") +
|
||||
ui->listWidget->item(0)->text().toStdString().c_str() +
|
||||
tr(" ,the current version is : ") + currVersion);
|
||||
}
|
||||
|
||||
connect(ui->listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(on_listWidget_itemDoubleClicked(QListWidgetItem*)), Qt::QueuedConnection);
|
||||
|
||||
m_versionDll->ReleaseVersionList(versionInfo, versionCount);
|
||||
}
|
||||
|
||||
Dialog_upgrade::~Dialog_upgrade()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_pbtn_install_clicked()
|
||||
{
|
||||
QListWidgetItem *item = ui->listWidget->currentItem();
|
||||
on_listWidget_itemDoubleClicked(item);
|
||||
close();
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_pbtn_cancel_clicked()
|
||||
{
|
||||
close();
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_listWidget_itemDoubleClicked(QListWidgetItem *item)
|
||||
{
|
||||
close();
|
||||
|
||||
HGChar currVersion[64] = {0};
|
||||
m_versionDll->GetCurrVersion(HGVERSION_APPNAME_SCANNER, currVersion, 64);
|
||||
|
||||
std::string selectVersionNum = item->text().toStdString().c_str();
|
||||
HGInt result = 0;
|
||||
m_versionDll->CompareVersion(currVersion, selectVersionNum.c_str(), &result);
|
||||
if(result == 0)
|
||||
{
|
||||
QMessageBox::information(this, "tip", "Already in current version");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
QString url = item->data(Qt::UserRole).toString();
|
||||
QString versionNum = item->text();
|
||||
QString md5 = item->data(Qt::UserRole+1).toString();
|
||||
|
||||
HGChar savePath[512];
|
||||
HGBase_GetConfigPath(savePath, 512);
|
||||
HGBase_CreateDir(savePath);
|
||||
strcat(savePath, (versionNum + QString("%1").arg(".exe")).toLatin1().data());
|
||||
|
||||
QFile saveFile(savePath);
|
||||
saveFile.open(QFile::ReadOnly);
|
||||
QByteArray fileMsg = saveFile.readAll();
|
||||
saveFile.close();
|
||||
QString md5_2 = QCryptographicHash::hash(fileMsg , QCryptographicHash::Md5).toHex();
|
||||
|
||||
QFile f(savePath);
|
||||
if(!f.exists() || md5 != md5_2)
|
||||
{
|
||||
Dialog_updateProgress *dlg = new Dialog_updateProgress(m_versionDll, url, savePath);
|
||||
dlg->exec();
|
||||
connect(dlg, SIGNAL(upgrade(QString)), this, SLOT(on_upgrade(QString)), Qt::QueuedConnection);
|
||||
}
|
||||
else
|
||||
{
|
||||
on_upgrade(savePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_upgrade(QString pkgPath)
|
||||
{
|
||||
emit upgradeApp(pkgPath);
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_pbtn_selectVersion_clicked()
|
||||
{
|
||||
if(ui->listWidget->count() == 0)
|
||||
{
|
||||
ui->pbtn_install->setVisible(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->pbtn_install->setVisible(true);
|
||||
}
|
||||
ui->pbtn_selectVersion->setVisible(false);
|
||||
ui->listWidget->setVisible(true);
|
||||
ui->pbtn_cancel->setVisible(true);
|
||||
ui->label->setVisible(true);
|
||||
}
|
||||
|
||||
void Dialog_upgrade::on_pbtn_upgrade_clicked()
|
||||
{
|
||||
QListWidgetItem *item = ui->listWidget->item(0);
|
||||
on_listWidget_itemDoubleClicked(item);
|
||||
close();
|
||||
}
|
|
@ -0,0 +1,41 @@
|
|||
#ifndef DIALOG_UPGRADE_H
|
||||
#define DIALOG_UPGRADE_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "VersionDll.h"
|
||||
#include "dialog_updateprogress.h"
|
||||
|
||||
namespace Ui {
|
||||
class Dialog_upgrade;
|
||||
}
|
||||
|
||||
class Dialog_upgrade : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Dialog_upgrade(class VersionDll *versionDll, QWidget *parent = nullptr);
|
||||
~Dialog_upgrade();
|
||||
|
||||
private slots:
|
||||
void on_pbtn_install_clicked();
|
||||
|
||||
void on_pbtn_cancel_clicked();
|
||||
|
||||
void on_listWidget_itemDoubleClicked(QListWidgetItem *item);
|
||||
void on_upgrade(QString pkgPath);
|
||||
|
||||
void on_pbtn_selectVersion_clicked();
|
||||
|
||||
void on_pbtn_upgrade_clicked();
|
||||
|
||||
signals:
|
||||
void upgradeApp(QString pkgPath);
|
||||
|
||||
private:
|
||||
Ui::Dialog_upgrade *ui;
|
||||
|
||||
VersionDll *m_versionDll;
|
||||
};
|
||||
|
||||
#endif // DIALOG_UPGRADE_H
|
|
@ -0,0 +1,113 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog_upgrade</class>
|
||||
<widget class="QDialog" name="Dialog_upgrade">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>431</width>
|
||||
<height>253</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_detectResult">
|
||||
<property name="text">
|
||||
<string>detect result. versionNum:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbtn_upgrade">
|
||||
<property name="text">
|
||||
<string>upgrade the latest version</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbtn_selectVersion">
|
||||
<property name="text">
|
||||
<string>select version</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Detected installable versions:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QListWidget" name="listWidget"/>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbtn_install">
|
||||
<property name="text">
|
||||
<string>install</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbtn_cancel">
|
||||
<property name="text">
|
||||
<string>cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
|
@ -29,6 +29,7 @@
|
|||
#include "dialog_moveto.h"
|
||||
#include "dialog_imageeditor.h"
|
||||
#include "dialog_updateprogress.h"
|
||||
#include "dialog_upgrade.h"
|
||||
#include "hg_settingdialog.h"
|
||||
#include "base/HGInfo.h"
|
||||
#include "imgfmt/HGPdf.h"
|
||||
|
@ -1092,52 +1093,6 @@ void MainWindow::on_statusInfoDblClick()
|
|||
m_dialogLog->show();
|
||||
}
|
||||
|
||||
void MainWindow::on_upgrade(QListWidgetItem *item)
|
||||
{
|
||||
HGChar currVersion[64] = {0};
|
||||
m_versionDll->GetCurrVersion(HGVERSION_APPNAME_SCANNER, currVersion, 64);
|
||||
|
||||
std::string selectVersionNum = item->text().toStdString().c_str();
|
||||
|
||||
m_listwidget->close();
|
||||
HGInt result = 0;
|
||||
m_versionDll->CompareVersion(currVersion, selectVersionNum.c_str(), &result);
|
||||
if(result == 0)
|
||||
{
|
||||
QMessageBox::information(this, "tip", "Already in current version");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
QString url = item->data(Qt::UserRole).toString();
|
||||
QString versionNum = item->text();
|
||||
QString md5 = item->data(Qt::UserRole+1).toString();
|
||||
|
||||
HGChar savePath[512];
|
||||
HGBase_GetConfigPath(savePath, 512);
|
||||
HGBase_CreateDir(savePath);
|
||||
strcat(savePath, (versionNum + QString("%1").arg(".exe")).toLatin1().data());
|
||||
|
||||
QFile saveFile(savePath);
|
||||
saveFile.open(QFile::ReadOnly);
|
||||
QByteArray fileMsg = saveFile.readAll();
|
||||
saveFile.close();
|
||||
QString md5_2 = QCryptographicHash::hash(fileMsg , QCryptographicHash::Md5).toHex();
|
||||
|
||||
QFile f(savePath);
|
||||
if(!f.exists() || md5 != md5_2)
|
||||
{
|
||||
Dialog_updateProgress *dlg = new Dialog_updateProgress(m_versionDll, url, savePath);
|
||||
dlg->exec();
|
||||
connect(dlg, SIGNAL(upgradeApp(QString)), this, SLOT(on_upgradeApp(QString)), Qt::QueuedConnection);
|
||||
}
|
||||
else
|
||||
{
|
||||
on_upgradeApp(savePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::on_upgradeApp(QString pkgPath)
|
||||
{
|
||||
QProcess proc;
|
||||
|
@ -3187,31 +3142,19 @@ void MainWindow::on_act_sortPages_triggered()
|
|||
|
||||
void MainWindow::on_actionact_update_triggered()
|
||||
{
|
||||
m_listwidget = new QListWidget;
|
||||
m_listwidget->setWindowTitle("chose the version");
|
||||
|
||||
HGVersionInfo *versionInfo = NULL;
|
||||
HGUInt versionCount = 0;
|
||||
m_versionDll->GetVersionList(HGVERSION_APPNAME_SCANNER, &versionInfo, &versionCount);
|
||||
|
||||
if(versionCount > 0)
|
||||
{
|
||||
for(HGUInt i = 0; i < versionCount; ++i)
|
||||
{
|
||||
QListWidgetItem *listwidgetItem = new QListWidgetItem;
|
||||
listwidgetItem->setText(QString(versionInfo[i].version));
|
||||
listwidgetItem->setData(Qt::UserRole, versionInfo[i].url);
|
||||
listwidgetItem->setData(Qt::UserRole+1, versionInfo[i].md5);
|
||||
listwidgetItem->setToolTip(versionInfo[i].desc + tr(" buginfo: ") + versionInfo[i].bugInfo);
|
||||
m_listwidget->addItem(listwidgetItem);
|
||||
}
|
||||
m_listwidget->show();
|
||||
connect(m_listwidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(on_upgrade(QListWidgetItem*)), Qt::QueuedConnection);
|
||||
|
||||
m_versionDll->ReleaseVersionList(versionInfo, versionCount);
|
||||
Dialog_upgrade dlg(m_versionDll, this);
|
||||
connect(&dlg, SIGNAL(upgradeApp(QString)), this, SLOT(on_upgradeApp(QString)), Qt::QueuedConnection);
|
||||
dlg.exec();
|
||||
disconnect(&dlg, SIGNAL(upgradeApp(QString)), this, SLOT(on_upgradeApp(QString)));
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::critical(this, tr("error"), tr("get versionlist failed"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -122,7 +122,6 @@ private slots:
|
|||
void on_continueScan();
|
||||
void on_stopScan();
|
||||
void on_statusInfoDblClick();
|
||||
void on_upgrade(QListWidgetItem *item);
|
||||
void on_upgradeApp(QString pkgPath);
|
||||
|
||||
void on_act_thumbnailBar_triggered(bool checked);
|
||||
|
|
|
@ -162,8 +162,9 @@ SOURCES += \
|
|||
../../../app/scanner/HGImgView.cpp \
|
||||
../../../app/scanner/HGUIGlobal.cpp \
|
||||
../../../utility/HGString.cpp \
|
||||
../../../app/scanner/dialog_input.cpp\
|
||||
../../../app/scanner/dialog_updateprogress.cpp
|
||||
../../../app/scanner/dialog_input.cpp \
|
||||
../../../app/scanner/dialog_updateprogress.cpp \
|
||||
../../../app/scanner/dialog_upgrade.cpp
|
||||
|
||||
HEADERS += \
|
||||
../../../app/scanner/VersionDll.h \
|
||||
|
@ -208,8 +209,9 @@ HEADERS += \
|
|||
../../../app/scanner/HGUIGlobal.h \
|
||||
../../../utility/HGString.h \
|
||||
../../../app/scanner/dialog_input.h \
|
||||
../../../app/scanner/custom_file_dialog.h\
|
||||
../../../app/scanner/dialog_updateprogress.h
|
||||
../../../app/scanner/custom_file_dialog.h \
|
||||
../../../app/scanner/dialog_updateprogress.h \
|
||||
../../../app/scanner/dialog_upgrade.h
|
||||
|
||||
FORMS += \
|
||||
../../../app/scanner/cutdialog.ui \
|
||||
|
@ -240,7 +242,8 @@ FORMS += \
|
|||
../../../app/scanner/widget_statusbar.ui \
|
||||
../../../app/scanner/dialog_log.ui \
|
||||
../../../app/scanner/dialog_input.ui \
|
||||
../../../app/scanner/dialog_updateprogress.ui
|
||||
../../../app/scanner/dialog_updateprogress.ui \
|
||||
../../../app/scanner/dialog_upgrade.ui
|
||||
|
||||
TRANSLATIONS += \
|
||||
../../../app/scanner/Scanner_zh_CN.ts \
|
||||
|
|
Loading…
Reference in New Issue