From 1015614ce02ebfea8c05b6c4bbb13e06428ecb61 Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Thu, 15 Oct 2020 22:24:25 +1100 Subject: [PATCH 01/10] feat(InfoDialogTransfersWidget): Add method stubs for retry-all See #1 for notes / findings on how this implementation will work --- src/MEGASync/gui/MegaTransferView.cpp | 10 ++++++++++ src/MEGASync/gui/MegaTransferView.h | 1 + src/MEGASync/gui/QCustomTransfersModel.cpp | 22 ++++++++++++++++++++++ src/MEGASync/gui/QCustomTransfersModel.h | 2 ++ src/MEGASync/gui/QTransfersModel.h | 3 +++ 5 files changed, 38 insertions(+) diff --git a/src/MEGASync/gui/MegaTransferView.cpp b/src/MEGASync/gui/MegaTransferView.cpp index 249d5dc304..2a49ebedb4 100644 --- a/src/MEGASync/gui/MegaTransferView.cpp +++ b/src/MEGASync/gui/MegaTransferView.cpp @@ -745,3 +745,13 @@ void MegaTransferView::clearAllTransferClicked() model->removeAllTransfers(); } } + + +void MegaTransferView::retryAllFailedTransferClicked() +{ + QTransfersModel *model = (QTransfersModel*)this->model(); + if (model) + { + model->retryAllTransfers(); + } +} diff --git a/src/MEGASync/gui/MegaTransferView.h b/src/MEGASync/gui/MegaTransferView.h index 389c57a80f..9235f4b6d3 100644 --- a/src/MEGASync/gui/MegaTransferView.h +++ b/src/MEGASync/gui/MegaTransferView.h @@ -69,6 +69,7 @@ private slots: void clearTransferClicked(); void clearAllTransferClicked(); + void retryAllFailedTransferClicked(); signals: void showContextMenu(QPoint pos); }; diff --git a/src/MEGASync/gui/QCustomTransfersModel.cpp b/src/MEGASync/gui/QCustomTransfersModel.cpp index 42d16ef33f..b7dc71a2cc 100644 --- a/src/MEGASync/gui/QCustomTransfersModel.cpp +++ b/src/MEGASync/gui/QCustomTransfersModel.cpp @@ -334,6 +334,28 @@ void QCustomTransfersModel::updateActiveTransfer(MegaApi *api, MegaTransfer *new } } +void QCustomTransfersModel::retryAllTransfers() +{ + retryAllCompletedTransfers(); +} + + +void QCustomTransfersModel::retryAllCompletedTransfers() +{ + if (transfers.size()) + { + // TODO: + // Filter for failed transfers + // For each failed tx + // retry the tx + // possibly set whichever flags / state indicate its in progress + // (i think the API does this for me though) + // + // See following for how to retry. + // https://github.com/matthewstrasiotto/MEGAsync/blob/58d3ed7f4a10d08b0fa908639a65deac6a6bde1b/src/MEGASync/gui/MegaTransferDelegate.cpp#L292 + } +} + transfer_it QCustomTransfersModel::getInsertPosition(MegaTransfer *transfer) { transfer_it it = transferOrder.begin(); diff --git a/src/MEGASync/gui/QCustomTransfersModel.h b/src/MEGASync/gui/QCustomTransfersModel.h index 7f61778e4e..913a4ef901 100644 --- a/src/MEGASync/gui/QCustomTransfersModel.h +++ b/src/MEGASync/gui/QCustomTransfersModel.h @@ -33,6 +33,7 @@ class QCustomTransfersModel : public QTransfersModel private slots: void refreshTransferItem(int tag); void removeAllCompletedTransfers(); + void retryAllFailedTransfers(); protected: void updateTransferInfo(mega::MegaTransfer *transfer); @@ -42,6 +43,7 @@ public slots: void removeAllTransfers(); void removeTransferByTag(int transferTag); void updateActiveTransfer(mega::MegaApi *api, mega::MegaTransfer *newtransfer); + void retryAllTransfers(); private: unsigned char modelState; diff --git a/src/MEGASync/gui/QTransfersModel.h b/src/MEGASync/gui/QTransfersModel.h index 380b29bda5..8d7b6d3bed 100644 --- a/src/MEGASync/gui/QTransfersModel.h +++ b/src/MEGASync/gui/QTransfersModel.h @@ -42,6 +42,9 @@ class QTransfersModel : public QAbstractItemModel, public mega::MegaTransferList virtual void removeTransferByTag(int transferTag) = 0; virtual void removeAllTransfers() = 0; + + virtual void retryAllTransfers() = 0; + virtual mega::MegaTransfer *getTransferByTag(int tag) = 0; QCache transferItems; From 2a78ae6c20352ebbe6a00e6909c476bb9c9be23a Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 16:06:06 +1100 Subject: [PATCH 02/10] feat(QCustomTransfersModel): Implement retryAllTransfers --- src/MEGASync/gui/QCustomTransfersModel.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/MEGASync/gui/QCustomTransfersModel.cpp b/src/MEGASync/gui/QCustomTransfersModel.cpp index b7dc71a2cc..ff0903e6e4 100644 --- a/src/MEGASync/gui/QCustomTransfersModel.cpp +++ b/src/MEGASync/gui/QCustomTransfersModel.cpp @@ -353,6 +353,21 @@ void QCustomTransfersModel::retryAllCompletedTransfers() // // See following for how to retry. // https://github.com/matthewstrasiotto/MEGAsync/blob/58d3ed7f4a10d08b0fa908639a65deac6a6bde1b/src/MEGASync/gui/MegaTransferDelegate.cpp#L292 + + for (QMap::iterator it = transfers.begin(); it != transfers.end();) + { + int tag = it.key(); + + MegaTransfer *transfer = ((MegaApplication *)qApp)->getFinishedTransferByTag(tag); + if (transfer) + { + if (transfer->getLastError().getErrorCode()) + { + ((MegaApplication*)qApp)->getMegaApi()->retryTransfer(transfer); + } + } + + } } } From ec86fd5cc8c1064ab3e1c3e7275066aeffca77c4 Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 17:22:39 +1100 Subject: [PATCH 03/10] chore(TransfersWidget.retryAll): Add binding to TransfersWidget --- src/MEGASync/gui/TransfersWidget.cpp | 5 +++++ src/MEGASync/gui/TransfersWidget.h | 2 ++ src/MEGASync/gui/linux/TransfersWidget.ui | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MEGASync/gui/TransfersWidget.cpp b/src/MEGASync/gui/TransfersWidget.cpp index 6f637eada5..677a37b2d6 100644 --- a/src/MEGASync/gui/TransfersWidget.cpp +++ b/src/MEGASync/gui/TransfersWidget.cpp @@ -61,6 +61,11 @@ void TransfersWidget::clearTransfers() model->removeAllTransfers(); } +void TransfersWidget::retryTransfers() +{ + model->retryAllTransfers(); +} + TransfersWidget::~TransfersWidget() { delete ui; diff --git a/src/MEGASync/gui/TransfersWidget.h b/src/MEGASync/gui/TransfersWidget.h index 18515cc5a4..ecf4945044 100644 --- a/src/MEGASync/gui/TransfersWidget.h +++ b/src/MEGASync/gui/TransfersWidget.h @@ -25,6 +25,8 @@ class TransfersWidget : public QWidget void setupTransfers(mega::MegaTransferData *transferData, int type); void refreshTransferItems(); void clearTransfers(); + + void retryTransfers(); void pausedTransfers(bool paused); void disableGetLink(bool disable); QTransfersModel *getModel(); diff --git a/src/MEGASync/gui/linux/TransfersWidget.ui b/src/MEGASync/gui/linux/TransfersWidget.ui index 20fd189a7d..038c5955dc 100644 --- a/src/MEGASync/gui/linux/TransfersWidget.ui +++ b/src/MEGASync/gui/linux/TransfersWidget.ui @@ -97,7 +97,7 @@ - 0 + 1 From 8fe9f79cefa8913a35c261696a17f698b7a3e8c4 Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 17:36:31 +1100 Subject: [PATCH 04/10] fix(QTransferModel): change retryAllTransfers from virtual --- src/MEGASync/gui/QTransfersModel.cpp | 5 +++++ src/MEGASync/gui/QTransfersModel.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/MEGASync/gui/QTransfersModel.cpp b/src/MEGASync/gui/QTransfersModel.cpp index b015dcd92f..3203bed7d7 100644 --- a/src/MEGASync/gui/QTransfersModel.cpp +++ b/src/MEGASync/gui/QTransfersModel.cpp @@ -72,3 +72,8 @@ QTransfersModel::~QTransfersModel() { qDeleteAll(transfers); } + +void QTransfersModel::retryAllTransfers() +{ + // Interface stub +} diff --git a/src/MEGASync/gui/QTransfersModel.h b/src/MEGASync/gui/QTransfersModel.h index 8d7b6d3bed..576b035240 100644 --- a/src/MEGASync/gui/QTransfersModel.h +++ b/src/MEGASync/gui/QTransfersModel.h @@ -43,7 +43,7 @@ class QTransfersModel : public QAbstractItemModel, public mega::MegaTransferList virtual void removeTransferByTag(int transferTag) = 0; virtual void removeAllTransfers() = 0; - virtual void retryAllTransfers() = 0; + void retryAllTransfers(); virtual mega::MegaTransfer *getTransferByTag(int tag) = 0; From 687e0498b278f35f5a073e7899787d9f7780667a Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 17:38:21 +1100 Subject: [PATCH 05/10] chore(QFinishedTransfersModel): move retry from QCustomTransfersModel --- src/MEGASync/gui/QCustomTransfersModel.cpp | 36 ------------------- src/MEGASync/gui/QCustomTransfersModel.h | 2 -- src/MEGASync/gui/QFinishedTransfersModel.cpp | 37 ++++++++++++++++++++ src/MEGASync/gui/QFinishedTransfersModel.h | 2 ++ 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/MEGASync/gui/QCustomTransfersModel.cpp b/src/MEGASync/gui/QCustomTransfersModel.cpp index ff0903e6e4..de7232586e 100644 --- a/src/MEGASync/gui/QCustomTransfersModel.cpp +++ b/src/MEGASync/gui/QCustomTransfersModel.cpp @@ -334,42 +334,6 @@ void QCustomTransfersModel::updateActiveTransfer(MegaApi *api, MegaTransfer *new } } -void QCustomTransfersModel::retryAllTransfers() -{ - retryAllCompletedTransfers(); -} - - -void QCustomTransfersModel::retryAllCompletedTransfers() -{ - if (transfers.size()) - { - // TODO: - // Filter for failed transfers - // For each failed tx - // retry the tx - // possibly set whichever flags / state indicate its in progress - // (i think the API does this for me though) - // - // See following for how to retry. - // https://github.com/matthewstrasiotto/MEGAsync/blob/58d3ed7f4a10d08b0fa908639a65deac6a6bde1b/src/MEGASync/gui/MegaTransferDelegate.cpp#L292 - - for (QMap::iterator it = transfers.begin(); it != transfers.end();) - { - int tag = it.key(); - - MegaTransfer *transfer = ((MegaApplication *)qApp)->getFinishedTransferByTag(tag); - if (transfer) - { - if (transfer->getLastError().getErrorCode()) - { - ((MegaApplication*)qApp)->getMegaApi()->retryTransfer(transfer); - } - } - - } - } -} transfer_it QCustomTransfersModel::getInsertPosition(MegaTransfer *transfer) { diff --git a/src/MEGASync/gui/QCustomTransfersModel.h b/src/MEGASync/gui/QCustomTransfersModel.h index 913a4ef901..7f61778e4e 100644 --- a/src/MEGASync/gui/QCustomTransfersModel.h +++ b/src/MEGASync/gui/QCustomTransfersModel.h @@ -33,7 +33,6 @@ class QCustomTransfersModel : public QTransfersModel private slots: void refreshTransferItem(int tag); void removeAllCompletedTransfers(); - void retryAllFailedTransfers(); protected: void updateTransferInfo(mega::MegaTransfer *transfer); @@ -43,7 +42,6 @@ public slots: void removeAllTransfers(); void removeTransferByTag(int transferTag); void updateActiveTransfer(mega::MegaApi *api, mega::MegaTransfer *newtransfer); - void retryAllTransfers(); private: unsigned char modelState; diff --git a/src/MEGASync/gui/QFinishedTransfersModel.cpp b/src/MEGASync/gui/QFinishedTransfersModel.cpp index 82951f6a4f..b74317ae44 100644 --- a/src/MEGASync/gui/QFinishedTransfersModel.cpp +++ b/src/MEGASync/gui/QFinishedTransfersModel.cpp @@ -103,6 +103,43 @@ void QFinishedTransfersModel::removeAllTransfers() emit noTransfers(); } +void QFinishedTransfersModel::retryAllTransfers() +{ + retryAllCompletedTransfers(); +} + + +void QFinishedTransfersModel::retryAllCompletedTransfers() +{ + if (transfers.size()) + { + // TODO: + // Filter for failed transfers + // For each failed tx + // retry the tx + // possibly set whichever flags / state indicate its in progress + // (i think the API does this for me though) + // + // See following for how to retry. + // https://github.com/matthewstrasiotto/MEGAsync/blob/58d3ed7f4a10d08b0fa908639a65deac6a6bde1b/src/MEGASync/gui/MegaTransferDelegate.cpp#L292 + + for (QMap::iterator it = transfers.begin(); it != transfers.end();) + { + int tag = it.key(); + + MegaTransfer *transfer = ((MegaApplication *)qApp)->getFinishedTransferByTag(tag); + if (transfer) + { + if (transfer->getLastError().getErrorCode()) + { + ((MegaApplication*)qApp)->getMegaApi()->retryTransfer(transfer); + } + } + + } + } +} + MegaTransfer *QFinishedTransfersModel::getTransferByTag(int tag) { MegaTransfer *transfer = ((MegaApplication *)qApp)->getFinishedTransferByTag(tag); diff --git a/src/MEGASync/gui/QFinishedTransfersModel.h b/src/MEGASync/gui/QFinishedTransfersModel.h index 7e346fdb0f..dcf066a0ea 100644 --- a/src/MEGASync/gui/QFinishedTransfersModel.h +++ b/src/MEGASync/gui/QFinishedTransfersModel.h @@ -26,10 +26,12 @@ class QFinishedTransfersModel : public QTransfersModel private slots: void refreshTransferItem(int tag); + void retryAllFailedTransfers(); public slots: void removeAllTransfers(); void removeTransferByTag(int transferTag); + void retryAllTransfers(); }; #endif // QFINISHEDTRANSFERSMODEL_H From 803128d2cc0a13b0d272195aec7d30d1aad023dd Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 17:40:15 +1100 Subject: [PATCH 06/10] fix(QFinishedTransfersModel.retryAllFailedTransfers): fix typo in name --- src/MEGASync/gui/QFinishedTransfersModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MEGASync/gui/QFinishedTransfersModel.cpp b/src/MEGASync/gui/QFinishedTransfersModel.cpp index b74317ae44..18d5e3220e 100644 --- a/src/MEGASync/gui/QFinishedTransfersModel.cpp +++ b/src/MEGASync/gui/QFinishedTransfersModel.cpp @@ -105,11 +105,11 @@ void QFinishedTransfersModel::removeAllTransfers() void QFinishedTransfersModel::retryAllTransfers() { - retryAllCompletedTransfers(); + retryAllFailedTransfers(); } -void QFinishedTransfersModel::retryAllCompletedTransfers() +void QFinishedTransfersModel::retryAllFailedTransfers() { if (transfers.size()) { From ac91bbefe960033312650dd4b6048820cde0163b Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 17:43:33 +1100 Subject: [PATCH 07/10] feat(TransferManager): add Retry All button to transfer manager --- src/MEGASync/gui/TransferManager.cpp | 9 ++ src/MEGASync/gui/TransferManager.h | 2 + src/MEGASync/gui/linux/TransferManager.ui | 101 +++++++++++++++++++++- 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/src/MEGASync/gui/TransferManager.cpp b/src/MEGASync/gui/TransferManager.cpp index e2903b5907..fd0b0d834f 100644 --- a/src/MEGASync/gui/TransferManager.cpp +++ b/src/MEGASync/gui/TransferManager.cpp @@ -633,3 +633,12 @@ void TransferManager::mouseReleaseEvent(QMouseEvent *event) dragPosition = QPoint(-1, -1); } + +void TransferManager::on_bRetryAll_clicked() +{ + QWidget *w = ui->wTransfers->currentWidget(); + if(w == ui->wCompleted) + { + ui->wCompleted->retryTransfers(); + } +} diff --git a/src/MEGASync/gui/TransferManager.h b/src/MEGASync/gui/TransferManager.h index c1c85c95a7..3326ff279e 100644 --- a/src/MEGASync/gui/TransferManager.h +++ b/src/MEGASync/gui/TransferManager.h @@ -76,6 +76,8 @@ private slots: void refreshFinishedTime(); + void on_bRetryAll_clicked(); + protected: void changeEvent(QEvent *event); void mouseMoveEvent(QMouseEvent *event); diff --git a/src/MEGASync/gui/linux/TransferManager.ui b/src/MEGASync/gui/linux/TransferManager.ui index ffb45cf96f..77e8a00aee 100644 --- a/src/MEGASync/gui/linux/TransferManager.ui +++ b/src/MEGASync/gui/linux/TransferManager.ui @@ -292,7 +292,7 @@ Add... - + :/images/ico_drop_add_sync.png:/images/ico_drop_add_sync.png @@ -807,6 +807,105 @@ border-top: 1px solid rgba(0, 0, 0, 10%); + + + + true + + + + 120 + 32 + + + + + 16777215 + 32 + + + + + + + + + 255 + 255 + 255 + + + + + + + 46 + 52 + 54 + + + + + + + + + 202 + 202 + 202 + + + + + + + 231 + 231 + 231 + + + + + + + + + 202 + 202 + 202 + + + + + + + 255 + 255 + 255 + + + + + + + + PointingHandCursor + + + Retry All + + + + :/images/ico_item_retry@3x.png:/images/ico_item_retry@3x.png + + + + 24 + 24 + + + + From 48790777a4aaf0495ea15065d71035e1eece06dc Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 21:29:32 +1100 Subject: [PATCH 08/10] chore(TransferManager.bRetryAll): add button for OSX and windows --- src/MEGASync/gui/macx/TransferManager.ui | 37 +++++++++++++++++++++++- src/MEGASync/gui/win/TransferManager.ui | 37 +++++++++++++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/MEGASync/gui/macx/TransferManager.ui b/src/MEGASync/gui/macx/TransferManager.ui index 09ac39f05a..bbf90e0c17 100644 --- a/src/MEGASync/gui/macx/TransferManager.ui +++ b/src/MEGASync/gui/macx/TransferManager.ui @@ -786,7 +786,42 @@ border-top: 1px solid rgba(0, 0, 0, 10%); Clear all - + + :/images/clear_ico.png:/images/clear_ico.png + + + + 24 + 24 + + + + + + + + false + + + + 120 + 32 + + + + + 16777215 + 32 + + + + ArrowCursor + + + Clear all + + + :/images/clear_ico.png:/images/clear_ico.png diff --git a/src/MEGASync/gui/win/TransferManager.ui b/src/MEGASync/gui/win/TransferManager.ui index 5980105636..c693ec05fc 100644 --- a/src/MEGASync/gui/win/TransferManager.ui +++ b/src/MEGASync/gui/win/TransferManager.ui @@ -795,7 +795,42 @@ border-top: 1px solid rgba(0, 0, 0, 10%); Clear all - + + :/images/clear_ico.png:/images/clear_ico.png + + + + 24 + 24 + + + + + + + + false + + + + 120 + 32 + + + + + 16777215 + 32 + + + + PointingHandCursor + + + Clear all + + + :/images/clear_ico.png:/images/clear_ico.png From 6aa27ca619d39ef5f60f892478e3f5932ca711d5 Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 21:31:19 +1100 Subject: [PATCH 09/10] chore(TransferManager.ui): add bRetryAll selector to button style queries --- src/MEGASync/gui/linux/TransferManager.ui | 10 +++++----- src/MEGASync/gui/macx/TransferManager.ui | 10 +++++----- src/MEGASync/gui/win/TransferManager.ui | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/MEGASync/gui/linux/TransferManager.ui b/src/MEGASync/gui/linux/TransferManager.ui index 77e8a00aee..94866d01b0 100644 --- a/src/MEGASync/gui/linux/TransferManager.ui +++ b/src/MEGASync/gui/linux/TransferManager.ui @@ -77,7 +77,7 @@ border: none; } -#bClearAll:disabled, #bPause:disabled, #bAdd:disabled +#bClearAll:disabled, #bPause:disabled, #bAdd:disabled, bRetryAll:disabled { color: rgba(119, 119, 119, 30%); } @@ -100,7 +100,7 @@ } -#bAdd:hover, #bPause::hover, #bClearAll::hover +#bAdd:hover, #bPause::hover, #bClearAll::hover, bRetryAll:hover { border: 1px solid rgba(0, 0, 0, 20%); border-radius: 3px; @@ -109,7 +109,7 @@ } -#bAdd:pressed, #bPause::pressed, #bClearAll::pressed +#bAdd:pressed, #bPause::pressed, #bClearAll::pressed, bRetryAll:pressed { background-color: rgba(0, 0, 0, 10%); border: 1px solid rgba(0, 0, 0, 20%); @@ -129,7 +129,7 @@ font-style: normal; color: #ffffff; } -#bClose::hover +#bClose::hover, bRetryAll::hover { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; @@ -137,7 +137,7 @@ stop: 0 #999999, stop: 1 #aaaaaa); } -#bClose::pressed +#bClose::pressed, bRetryAll::pressed { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; diff --git a/src/MEGASync/gui/macx/TransferManager.ui b/src/MEGASync/gui/macx/TransferManager.ui index bbf90e0c17..edc99b2de6 100644 --- a/src/MEGASync/gui/macx/TransferManager.ui +++ b/src/MEGASync/gui/macx/TransferManager.ui @@ -66,7 +66,7 @@ border: none; } -#bClearAll:disabled, #bPause:disabled, #bAdd:disabled +#bClearAll:disabled, #bPause:disabled, #bAdd:disabled, bRetryAll:disabled { color: rgba(119, 119, 119, 30%); } @@ -89,7 +89,7 @@ } -#bAdd:hover, #bPause::hover, #bClearAll::hover +#bAdd:hover, #bPause::hover, #bClearAll::hover, bRetryAll:hover { border: 1px solid rgba(0, 0, 0, 20%); border-radius: 3px; @@ -98,7 +98,7 @@ } -#bAdd:pressed, #bPause::pressed, #bClearAll::pressed +#bAdd:pressed, #bPause::pressed, #bClearAll::pressed, bRetryAll:pressed { background-color: rgba(0, 0, 0, 10%); border: 1px solid rgba(0, 0, 0, 20%); @@ -118,7 +118,7 @@ font-style: normal; color: #ffffff; } -#bClose::hover +#bClose::hover, bRetryAll::hover { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; @@ -126,7 +126,7 @@ stop: 0 #999999, stop: 1 #aaaaaa); } -#bClose::pressed +#bClose::pressed, bRetryAll::pressed { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; diff --git a/src/MEGASync/gui/win/TransferManager.ui b/src/MEGASync/gui/win/TransferManager.ui index c693ec05fc..c28bad525a 100644 --- a/src/MEGASync/gui/win/TransferManager.ui +++ b/src/MEGASync/gui/win/TransferManager.ui @@ -76,7 +76,7 @@ border: none; } -#bClearAll:disabled, #bPause:disabled, #bAdd:disabled +#bClearAll:disabled, #bPause:disabled, #bAdd:disabled, bRetryAll:disabled { color: rgba(119, 119, 119, 30%); } @@ -99,7 +99,7 @@ } -#bAdd:hover, #bPause::hover, #bClearAll::hover +#bAdd:hover, #bPause::hover, #bClearAll::hover, bRetryAll:hover { border: 1px solid rgba(0, 0, 0, 20%); border-radius: 3px; @@ -108,7 +108,7 @@ } -#bAdd:pressed, #bPause::pressed, #bClearAll::pressed +#bAdd:pressed, #bPause::pressed, #bClearAll::pressed, bRetryAll:pressed { background-color: rgba(0, 0, 0, 10%); border: 1px solid rgba(0, 0, 0, 20%); @@ -128,7 +128,7 @@ font-style: normal; color: #ffffff; } -#bClose::hover +#bClose::hover, bRetryAll::hover { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; @@ -136,7 +136,7 @@ stop: 0 #999999, stop: 1 #aaaaaa); } -#bClose::pressed +#bClose::pressed, bRetryAll::pressed { border: 1px solid rgba(0, 0, 0, 60%); border-radius: 3px; From d49c8ada3a1d8c6afbdc2fedb3f61e20c734b57a Mon Sep 17 00:00:00 2001 From: Matthew Strasiotto Date: Fri, 16 Oct 2020 21:32:38 +1100 Subject: [PATCH 10/10] chore(TransferManager): disable bRetryAll for most tabs --- src/MEGASync/gui/TransferManager.cpp | 12 ++++++------ src/MEGASync/gui/TransferManager.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MEGASync/gui/TransferManager.cpp b/src/MEGASync/gui/TransferManager.cpp index fd0b0d834f..d285ea5019 100644 --- a/src/MEGASync/gui/TransferManager.cpp +++ b/src/MEGASync/gui/TransferManager.cpp @@ -469,21 +469,21 @@ void TransferManager::updateState() QWidget *w = ui->wTransfers->currentWidget(); if (w == ui->wActiveTransfers) { - onTransfersActive(ui->wActiveTransfers->areTransfersActive()); + onTransfersActive(ui->wActiveTransfers->areTransfersActive(), false); } else if (w == ui->wDownloads) { - onTransfersActive(ui->wDownloads->areTransfersActive()); + onTransfersActive(ui->wDownloads->areTransfersActive(), false); ui->wDownloads->pausedTransfers(preferences->getDownloadsPaused()); } else if (w == ui->wUploads) { - onTransfersActive(ui->wUploads->areTransfersActive()); + onTransfersActive(ui->wUploads->areTransfersActive(), false); ui->wUploads->pausedTransfers(preferences->getUploadsPaused()); } else if (w == ui->wCompleted) { - onTransfersActive(ui->wCompleted->areTransfersActive()); + onTransfersActive(ui->wCompleted->areTransfersActive(), true); } } @@ -556,9 +556,9 @@ void TransferManager::refreshFinishedTime() } } -void TransferManager::onTransfersActive(bool exists) +void TransferManager::onTransfersActive(bool clearExists, bool retryExists) { - ui->bClearAll->setEnabled(exists); + ui->bClearAll->setEnabled(clearExists); } void TransferManager::updateNumberOfCompletedTransfers(int num) diff --git a/src/MEGASync/gui/TransferManager.h b/src/MEGASync/gui/TransferManager.h index 3326ff279e..04995507d2 100644 --- a/src/MEGASync/gui/TransferManager.h +++ b/src/MEGASync/gui/TransferManager.h @@ -59,7 +59,7 @@ class TransferManager : public QDialog, public mega::MegaTransferListener QTimer *refreshTransferTime; void createAddMenu(); - void onTransfersActive(bool exists); + void onTransfersActive(bool clearExists, bool retryExists); public slots: void updateState();