forked from qt-creator/qt-creator
Fixes: - Make about dialog a non-modal dialog
This commit is contained in:
@@ -127,6 +127,7 @@ MainWindow::MainWindow() :
|
|||||||
m_mimeDatabase(new MimeDatabase),
|
m_mimeDatabase(new MimeDatabase),
|
||||||
m_navigationWidget(0),
|
m_navigationWidget(0),
|
||||||
m_rightPaneWidget(0),
|
m_rightPaneWidget(0),
|
||||||
|
m_versionDialog(0),
|
||||||
m_activeContext(0),
|
m_activeContext(0),
|
||||||
m_pluginManager(0),
|
m_pluginManager(0),
|
||||||
m_outputPane(new OutputPane(m_globalContext)),
|
m_outputPane(new OutputPane(m_globalContext)),
|
||||||
@@ -1085,8 +1086,20 @@ void MainWindow::openRecentFile()
|
|||||||
|
|
||||||
void MainWindow::aboutQtCreator()
|
void MainWindow::aboutQtCreator()
|
||||||
{
|
{
|
||||||
VersionDialog versionDialog(this);
|
if (!m_versionDialog) {
|
||||||
versionDialog.exec();
|
m_versionDialog = new VersionDialog(this);
|
||||||
|
connect(m_versionDialog, SIGNAL(finished(int)),
|
||||||
|
this, SLOT(destroyVersionDialog()));
|
||||||
|
}
|
||||||
|
m_versionDialog->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::destroyVersionDialog()
|
||||||
|
{
|
||||||
|
if (m_versionDialog) {
|
||||||
|
m_versionDialog->deleteLater();
|
||||||
|
m_versionDialog = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::aboutPlugins()
|
void MainWindow::aboutPlugins()
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ class OutputPane;
|
|||||||
class ProgressManager;
|
class ProgressManager;
|
||||||
class ShortcutSettings;
|
class ShortcutSettings;
|
||||||
class ViewManager;
|
class ViewManager;
|
||||||
|
class VersionDialog;
|
||||||
|
|
||||||
class CORE_EXPORT MainWindow : public QMainWindow
|
class CORE_EXPORT MainWindow : public QMainWindow
|
||||||
{
|
{
|
||||||
@@ -160,6 +161,7 @@ private slots:
|
|||||||
void aboutPlugins();
|
void aboutPlugins();
|
||||||
void updateFocusWidget(QWidget *old, QWidget *now);
|
void updateFocusWidget(QWidget *old, QWidget *now);
|
||||||
void toggleNavigation();
|
void toggleNavigation();
|
||||||
|
void destroyVersionDialog();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateContextObject(IContext *context);
|
void updateContextObject(IContext *context);
|
||||||
@@ -190,6 +192,7 @@ private:
|
|||||||
NavigationWidget *m_navigationWidget;
|
NavigationWidget *m_navigationWidget;
|
||||||
RightPaneWidget *m_rightPaneWidget;
|
RightPaneWidget *m_rightPaneWidget;
|
||||||
Core::BaseView *m_outputView;
|
Core::BaseView *m_outputView;
|
||||||
|
VersionDialog *m_versionDialog;
|
||||||
|
|
||||||
IContext * m_activeContext;
|
IContext * m_activeContext;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user