Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
841cfa64
Commit
841cfa64
authored
Feb 26, 2011
by
lm
Browse files
Slight persistence adaptions. Now improving UI before taking video
parent
e9035f5b
Changes
5
Hide whitespace changes
Inline
Side-by-side
images/style-mission.css
View file @
841cfa64
...
...
@@ -86,6 +86,13 @@ border: 1px solid #777777;
QMainWindow
::separator:hover
{
background
:
white
;
}
QGCToolWidgetItem
{
border
:
1px
solid
#66666B
;
border-radius
:
3px
;
padding
:
10px
0px
0px
0px
;
margin-top
:
1ex
;
/* leave space at the top for the title */
}
QDockWidget
{
border
:
1px
solid
#32345E
;
...
...
qgroundcontrol.pro
View file @
841cfa64
...
...
@@ -153,6 +153,7 @@ FORMS += src/ui/MainWindow.ui \
src
/
ui
/
designer
/
QGCToolWidget
.
ui
\
src
/
ui
/
designer
/
QGCParamSlider
.
ui
\
src
/
ui
/
designer
/
QGCActionButton
.
ui
\
src
/
ui
/
designer
/
QGCCommandButton
.
ui
\
src
/
ui
/
QGCMAVLinkLogPlayer
.
ui
\
src
/
ui
/
QGCWaypointListMulti
.
ui
\
src
/
ui
/
mission
/
QGCCustomWaypointAction
.
ui
\
...
...
@@ -264,6 +265,7 @@ HEADERS += src/MG.h \
src
/
ui
/
designer
/
QGCToolWidget
.
h
\
src
/
ui
/
designer
/
QGCParamSlider
.
h
\
src
/
ui
/
designer
/
QGCActionButton
.
h
\
src
/
ui
/
designer
/
QGCCommandButton
.
h
\
src
/
ui
/
designer
/
QGCToolWidgetItem
.
h
\
src
/
ui
/
QGCMAVLinkLogPlayer
.
h
\
src
/
comm
/
MAVLinkSimulationWaypointPlanner
.
h
\
...
...
@@ -394,6 +396,7 @@ SOURCES += src/main.cc \
src
/
ui
/
designer
/
QGCToolWidget
.
cc
\
src
/
ui
/
designer
/
QGCParamSlider
.
cc
\
src
/
ui
/
designer
/
QGCActionButton
.
cc
\
src
/
ui
/
designer
/
QGCCommandButton
.
cc
\
src
/
ui
/
designer
/
QGCToolWidgetItem
.
cc
\
src
/
ui
/
QGCMAVLinkLogPlayer
.
cc
\
src
/
comm
/
MAVLinkSimulationWaypointPlanner
.
cc
\
...
...
src/uas/UAS.cc
View file @
841cfa64
...
...
@@ -1059,7 +1059,6 @@ void UAS::setHomePosition(double lat, double lon, double alt)
void
UAS
::
setLocalOriginAtCurrentGPSPosition
()
{
bool
result
=
false
;
QMessageBox
msgBox
;
msgBox
.
setIcon
(
QMessageBox
::
Warning
);
...
...
src/ui/MainWindow.cc
View file @
841cfa64
...
...
@@ -307,9 +307,11 @@ void MainWindow::buildCustomWidget()
if
(
!
dock
)
{
QDockWidget
*
dock
=
new
QDockWidget
(
widgets
.
at
(
i
)
->
windowTitle
(),
this
);
dock
->
setObjectName
(
widgets
.
at
(
i
)
->
objectName
()
+
"_DOCK"
);
dock
->
setWidget
(
widgets
.
at
(
i
));
connect
(
widgets
.
at
(
i
),
SIGNAL
(
destroyed
()),
dock
,
SLOT
(
deleteLater
()));
QAction
*
showAction
=
new
QAction
(
widgets
.
at
(
i
)
->
windowTitle
(),
this
);
showAction
->
setCheckable
(
true
);
connect
(
showAction
,
SIGNAL
(
triggered
(
bool
)),
dock
,
SLOT
(
setVisible
(
bool
)));
connect
(
dock
,
SIGNAL
(
visibilityChanged
(
bool
)),
showAction
,
SLOT
(
setChecked
(
bool
)));
widgets
.
at
(
i
)
->
setMainMenuAction
(
showAction
);
...
...
@@ -1045,6 +1047,7 @@ void MainWindow::createCustomWidget()
connect
(
tool
,
SIGNAL
(
destroyed
()),
dock
,
SLOT
(
deleteLater
()));
dock
->
setWidget
(
tool
);
QAction
*
showAction
=
new
QAction
(
"Show Unnamed Tool"
,
this
);
showAction
->
setCheckable
(
true
);
connect
(
dock
,
SIGNAL
(
visibilityChanged
(
bool
)),
showAction
,
SLOT
(
setChecked
(
bool
)));
connect
(
showAction
,
SIGNAL
(
triggered
(
bool
)),
dock
,
SLOT
(
setVisible
(
bool
)));
tool
->
setMainMenuAction
(
showAction
);
...
...
src/ui/WaypointView.cc
View file @
841cfa64
...
...
@@ -203,7 +203,7 @@ void WaypointView::updateActionView(int action)
m_ui
->
orbitSpinBox
->
show
();
m_ui
->
holdTimeSpinBox
->
show
();
break
;
case
MAV_CMD_NAV_TARGET
:
case
MAV_CMD_NAV_
ORIENTATION_
TARGET
:
m_ui
->
orbitSpinBox
->
hide
();
m_ui
->
takeOffAngleSpinBox
->
hide
();
m_ui
->
turnsSpinBox
->
hide
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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