From c90c55d4803faef1d4d26326f6c35cd037dd3c21 Mon Sep 17 00:00:00 2001
From: John Tapsell <johnflux@gmail.com>
Date: Tue, 8 Oct 2013 22:42:52 +0100
Subject: [PATCH] CommConfigurationWindow - make it a proper QDialog, and not a
floating widget
---
src/ui/CommConfigurationWindow.cc | 2 +-
src/ui/CommConfigurationWindow.h | 4 ++--
src/ui/MainWindow.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index 099c28f..223abd9 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -55,7 +55,7 @@ This file is part of the QGROUNDCONTROL project
#include "LinkManager.h"
#include "MainWindow.h"
-CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolInterface* protocol, QWidget *parent) : QWidget(parent)
+CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolInterface* protocol, QWidget *parent) : QDialog(parent)
{
this->link = link;
diff --git a/src/ui/CommConfigurationWindow.h b/src/ui/CommConfigurationWindow.h
index 4333e5a..65912b0 100644
--- a/src/ui/CommConfigurationWindow.h
+++ b/src/ui/CommConfigurationWindow.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
#define _COMMCONFIGURATIONWINDOW_H_
#include <QObject>
-#include <QWidget>
+#include <QDialog>
#include <QAction>
#include "LinkInterface.h"
#include "ProtocolInterface.h"
@@ -62,7 +62,7 @@ enum qgc_protocol_t {
/**
* @brief Configuration window for communication links
*/
-class CommConfigurationWindow : public QWidget
+class CommConfigurationWindow : public QDialog
{
Q_OBJECT
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 354c73b..2a5450c 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1683,7 +1683,7 @@ void MainWindow::addLink(LinkInterface *link)
if (!found)
{
- CommConfigurationWindow* commWidget = new CommConfigurationWindow(link, mavlink, NULL);
+ CommConfigurationWindow* commWidget = new CommConfigurationWindow(link, mavlink, this);
commsWidgetList.append(commWidget);
connect(commWidget,SIGNAL(destroyed(QObject*)),this,SLOT(commsWidgetDestroyed(QObject*)));
QAction* action = commWidget->getAction();