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
3bc487d2
Commit
3bc487d2
authored
Oct 26, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2121 from tcanabrava/smallFixes
Small fixes
parents
9c26a249
bf8b966b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
13 deletions
+9
-13
MainWindow.cc
src/ui/MainWindow.cc
+5
-12
SettingsDialog.cc
src/ui/SettingsDialog.cc
+4
-1
No files found.
src/ui/MainWindow.cc
View file @
3bc487d2
...
...
@@ -238,16 +238,8 @@ MainWindow::MainWindow()
}
// Make sure the proper fullscreen/normal menu item is checked properly.
if
(
isFullScreen
())
{
_ui
.
actionFullscreen
->
setChecked
(
true
);
_ui
.
actionNormal
->
setChecked
(
false
);
}
else
{
_ui
.
actionFullscreen
->
setChecked
(
false
);
_ui
.
actionNormal
->
setChecked
(
true
);
}
_ui
.
actionFullscreen
->
setChecked
(
isFullScreen
());
_ui
.
actionNormal
->
setChecked
(
!
isFullScreen
());
// And that they will stay checked properly after user input
connect
(
_ui
.
actionFullscreen
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
fullScreenActionItemCallback
);
...
...
@@ -397,6 +389,7 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
widget
=
pInfoView
;
}
else
{
qWarning
()
<<
"Attempt to create unknown Inner Dock Widget"
<<
widgetName
;
return
;
}
_mapName2DockWidget
[
widgetName
]
=
widget
;
...
...
@@ -651,7 +644,7 @@ void MainWindow::_loadVisibleWidgetsSettings(void)
if
(
!
widgets
.
isEmpty
())
{
QStringList
nameList
=
widgets
.
split
(
","
);
foreach
(
QString
name
,
nameList
)
{
foreach
(
const
QString
&
name
,
nameList
)
{
_showDockWidget
(
name
,
true
);
}
}
...
...
@@ -662,7 +655,7 @@ void MainWindow::_storeVisibleWidgetsSettings(void)
QString
widgetNames
;
bool
firstWidget
=
true
;
foreach
(
QString
name
,
_mapName2DockWidget
.
keys
())
{
foreach
(
const
QString
&
name
,
_mapName2DockWidget
.
keys
())
{
if
(
_mapName2DockWidget
[
name
]
->
isVisible
())
{
if
(
!
firstWidget
)
{
widgetNames
+=
","
;
...
...
src/ui/SettingsDialog.cc
View file @
3bc487d2
...
...
@@ -47,8 +47,11 @@ _ui(new Ui::SettingsDialog)
_ui
->
setupUi
(
this
);
// Center the window on the screen.
QDesktopWidget
*
desktop
=
QApplication
::
desktop
();
int
screen
=
desktop
->
screenNumber
(
parent
);
QRect
position
=
frameGeometry
();
position
.
moveCenter
(
QApplication
::
desktop
()
->
availableGeometry
().
center
());
position
.
moveCenter
(
QApplication
::
desktop
()
->
availableGeometry
(
screen
).
center
());
move
(
position
.
topLeft
());
QGCLinkConfiguration
*
pLinkConf
=
new
QGCLinkConfiguration
(
this
);
...
...
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