From 24835ca8ec55b7e91cdc9aa6f94b7f2cc3380798 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 19 Feb 2014 22:07:19 +0100 Subject: [PATCH] Work on updating... --- src/gui/formmain.cpp | 2 ++ src/gui/formupdate.cpp | 11 +++++++++++ src/gui/formupdate.h | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 75323379e..52a7dc865 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -411,6 +411,8 @@ void FormMain::showUpdates() { QPointer form_update = new FormUpdate(this); form_update.data()->exec(); delete form_update.data(); + + SystemFactory::instance()->applicationCloseLock()->unlock(); } void FormMain::showSettings() { diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index 0ac5ae06f..da7ff0d14 100644 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -24,6 +24,9 @@ FormUpdate::FormUpdate(QWidget *parent) MessageBox::iconify(m_ui->m_buttonBox); #endif + connect(m_ui->m_cmbAvailableRelease->comboBox(), SIGNAL(currentIndexChanged(int)), + this, SLOT(updateChanges(int))); + m_ui->m_lblCurrentRelease->setText(APP_VERSION); checkForUpdates(); @@ -33,6 +36,14 @@ FormUpdate::~FormUpdate() { delete m_ui; } +void FormUpdate::updateChanges(int new_release_index) { + if (new_release_index >= 0) { + UpdateInfo info = m_ui->m_cmbAvailableRelease->comboBox()->itemData(new_release_index).value(); + + m_ui->m_txtChanges->setText(info.m_changes); + } +} + void FormUpdate::checkForUpdates() { QByteArray releases_xml; QNetworkReply::NetworkError download_result = NetworkFactory::downloadFeedFile(RELEASES_LIST, diff --git a/src/gui/formupdate.h b/src/gui/formupdate.h index 904d427d6..87c3f2133 100644 --- a/src/gui/formupdate.h +++ b/src/gui/formupdate.h @@ -18,7 +18,8 @@ class FormUpdate : public QDialog { explicit FormUpdate(QWidget *parent = 0); virtual ~FormUpdate(); - protected: + protected slots: + void updateChanges(int new_release_index); void checkForUpdates(); private: