sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop current scan

Browse Source
This commit is contained in:
Krad
2021-10-27 10:37:12 +08:00
parent 8c980a458a
commit 9abd925864
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/DeviceManager.cpp
View File

@@ -204,7 +204,7 @@ void DeviceManager::timerEvent(QTimerEvent *event) {
timerID=-1; timerID=-1;
lastStatus = -1; lastStatus = -1;
previewing = false; previewing = false;
TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,nullptr); // TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,nullptr);
return; return;
} else{ } else{
QString temp = QString(GetDeviceInfo(MEAN_TEMPERATURE)); QString temp = QString(GetDeviceInfo(MEAN_TEMPERATURE));

14
src/guimessagedialog.cpp
View File

@@ -54,6 +54,17 @@ void GUIMessageDialog::stopLoading() {
void GUIMessageDialog::startLoading() { void GUIMessageDialog::startLoading() {
ui->lbl_progressicon->setVisible(true); ui->lbl_progressicon->setVisible(true);
timerID = startTimer(100); timerID = startTimer(100);
ui->btn_main->setText("Stop");
ui->btn_main->setVisible(true);
disconnect(ui->btn_main);
connect(ui->btn_main,&QToolButton::clicked,[=](){
if (timerID != -1){
killTimer(timerID);
timerID = -1;
}
accept();
EventCenter::Default()->triggerEvent(GUIEvents::RequestStop, nullptr, nullptr);
});
} }
void GUIMessageDialog::showMessage(QString msg) { void GUIMessageDialog::showMessage(QString msg) {
@@ -62,6 +73,7 @@ void GUIMessageDialog::showMessage(QString msg) {
} }
void GUIMessageDialog::showExitButton() { void GUIMessageDialog::showExitButton() {
ui->btn_main->setText("OK");
ui->btn_main->setVisible(true); ui->btn_main->setVisible(true);
disconnect(ui->btn_main); disconnect(ui->btn_main);
connect(ui->btn_main,&QToolButton::clicked,[=](){ connect(ui->btn_main,&QToolButton::clicked,[=](){
@@ -79,6 +91,6 @@ void GUIMessageDialog::hideMessage() {
} }
void GUIMessageDialog::hideExitButton() { void GUIMessageDialog::hideExitButton() {
ui->btn_main->setVisible(false); if(ui->btn_main->text()=="OK") ui->btn_main->setVisible(false);
disconnect(ui->btn_main); disconnect(ui->btn_main);
} }