Skip to content

Q
qgroundcontrol
Commit 42386f6f authored by Mariano Lizarraga's avatar Mariano Lizarraga
Browse files
Options

Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

parents e1270632 0f22afcf
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 14 deletions
mavground.qrc
View file @ 42386f6f
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
<file>images/splash.png</file> <file>images/splash.png</file>
<file>audio/alert.wav</file> <file>audio/alert.wav</file>
<file>demo-log.txt</file> <file>demo-log.txt</file>
<file>images/mapproviders/openstreetmap.png</file>
<file>images/mapproviders/google.png</file>
<file>images/mapproviders/yahoo.png</file>
</qresource> </qresource>
<qresource prefix="/general"> <qresource prefix="/general">
<file alias="vera.ttf">images/Vera.ttf</file> <file alias="vera.ttf">images/Vera.ttf</file>
......
src/ui/MapWidget.cc
View file @ 42386f6f
...@@ -92,11 +92,11 @@ MapWidget::MapWidget(QWidget *parent) : ...@@ -92,11 +92,11 @@ MapWidget::MapWidget(QWidget *parent) :
// Add controls to select map provider // Add controls to select map provider
///////////////////////////////////////////////// /////////////////////////////////////////////////
QActionGroup* mapproviderGroup = new QActionGroup(this); QActionGroup* mapproviderGroup = new QActionGroup(this);
osmAction = new QAction(tr("OpenStreetMap"), mapproviderGroup); osmAction = new QAction(QIcon(":/images/mapproviders/openstreetmap.png"), tr("OpenStreetMap"), mapproviderGroup);
yahooActionMap = new QAction(tr("Yahoo: Map"), mapproviderGroup); yahooActionMap = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Map"), mapproviderGroup);
yahooActionSatellite = new QAction(tr("Yahoo: Satellite"), mapproviderGroup); yahooActionSatellite = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Satellite"), mapproviderGroup);
googleActionMap = new QAction(tr("Google: Map"), mapproviderGroup); googleActionMap = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Map"), mapproviderGroup);
googleSatAction = new QAction(tr("Google: Sat"), mapproviderGroup); googleSatAction = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Sat"), mapproviderGroup);
osmAction->setCheckable(true); osmAction->setCheckable(true);
yahooActionMap->setCheckable(true); yahooActionMap->setCheckable(true);
yahooActionSatellite->setCheckable(true); yahooActionSatellite->setCheckable(true);
...@@ -222,9 +222,9 @@ void MapWidget::mapproviderSelected(QAction* action) ...@@ -222,9 +222,9 @@ void MapWidget::mapproviderSelected(QAction* action)
mc->updateRequestNew(); mc->updateRequestNew();
mc->setZoom(zoom); mc->setZoom(zoom);
yahooActionOverlay->setEnabled(false); // yahooActionOverlay->setEnabled(false);
overlay->setVisible(false); overlay->setVisible(false);
yahooActionOverlay->setChecked(false); // yahooActionOverlay->setChecked(false);
} }
else if (action == yahooActionMap) else if (action == yahooActionMap)
...@@ -238,9 +238,9 @@ void MapWidget::mapproviderSelected(QAction* action) ...@@ -238,9 +238,9 @@ void MapWidget::mapproviderSelected(QAction* action)
mc->updateRequestNew(); mc->updateRequestNew();
mc->setZoom(zoom); mc->setZoom(zoom);
yahooActionOverlay->setEnabled(false); // yahooActionOverlay->setEnabled(false);
overlay->setVisible(false); overlay->setVisible(false);
yahooActionOverlay->setChecked(false); // yahooActionOverlay->setChecked(false);
} }
else if (action == yahooActionSatellite) else if (action == yahooActionSatellite)
{ {
...@@ -253,7 +253,7 @@ void MapWidget::mapproviderSelected(QAction* action) ...@@ -253,7 +253,7 @@ void MapWidget::mapproviderSelected(QAction* action)
mc->updateRequestNew(); mc->updateRequestNew();
mc->setZoom(zoom); mc->setZoom(zoom);
yahooActionOverlay->setEnabled(true); // yahooActionOverlay->setEnabled(true);
} }
else if (action == googleActionMap) else if (action == googleActionMap)
{ {
...@@ -265,9 +265,9 @@ void MapWidget::mapproviderSelected(QAction* action) ...@@ -265,9 +265,9 @@ void MapWidget::mapproviderSelected(QAction* action)
mc->updateRequestNew(); mc->updateRequestNew();
mc->setZoom(zoom); mc->setZoom(zoom);
yahooActionOverlay->setEnabled(false); // yahooActionOverlay->setEnabled(false);
overlay->setVisible(false); overlay->setVisible(false);
yahooActionOverlay->setChecked(false); // yahooActionOverlay->setChecked(false);
} }
else if (action == googleSatAction) else if (action == googleSatAction)
{ {
...@@ -279,9 +279,9 @@ void MapWidget::mapproviderSelected(QAction* action) ...@@ -279,9 +279,9 @@ void MapWidget::mapproviderSelected(QAction* action)
mc->updateRequestNew(); mc->updateRequestNew();
mc->setZoom(zoom); mc->setZoom(zoom);
yahooActionOverlay->setEnabled(false); // yahooActionOverlay->setEnabled(false);
overlay->setVisible(false); overlay->setVisible(false);
yahooActionOverlay->setChecked(false); // yahooActionOverlay->setChecked(false);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment