From 0f22afcf8ea637971cf331336fcf4034b4e4cecb Mon Sep 17 00:00:00 2001 From: pixhawk Date: Mon, 23 Aug 2010 21:34:51 +0200 Subject: [PATCH] Added icons for map providers, fixed a minor bug during map provider change --- images/mapproviders/google.png | Bin 0 -> 2137 bytes images/mapproviders/openstreetmap.png | Bin 0 -> 10344 bytes images/mapproviders/yahoo.png | Bin 0 -> 2318 bytes mavground.qrc | 3 +++ src/ui/MapWidget.cc | 28 +++++++++++++------------- 5 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 images/mapproviders/google.png create mode 100644 images/mapproviders/openstreetmap.png create mode 100644 images/mapproviders/yahoo.png diff --git a/images/mapproviders/google.png b/images/mapproviders/google.png new file mode 100644 index 0000000000000000000000000000000000000000..06409c5eaf9a93d6c6dcbd7167c23cd81577755d GIT binary patch literal 2137 zcmV-f2&VUmP)w5GiT-GXT2+FnkH5Qw&G&yVqy|MSU=Wycg?&!*Li?L}HQ%7He+hc>h*admR+7$t~ z%PO$8bqCVXBfE~P+6CV2bhOo0Rb+#ktNV)pCc!}oB^PWo3}6gA&h?Dr$>!?0>($$z zz~6uU9M-r6a1lE!YzCa$u`Gbh_zhT!N>I7=LHGxJZEQ(_w^|m(d66jHX%%TDv%nNJ z1Dhn^y`HfJ4h5$Z?#&M)Lm4tM8nkE}dMdS|slE|NN&=#dujWOYkR@6!zJW9WP&j@O zdPXyFaroAv>z+*yL%sYdbONBq2!L$MOGYG;VCZFeQ4nC^bHOSKBt&~A;UZGqxmcmrdBjdVCa;EMEWiP=->yZ6g1y)<5w*k@ZpQ+;U|Zz#R82` zYK9I?Rl!nvD~of2)A_ptkV#HrX8I!rQc7gmfL3v))D|lXhGWPt0eJoVAX>iOlz78L+a(w*k(7cn$ppT?z7$o(&KaP`p2tV}WeATK!cM+P3bM+UtuM1M zI2X}T=vT6TmxWY_X&n}NF=pew(?+S?g;PI&WB~|s9X@jzubjPt;i)L93T3oDx)#6L zxjB39XKxQ%uf(+bLD5#vO%ZHGGXy?QUU z-(QYqDudg;Sl3ToJd3x-I^c2fly(D;+(U44nb|VA#ivQ(^o)TLNrJel92deVyxHCZ zB}(Z@rg7;&3z}9H&TYIA^nvbVx<%#hNb$xr&R%jC`OcS4O#u)?>%squSTifIWt59H_1i=Jg8fVO$d~^#sX~4&Q z3$=ekMIAbRas=W8i(taQCpWAZyTw7%m@j4IoPJZ3B(;}D03tMWOhn?iJ{3Z2`WDht z0lJyS^KW-8LT`fTdFCVVj=cGPzH#5Jd;vTW65CO zj{EV{qjk$}i23>;S8P}W;^n8FLF{M@mqOieS{Ou#6L!JK3&0=%B(&ha+famef4gno zm=#8#_Z%YqA3_UWqoZzOPCnzABCLM;$RZ%W-?IZzu*JvwaP#b5RMpC0r3PwKs;OWC;K9t!270m(l@2F@J^SGc zkD}u7U(7k&T>AhHc4|neEY+8u%?E(GAe#Yw7Qs~4F_f*cK`5#KE7-^ulh2Tx&`5+z zX*8Ss{3s%WUxTw|OZHyFeRa^%1`?zX5}kDUcxaeiFq4590KD#}Ay)z?WK7DzNXM2I z5K0E?kWjkXi_xBAa{z7xCP-L}?3ksQ3X>1P?F`%opqr|Y3Q+{*E=1InsWhx?4rJ%G zo~&>Qgurx_cj;^vD4(S9DMbg8Q27|51E0WI9H6@AZzDBKS}tszcSwBzw>aZ8lV`7m zs$EVQbx*&8iH?^rb@?bfP9BoOpql5hp{WcKQ5q-` zP82`!GNjV=xH2+;XWu)F0yhU6^}l(-W%4A@WAWhnXp{~eeV7kNV{JWs{U=`a>TTt7$jplh54u5bG2j4#dR!+k!(eRq(64^4R zpKO&-BzX}F8~Ai^+(g=zX#9k9#6ITwPac(6+<{V zGv)fH1Lz&TM%ItXaDYm~f+u;l+RO>}?&knQGlpp}Y@0rLCHr~)e*p#nsD;sawmnQ+ P00000NkvXXu0mjfSN8G_ literal 0 HcmV?d00001 diff --git a/images/mapproviders/openstreetmap.png b/images/mapproviders/openstreetmap.png new file mode 100644 index 0000000000000000000000000000000000000000..96a4734a7a23ef854dd76503b7ce987a63b21f92 GIT binary patch literal 10344 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 literal 0 HcmV?d00001 diff --git a/mavground.qrc b/mavground.qrc index 15c9f733e..6bb41cfdb 100644 --- a/mavground.qrc +++ b/mavground.qrc @@ -79,6 +79,9 @@ images/splash.png audio/alert.wav demo-log.txt + images/mapproviders/openstreetmap.png + images/mapproviders/google.png + images/mapproviders/yahoo.png images/Vera.ttf diff --git a/src/ui/MapWidget.cc b/src/ui/MapWidget.cc index f63c0041a..c97ba954f 100644 --- a/src/ui/MapWidget.cc +++ b/src/ui/MapWidget.cc @@ -92,11 +92,11 @@ MapWidget::MapWidget(QWidget *parent) : // Add controls to select map provider ///////////////////////////////////////////////// QActionGroup* mapproviderGroup = new QActionGroup(this); - osmAction = new QAction(tr("OpenStreetMap"), mapproviderGroup); - yahooActionMap = new QAction(tr("Yahoo: Map"), mapproviderGroup); - yahooActionSatellite = new QAction(tr("Yahoo: Satellite"), mapproviderGroup); - googleActionMap = new QAction(tr("Google: Map"), mapproviderGroup); - googleSatAction = new QAction(tr("Google: Sat"), mapproviderGroup); + osmAction = new QAction(QIcon(":/images/mapproviders/openstreetmap.png"), tr("OpenStreetMap"), mapproviderGroup); + yahooActionMap = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Map"), mapproviderGroup); + yahooActionSatellite = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Satellite"), mapproviderGroup); + googleActionMap = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Map"), mapproviderGroup); + googleSatAction = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Sat"), mapproviderGroup); osmAction->setCheckable(true); yahooActionMap->setCheckable(true); yahooActionSatellite->setCheckable(true); @@ -222,9 +222,9 @@ void MapWidget::mapproviderSelected(QAction* action) mc->updateRequestNew(); mc->setZoom(zoom); - yahooActionOverlay->setEnabled(false); +// yahooActionOverlay->setEnabled(false); overlay->setVisible(false); - yahooActionOverlay->setChecked(false); +// yahooActionOverlay->setChecked(false); } else if (action == yahooActionMap) @@ -238,9 +238,9 @@ void MapWidget::mapproviderSelected(QAction* action) mc->updateRequestNew(); mc->setZoom(zoom); - yahooActionOverlay->setEnabled(false); +// yahooActionOverlay->setEnabled(false); overlay->setVisible(false); - yahooActionOverlay->setChecked(false); +// yahooActionOverlay->setChecked(false); } else if (action == yahooActionSatellite) { @@ -253,7 +253,7 @@ void MapWidget::mapproviderSelected(QAction* action) mc->updateRequestNew(); mc->setZoom(zoom); - yahooActionOverlay->setEnabled(true); +// yahooActionOverlay->setEnabled(true); } else if (action == googleActionMap) { @@ -265,9 +265,9 @@ void MapWidget::mapproviderSelected(QAction* action) mc->updateRequestNew(); mc->setZoom(zoom); - yahooActionOverlay->setEnabled(false); +// yahooActionOverlay->setEnabled(false); overlay->setVisible(false); - yahooActionOverlay->setChecked(false); +// yahooActionOverlay->setChecked(false); } else if (action == googleSatAction) { @@ -279,9 +279,9 @@ void MapWidget::mapproviderSelected(QAction* action) mc->updateRequestNew(); mc->setZoom(zoom); - yahooActionOverlay->setEnabled(false); +// yahooActionOverlay->setEnabled(false); overlay->setVisible(false); - yahooActionOverlay->setChecked(false); +// yahooActionOverlay->setChecked(false); } else { -- 2.22.0