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

Use Core::Id for settings category in showWarningWithOptions

Browse Source 
Change-Id: Ie296816c271efabfb7a046c176bc33ebde6f6454
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-12-29 00:15:49 +01:00
parent af1cc6831c
commit 82f9de4af0
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/icore.cpp
View File

@@ -400,7 +400,7 @@ bool ICore::showOptionsDialog(const QString &group, const QString &page, QWidget
bool ICore::showWarningWithOptions(const QString &title, const QString &text,
const QString &details,
const QString &settingsCategory,
Id settingsCategory,
const QString &settingsId,
QWidget *parent)
{

3
src/plugins/coreplugin/icore.h
View File

@@ -31,6 +31,7 @@
#define ICORE_H
#include "core_global.h"
#include "id.h"
#include <QObject>
#include <QSettings>
@@ -87,7 +88,7 @@ public:
static bool showWarningWithOptions(const QString &title, const QString &text,
const QString &details = QString(),
const QString &settingsCategory = QString(),
Id settingsCategory = Id(),
const QString &settingsId = QString(),
QWidget *parent = 0);

6
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1348,7 +1348,7 @@ void MainWindow::setFullScreen(bool on)
bool MainWindow::showWarningWithOptions(const QString &title,
const QString &text,
const QString &details,
const QString &settingsCategory,
Id settingsCategory,
const QString &settingsId,
QWidget *parent)
{
@@ -1359,11 +1359,11 @@ bool MainWindow::showWarningWithOptions(const QString &title,
if (!details.isEmpty())
msgBox.setDetailedText(details);
QAbstractButton *settingsButton = 0;
if (!settingsId.isEmpty() || !settingsCategory.isEmpty())
if (!settingsId.isEmpty() || settingsCategory.isValid())
settingsButton = msgBox.addButton(tr("Settings..."), QMessageBox::AcceptRole);
msgBox.exec();
if (settingsButton && msgBox.clickedButton() == settingsButton) {
return showOptionsDialog(settingsCategory, settingsId);
return showOptionsDialog(settingsCategory.toString(), settingsId);
}
return false;
}

2
src/plugins/coreplugin/mainwindow.h
View File

@@ -144,7 +144,7 @@ public slots:
bool showWarningWithOptions(const QString &title, const QString &text,
const QString &details = QString(),
const QString &settingsCategory = QString(),
Id settingsCategory = Id(),
const QString &settingsId = QString(),
QWidget *parent = 0);