From 81ca791b242063840c70c822816e355332f004f7 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 25 Aug 2014 17:27:09 +0200 Subject: [PATCH] Fixed bug #44. --- resources/text/UPDATES | 13 +++++++------ src/gui/formupdate.cpp | 10 ++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/resources/text/UPDATES b/resources/text/UPDATES index 9e66ccc85..513b8c317 100644 --- a/resources/text/UPDATES +++ b/resources/text/UPDATES @@ -2,20 +2,21 @@ https://bitbucket.org/skunkos/rssguard/downloads/rssguard-2.0.0.0-win32-test.exe - https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.9-os2.7z Fixed:
    -
  • Various GUI and bug fixes.
    • +
  • Improved behavior of updater.
Added:
    -
  • Application is now able to self-update itself on OS/2 and Windows. Currently, this is EXPERIMENTAL support. Please, report any bugs. Authors take no responsibility for removed files or lost application settings.
    • -
  • Added option to adjust icons/buttons displayed in toolbars. See Settings/User interface/Toolbars dialog for more information.
    • -
  • Added option to search messages via regular expression.
    • -
  • Added option to highlight particular messages - unread, important, none.
    • +
  • Added NSIS-based "portable" installer for Windows and restructured update process.
    • +
+ +Changed: +
    +
  • Updated bundled OpenSSL libraries for Windows portable version.
]]> diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index 5b1efa84f..0db902fbe 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -47,7 +47,9 @@ FormUpdate::FormUpdate(QWidget *parent) m_btnUpdate = m_ui->m_buttonBox->addButton(tr("Update"), QDialogButtonBox::ActionRole); m_btnUpdate->setToolTip(tr("Download new installation files.")); +#if defined(Q_OS_WIN) connect(m_btnUpdate, SIGNAL(clicked()), this, SLOT(startUpdate())); +#endif #if !defined(Q_OS_WIN) MessageBox::iconify(m_ui->m_buttonBox); @@ -233,17 +235,13 @@ void FormUpdate::startUpdate() { // Initialie downloader. m_downloader = new Downloader(this); - connect(m_downloader, SIGNAL(progress(qint64,qint64)), - this, SLOT(updateProgress(qint64,qint64))); - connect(m_downloader, SIGNAL(completed(QNetworkReply::NetworkError,QByteArray)), - this, SLOT(updateCompleted(QNetworkReply::NetworkError,QByteArray))); + connect(m_downloader, SIGNAL(progress(qint64,qint64)), this, SLOT(updateProgress(qint64,qint64))); + connect(m_downloader, SIGNAL(completed(QNetworkReply::NetworkError,QByteArray)), this, SLOT(updateCompleted(QNetworkReply::NetworkError,QByteArray))); } m_btnUpdate->setText(tr("Downloading update...")); m_btnUpdate->setEnabled(false); - m_downloader->downloadFile(url_file); - } else { // Self-update and package are not available.