summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/themesinstallwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'utils/rbutilqt/themesinstallwindow.cpp')
-rw-r--r--utils/rbutilqt/themesinstallwindow.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp
index 129df8a980..e6043de892 100644
--- a/utils/rbutilqt/themesinstallwindow.cpp
+++ b/utils/rbutilqt/themesinstallwindow.cpp
@@ -44,7 +44,7 @@ ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent)
44 ui.themeDescription->setLayoutDirection(Qt::LeftToRight); 44 ui.themeDescription->setLayoutDirection(Qt::LeftToRight);
45 45
46 connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); 46 connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close);
47 connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); 47 connect(ui.buttonOk, &QAbstractButton::clicked, this, &ThemesInstallWindow::accept);
48 connect(ui.listThemes, &QListWidget::currentItemChanged, 48 connect(ui.listThemes, &QListWidget::currentItemChanged,
49 this, &ThemesInstallWindow::updateDetails); 49 this, &ThemesInstallWindow::updateDetails);
50 connect(ui.listThemes, &QListWidget::itemSelectionChanged, this, &ThemesInstallWindow::updateSize); 50 connect(ui.listThemes, &QListWidget::itemSelectionChanged, this, &ThemesInstallWindow::updateSize);
@@ -94,19 +94,12 @@ void ThemesInstallWindow::downloadInfo()
94 LOG_INFO() << "Info URL:" << url; 94 LOG_INFO() << "Info URL:" << url;
95 getter->setFile(&themesInfo); 95 getter->setFile(&themesInfo);
96 96
97 connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); 97 connect(getter, &HttpGet::done, this, &ThemesInstallWindow::downloadDone);
98 connect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort); 98 connect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort);
99 getter->getFile(url); 99 getter->getFile(url);
100} 100}
101 101
102 102
103void ThemesInstallWindow::downloadDone(int id, bool error)
104{
105 downloadDone(error);
106 LOG_INFO() << "Download" << id << "done, error:" << error;
107}
108
109
110void ThemesInstallWindow::downloadDone(bool error) 103void ThemesInstallWindow::downloadDone(bool error)
111{ 104{
112 LOG_INFO() << "Download done, error:" << error; 105 LOG_INFO() << "Download done, error:" << error;
@@ -129,7 +122,7 @@ void ThemesInstallWindow::downloadDone(bool error)
129 .arg(getter->errorString()), LOGERROR); 122 .arg(getter->errorString()), LOGERROR);
130 getter->abort(); 123 getter->abort();
131 logger->setFinished(); 124 logger->setFinished();
132 disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); 125 disconnect(getter, &HttpGet::done, this, &ThemesInstallWindow::downloadDone);
133 connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); 126 connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close);
134 return; 127 return;
135 } 128 }
@@ -376,7 +369,7 @@ void ThemesInstallWindow::install()
376 } 369 }
377 connect(installer, &ZipInstaller::logItem, logger, &ProgressLoggerGui::addItem); 370 connect(installer, &ZipInstaller::logItem, logger, &ProgressLoggerGui::addItem);
378 connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress); 371 connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress);
379 connect(installer, SIGNAL(done(bool)), this, SIGNAL(done(bool))); 372 connect(installer, &ZipInstaller::done, this, &ThemesInstallWindow::done);
380 connect(logger, &ProgressLoggerGui::aborted, installer, &ZipInstaller::abort); 373 connect(logger, &ProgressLoggerGui::aborted, installer, &ZipInstaller::abort);
381 installer->install(); 374 installer->install();
382} 375}