benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide history window during waiting for delete screenshot from S3

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-08-06 18:57:14 +03:00
parent 3053541827
commit aba85cbf52
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/historywidget.cpp
View File

@@ -159,10 +159,14 @@ void HistoryWidget::addLine(const QString &path, const QString& fileName) {
void HistoryWidget::removeItem(QLayout *pl, const QString &fullFileName, const QString& s3FileName, const QString& deleteToken) {
if (deleteToken.length() > 0) {
ImgS3Uploader *uploader = new ImgS3Uploader();
hide();
uploader->show();
uploader->deleteResource(s3FileName, deleteToken);
connect(uploader, &QWidget::destroyed, this, [=](){
removeLocalItem(pl, fullFileName);
if(uploader->success()) {
removeLocalItem(pl, fullFileName);
}
show();
});
}
else {
@@ -175,11 +179,10 @@ void HistoryWidget::removeLocalItem(QLayout *pl, const QString &fullFileName) {
file.remove();
// remove current row or refresh list
while(pl->count() > 0)
{
QLayoutItem *item = pl->takeAt(0);
delete item->widget();
delete item;
while(pl->count() > 0) {
QLayoutItem *item = pl->takeAt(0);
delete item->widget();
delete item;
}
m_pVBox->removeItem(pl);
delete pl;