feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use new global notification area for update information

Browse Source 
Instead of using a modal dialog box.

Fixes: QTCREATORBUG-22817
Change-Id: I129827b7f715b6e739ea09275bf43c64eb3d4e3f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2019-08-08 13:19:40 +02:00
parent c67ed4d35b
commit c77447d491
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -30,6 +30,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/settingsdatabase.h> #include <coreplugin/settingsdatabase.h>
#include <coreplugin/shellcommand.h> #include <coreplugin/shellcommand.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
@@ -40,7 +41,6 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QMenu> #include <QMenu>
#include <QMessageBox>
#include <QMetaEnum> #include <QMetaEnum>
#include <QPointer> #include <QPointer>
#include <QProcessEnvironment> #include <QProcessEnvironment>
@@ -55,6 +55,7 @@ namespace {
static const char LastCheckDateKey[] = "LastCheckDate"; static const char LastCheckDateKey[] = "LastCheckDate";
static const quint32 OneMinute = 60000; static const quint32 OneMinute = 60000;
static const quint32 OneHour = 3600000; static const quint32 OneHour = 3600000;
static const char InstallUpdates[] = "UpdateInfo.InstallUpdates";
} }
using namespace Core; using namespace Core;
@@ -168,11 +169,20 @@ void UpdateInfoPlugin::checkForUpdatesFinished()
stopCheckForUpdates(); stopCheckForUpdates();
if (!document.isNull() && document.firstChildElement().hasChildNodes()) { if (!document.isNull() && document.firstChildElement().hasChildNodes()) {
// progress details are shown until user interaction for the "no updates" case,
// so we can show the "No updates found" text, but if we have updates we don't
// want to keep it around
if (d->m_progress)
d->m_progress->setKeepOnFinish(FutureProgress::HideOnFinish);
emit newUpdatesAvailable(true); emit newUpdatesAvailable(true);
if (QMessageBox::question(ICore::dialogParent(), tr("Qt Updater"), Core::InfoBarEntry info(InstallUpdates,
tr("New updates are available. Do you want to start the update?")) tr("New updates are available. Do you want to start the update?"));
== QMessageBox::Yes) info.setCustomButtonInfo(tr("Start Update"), [this] {
Core::ICore::infoBar()->removeInfo(InstallUpdates);
startUpdater(); startUpdater();
});
Core::ICore::infoBar()->unsuppressInfo(InstallUpdates);
Core::ICore::infoBar()->addInfo(info);
} else { } else {
emit newUpdatesAvailable(false); emit newUpdatesAvailable(false);
if (d->m_progress) if (d->m_progress)