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
549000eb
Commit
549000eb
authored
Dec 05, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove QGCMessageBox usage
parent
e3134f6a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
21 deletions
+7
-21
RadioComponentController.cc
src/AutoPilotPlugins/Common/RadioComponentController.cc
+1
-1
ParameterLoader.cc
src/FactSystem/ParameterLoader.cc
+2
-11
QGCApplication.cc
src/QGCApplication.cc
+3
-8
QGCQuickWidget.cc
src/QGCQuickWidget.cc
+1
-1
No files found.
src/AutoPilotPlugins/Common/RadioComponentController.cc
View file @
549000eb
...
...
@@ -26,8 +26,8 @@
/// @author Don Gagne <don@thegagnes.com
#include "RadioComponentController.h"
#include "QGCMessageBox.h"
#include "AutoPilotPluginManager.h"
#include "QGCApplication.h"
#include <QSettings>
...
...
src/FactSystem/ParameterLoader.cc
View file @
549000eb
...
...
@@ -657,7 +657,6 @@ void ParameterLoader::_saveToEEPROM(void)
QString
ParameterLoader
::
readParametersFromStream
(
QTextStream
&
stream
)
{
QString
errors
;
bool
userWarned
=
false
;
while
(
!
stream
.
atEnd
())
{
QString
line
=
stream
.
readLine
();
...
...
@@ -665,16 +664,8 @@ QString ParameterLoader::readParametersFromStream(QTextStream& stream)
QStringList
wpParams
=
line
.
split
(
"
\t
"
);
int
lineMavId
=
wpParams
.
at
(
0
).
toInt
();
if
(
wpParams
.
size
()
==
5
)
{
if
(
!
userWarned
&&
(
_vehicle
->
id
()
!=
lineMavId
))
{
userWarned
=
true
;
QString
msg
(
"The parameters in the stream have been saved from System Id %1, but the current vehicle has the System Id %2."
);
QGCMessageBox
::
StandardButton
button
=
QGCMessageBox
::
warning
(
"Parameter Load"
,
msg
.
arg
(
lineMavId
).
arg
(
_vehicle
->
id
()),
QGCMessageBox
::
Ok
|
QGCMessageBox
::
Cancel
,
QGCMessageBox
::
Cancel
);
if
(
button
==
QGCMessageBox
::
Cancel
)
{
return
QString
();
}
if
(
_vehicle
->
id
()
!=
lineMavId
)
{
return
QString
(
"The parameters in the stream have been saved from System Id %1, but the current vehicle has the System Id %2."
).
arg
(
lineMavId
).
arg
(
_vehicle
->
id
());
}
int
componentId
=
wpParams
.
at
(
1
).
toInt
();
...
...
src/QGCApplication.cc
View file @
549000eb
...
...
@@ -455,9 +455,7 @@ bool QGCApplication::_initForNormalAppBoot(void)
/// settings.
QString
savedFilesLocation
=
settings
.
value
(
_savedFilesLocationKey
).
toString
();
if
(
savedFilesLocation
.
isEmpty
())
{
QGCMessageBox
::
warning
(
tr
(
"Bad save location"
),
tr
(
"The location to save files to is invalid, or cannot be written to. Please provide a new one."
));
showMessage
(
"The location to save files to is invalid, or cannot be written to. Please provide a new one."
);
mainWindow
->
showSettings
();
}
...
...
@@ -705,10 +703,7 @@ void QGCApplication::_missingParamsDisplay(void)
}
_missingParams
.
clear
();
QGCMessageBox
::
critical
(
"Missing Parameters"
,
QString
(
"Parameters missing from firmware: %1.
\n\n
"
"You should quit QGroundControl immediately and update your firmware."
).
arg
(
params
));
showMessage
(
QString
(
"Parameters missing from firmware: %1.
\n\n
You should quit QGroundControl immediately and update your firmware."
).
arg
(
params
));
}
void
QGCApplication
::
showMessage
(
const
QString
&
message
)
...
...
@@ -717,6 +712,6 @@ void QGCApplication::showMessage(const QString& message)
if
(
mainWindow
)
{
mainWindow
->
showToolbarMessage
(
message
);
}
else
{
QGCMessageBox
::
information
(
""
,
message
)
;
qWarning
()
<<
"showMessage with no mainWindow"
<<
message
;
}
}
src/QGCQuickWidget.cc
View file @
549000eb
...
...
@@ -60,7 +60,7 @@ bool QGCQuickWidget::setSource(const QUrl& qmlUrl)
errorList
+=
error
.
toString
();
errorList
+=
"
\n
"
;
}
QGCMessageBox
::
warning
(
tr
(
"Qml Error"
),
tr
(
"Source not ready: Status(%1)
\n
Errors:
\n
%2"
).
arg
(
status
()).
arg
(
errorList
));
qgcApp
()
->
showMessage
(
QString
(
"Source not ready: Status(%1)
\n
Errors:
\n
%2"
).
arg
(
status
()).
arg
(
errorList
));
return
false
;
}
...
...
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