forked from qt-creator/qt-creator
Add AsynchronousMessageBox
QMessageBox::warning is executing it's own event loop which leads to crashes. Better is to use a message box which is using the main event loop. Change-Id: Ie05985dffcf505b25113755eece9b5e2256cd289 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
67
src/libs/utils/messagebox.cpp
Normal file
67
src/libs/utils/messagebox.cpp
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||||
|
** Contact: http://www.qt-project.org/legal
|
||||||
|
**
|
||||||
|
** This file is part of Qt Creator.
|
||||||
|
**
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Digia. For licensing terms and
|
||||||
|
** conditions see http://www.qt.io/licensing. For further information
|
||||||
|
** use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Digia gives you certain additional
|
||||||
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "messagebox.h"
|
||||||
|
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QApplication>
|
||||||
|
|
||||||
|
namespace Utils {
|
||||||
|
namespace AsynchronousMessageBox {
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
QWidget *dialogParent()
|
||||||
|
{
|
||||||
|
QWidget *active = QApplication::activeModalWidget();
|
||||||
|
|
||||||
|
if (!active) {
|
||||||
|
QList<QWidget*> topLevelWidgets = QApplication::topLevelWidgets();
|
||||||
|
if (!topLevelWidgets.isEmpty())
|
||||||
|
return topLevelWidgets.first();
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void warning(const QString &title, const QString &desciption)
|
||||||
|
{
|
||||||
|
QMessageBox *messageBox = new QMessageBox(QMessageBox::Warning,
|
||||||
|
title,
|
||||||
|
desciption,
|
||||||
|
QMessageBox::Ok,
|
||||||
|
dialogParent());
|
||||||
|
|
||||||
|
messageBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
messageBox->setModal(true);
|
||||||
|
messageBox->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
48
src/libs/utils/messagebox.h
Normal file
48
src/libs/utils/messagebox.h
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||||
|
** Contact: http://www.qt-project.org/legal
|
||||||
|
**
|
||||||
|
** This file is part of Qt Creator.
|
||||||
|
**
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Digia. For licensing terms and
|
||||||
|
** conditions see http://www.qt.io/licensing. For further information
|
||||||
|
** use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Digia gives you certain additional
|
||||||
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef MESSAGEBOX_H
|
||||||
|
#define MESSAGEBOX_H
|
||||||
|
|
||||||
|
#include "utils_global.h"
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
class QString;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
namespace Utils {
|
||||||
|
namespace AsynchronousMessageBox {
|
||||||
|
|
||||||
|
QTCREATOR_UTILS_EXPORT void warning(const QString &title, const QString &desciption);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // MESSAGEBOX_H
|
||||||
|
|
||||||
@@ -93,7 +93,8 @@ SOURCES += $$PWD/environment.cpp \
|
|||||||
$$PWD/treeviewcombobox.cpp \
|
$$PWD/treeviewcombobox.cpp \
|
||||||
$$PWD/proxycredentialsdialog.cpp \
|
$$PWD/proxycredentialsdialog.cpp \
|
||||||
$$PWD/macroexpander.cpp \
|
$$PWD/macroexpander.cpp \
|
||||||
$$PWD/theme/theme.cpp
|
$$PWD/theme/theme.cpp \
|
||||||
|
$$PWD/messagebox.cpp
|
||||||
|
|
||||||
win32:SOURCES += $$PWD/consoleprocess_win.cpp
|
win32:SOURCES += $$PWD/consoleprocess_win.cpp
|
||||||
else:SOURCES += $$PWD/consoleprocess_unix.cpp
|
else:SOURCES += $$PWD/consoleprocess_unix.cpp
|
||||||
@@ -192,7 +193,8 @@ HEADERS += \
|
|||||||
$$PWD/proxycredentialsdialog.h \
|
$$PWD/proxycredentialsdialog.h \
|
||||||
$$PWD/macroexpander.h \
|
$$PWD/macroexpander.h \
|
||||||
$$PWD/theme/theme.h \
|
$$PWD/theme/theme.h \
|
||||||
$$PWD/theme/theme_p.h
|
$$PWD/theme/theme_p.h \
|
||||||
|
$$PWD/ messagebox.h
|
||||||
|
|
||||||
FORMS += $$PWD/filewizardpage.ui \
|
FORMS += $$PWD/filewizardpage.ui \
|
||||||
$$PWD/projectintropage.ui \
|
$$PWD/projectintropage.ui \
|
||||||
|
|||||||
@@ -106,6 +106,8 @@ QtcLibrary {
|
|||||||
"listutils.h",
|
"listutils.h",
|
||||||
"macroexpander.cpp",
|
"macroexpander.cpp",
|
||||||
"macroexpander.h",
|
"macroexpander.h",
|
||||||
|
"messagebox.cpp",
|
||||||
|
"messagebox.h",
|
||||||
"multitask.h",
|
"multitask.h",
|
||||||
"navigationtreeview.cpp",
|
"navigationtreeview.cpp",
|
||||||
"navigationtreeview.h",
|
"navigationtreeview.h",
|
||||||
|
|||||||
Reference in New Issue
Block a user