From efb453da0c3d1fbe27e64b412d032d47d8f2923e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 11 Mar 2010 14:28:47 +0100
Subject: [PATCH] Fixed reused message box to still update the text when
necessary
The Variables message box is used for both the external editor as well
as the file browser instructions.
Reviewed-by: Daniel Molkentin
---
src/plugins/coreplugin/generalsettings.cpp | 6 ++++--
src/plugins/coreplugin/generalsettings.h | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 8ccfe38e0d0..fbdd18d722c 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -37,7 +37,6 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
-#include <QtGui/QMessageBox>
#include <QtGui/QMainWindow>
#include <QtCore/QCoreApplication>
@@ -219,9 +218,12 @@ void GeneralSettings::resetFileBrowser()
#endif
-void GeneralSettings::variableHelpDialogCreator(const QString& helpText)
+void GeneralSettings::variableHelpDialogCreator(const QString &helpText)
{
if (m_dialog) {
+ if (m_dialog->text() != helpText)
+ m_dialog->setText(helpText);
+
m_dialog->show();
m_dialog->raise();
m_dialog->activateWindow();
diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index b35bd4efdda..47ef4d18acd 100644
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -32,7 +32,7 @@
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QtGui/QMessageBox>
namespace Core {
namespace Internal {
@@ -71,13 +71,13 @@ private slots:
#endif
private:
- void variableHelpDialogCreator(const QString& helpText);
+ void variableHelpDialogCreator(const QString &helpText);
void fillLanguageBox() const;
QString language() const;
void setLanguage(const QString&);
Ui::GeneralSettings *m_page;
QString m_searchKeywords;
- QPointer<QWidget> m_dialog;
+ QPointer<QMessageBox> m_dialog;
};
} // namespace Internal
--
GitLab