Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c90c55d4
Commit
c90c55d4
authored
Oct 08, 2013
by
John Tapsell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CommConfigurationWindow - make it a proper QDialog, and not a floating widget
parent
13e5381d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
CommConfigurationWindow.cc
src/ui/CommConfigurationWindow.cc
+1
-1
CommConfigurationWindow.h
src/ui/CommConfigurationWindow.h
+2
-2
MainWindow.cc
src/ui/MainWindow.cc
+1
-1
No files found.
src/ui/CommConfigurationWindow.cc
View file @
c90c55d4
...
...
@@ -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
)
:
Q
Widget
(
parent
)
CommConfigurationWindow
::
CommConfigurationWindow
(
LinkInterface
*
link
,
ProtocolInterface
*
protocol
,
QWidget
*
parent
)
:
Q
Dialog
(
parent
)
{
this
->
link
=
link
;
...
...
src/ui/CommConfigurationWindow.h
View file @
c90c55d4
...
...
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
#define _COMMCONFIGURATIONWINDOW_H_
#include <QObject>
#include <Q
Widget
>
#include <Q
Dialog
>
#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
Q
Widget
class
CommConfigurationWindow
:
public
Q
Dialog
{
Q_OBJECT
...
...
src/ui/MainWindow.cc
View file @
c90c55d4
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment