Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 一键安装，点击取消不能终止流程 #260

Merged
merged 1 commit into from
Nov 6, 2023
Merged

fix: 一键安装，点击取消不能终止流程 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions deepin-devicemanager/src/Page/PageDriverManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,11 @@ void PageDriverManager::slotUndoInstall()
m_CancelIndex = m_CurIndex;
DBusDriverInterface::getInstance()->undoInstallDriver();
}

for (int index : m_ListDriverIndex) {
mp_DriverInstallInfoPage->updateItemStatus(index, m_ListDriverInfo[index]->status());
}
m_ListDriverIndex.clear();
}

void PageDriverManager::slotUndoBackup()
Expand Down Expand Up @@ -494,7 +499,7 @@ void PageDriverManager::slotBackupFinished(bool bsuccess)
mp_DriverRestoreInfoPage->addDriverInfoToTableView(m_ListDriverInfo[m_CurBackupIndex], m_CurBackupIndex);
}
mp_DriverRestoreInfoPage->showTables(m_ListRestorableIndex.size());
m_ListBackableIndex.removeAt(0);
m_ListBackableIndex.removeAt(m_ListBackableIndex.indexOf(m_CurBackupIndex));
} else {
m_backupFailedNum += 1;
}
Expand All @@ -515,7 +520,6 @@ void PageDriverManager::slotBackupFinished(bool bsuccess)
mp_DriverBackupInfoPage->setHeaderCbEnable(false);
}


mp_DriverInstallInfoPage->headWidget()->setReDetectEnable(true);
mp_DriverBackupInfoPage->headWidget()->setReDetectEnable(true);
mp_DriverRestoreInfoPage->headWidget()->setReDetectEnable(true);
Expand Down
6 changes: 3 additions & 3 deletions deepin-devicemanager/src/Widget/drivertableview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,15 +530,15 @@ void DriverTableView::setItemStatus(int index, Status s)

// 如果是安装成功则取消选中且不可选
if (ST_SUCESS == s || ST_FAILED == s|| ST_DRIVER_BACKUP_FAILED == s || ST_DRIVER_BACKUP_SUCCESS == s
|| ST_DRIVER_NOT_BACKUP == s) {
|| ST_DRIVER_NOT_BACKUP == s || ST_CAN_UPDATE == s || ST_NOT_INSTALL == s) {
DriverCheckItem *cb = dynamic_cast<DriverCheckItem *>(indexWidget(mp_Model->index(i, 0)));
if (cb) {
cb->setCbEnable(ST_FAILED == s || ST_DRIVER_BACKUP_FAILED == s || ST_DRIVER_NOT_BACKUP == s ? true : false);
cb->setCbEnable(ST_FAILED == s || ST_DRIVER_BACKUP_FAILED == s || ST_DRIVER_NOT_BACKUP == s || ST_CAN_UPDATE == s || ST_NOT_INSTALL == s ? true : false);
cb->setChecked(false);
}
DriverOperationItem *opera = dynamic_cast<DriverOperationItem *>(indexWidget(mp_Model->index(i, 5)));
if (opera) {
opera->setBtnEnable(ST_FAILED == s || ST_DRIVER_BACKUP_FAILED == s || ST_DRIVER_NOT_BACKUP == s? true : false);
opera->setBtnEnable(ST_FAILED == s || ST_DRIVER_BACKUP_FAILED == s || ST_DRIVER_NOT_BACKUP == s || ST_CAN_UPDATE == s || ST_NOT_INSTALL == s ? true : false);
}
}
break;
Expand Down