From fbc3b5242df891af9f6123eb7779f4431e8c3584 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 27 Jun 2015 22:53:39 -0700
Subject: [PATCH] Globe: use lighter and darker flags to mark the current dive
 site

This may be too subtle... the current dive site now has a brighter flag
than the others. I may need to make it an even bigger difference or maybe
make the flag a little bigger or something... but it's a start.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 icons/flag_dark.png  | Bin 0 -> 1499 bytes
 icons/flag_light.png | Bin 0 -> 1420 bytes
 qt-ui/globe.cpp      |  23 +++++++++++++++--------
 qt-ui/mainwindow.cpp |   1 +
 subsurface.qrc       |   2 ++
 5 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 icons/flag_dark.png
 create mode 100644 icons/flag_light.png

diff --git a/icons/flag_dark.png b/icons/flag_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..206fcfffe449867ea20b5fcfe93be4130eca609f
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v%52DHP<dQcC~;1!ze`
zK~!ko?U-$BQ&kwp|L5Mmu3fvf8!K#Wx4Q{rjyg6L-W<qeih_Vj6e5l<#HfiT8Z;67
zFk?)V5YaCZHL@Th$dXOo6v0e3!epD>fVS+l?YgepN*Qg}t}pcEUOz4IgPLGyi%EYU
z?>Wyu=a=W6d+xo2<2a;)<DY%S{O<R*Xkw&&F~zplm20mn8yaHwo5M@X>H&x%bL&<r
z6w66Cs^_z@w|?sDxm@WUZ!1`!>r^&0SRQ(T$cTBHhw!M)_0LisisScMO!dEB=~}<J
zOn<w4(9>C1QP=8SExpVzOz7Wo=*GszlrR47kt1sJ@W`hfz1Om;i>twut%J5?2|e^%
zm*AGeoHKLVyY%Mdtu2YsiRW_yT%KFR&U(FGw?d(KI0S-MN48!u-Pj!(w~|ntU|DG;
zl=;P2Qc?luFFzA@c82HodBpaaN%eqzbVa~m-XZgaYlQ<&QDngF5$kpS`7Dx-P29cz
z>*LKWM|YQo;_xN{DBZFRYY)7ETqlL0?ki|Jv=1s;1ra5IpA8|VQ9-a^K~yG^dKTrV
zr^R^-J3TV-rAVCaPWc|V^JRz3X?N7dygtaYl#o&sy4uepd-WsG*KLIM@fy@jyoPJ1
zz5zoEq2XsEG3|%fIVrfq&r-V!7O4{wYiTq~x{X%loTE}Lz|P%TV|QB%MN|SYE&>Tn
zLvzoEt1UkuYMVkxEyQEHwnMb20*>eu06;*|$mUBSPXLm!DP)-~*+Q$eIBFjkrCh-8
zvOnjs579Cn9|6K5z){ffl~9-lalQ2navd^IY9+RR_zwIm3wJyOjtG$;G@=3yL<q>J
zI0}8fxX5g6OR2#02cJtVcE{7f*=b1l0z@bpZc2bK5ut#ekDIN>&}%pk04ULw;+gk8
z#zf48*+c?_6CutL1V{`)Iu440g%OCarc}T$5L9*zj}^P)QADC)&>TQfJOl`ZDEN?4
zS-8-240A>+yec7<)vku7b~|j5aS)Dzib#+Zr$G}MendL<I(vdC6=<Kmy>-ckI;v*<
zR)ko<A93Pda0bzM1aoW@a$yeOHlycM8)S|sShWoGdv+qmX)qP_K|%yj5k6Ez2ts%l
zffSwt45OF1!m|h0FRSS+lI9xZ`3nW{{DQm~n?Tq%ju;yR1wQ1I6jRnd$P0>~TUZ0O
zNQ7LK9EQ%b$f4zs@`RwdxKqsHK;^q{hEgWb^j%YZkMZViWm)lyo8I1Ydhy-tQ6USL
zBtI`E)s~9yNtBY1D*%po5aU=3b$6hsssaM78in#aM7$wbMz29AkRrjx&+MHro&ZvK
zkX0{V*%Szc%SMKctLLxTY&N3o7gu_%9cu^2Mr%Dj*V4OWP8XVT%LYxoP|#Yudh#%o
zj1Dji;@iUq5gZ*vzC``<fpKF?$^@#as>F#nWnww5*<|W#{JS|en@uTix7FBu!)u(*
z$vQ_gSkUjZ7wY7>{5|_#2a&1ZIC}}-AN|%Hbx&3{yIj*iirz-q7+pgMrv>oiKh0qn
z#sh}AsKUmJDx2--lMdBdP5+7dKP;wd*O;w9rwc2q%JpzRwdwLphd!B}uS-b>^!gQF
zP{6JmMnnGn*4k{g6`}Eg&9T|Q6I6&T(Q@MbidSA}o*z&8V|3N3RXhOoEXN)HFZB$=
z7%Dbw`N->!?dUQ0y?@fuec`X;N$-HZyy{WHqs$yoZ8RGCA9Q}wJ3x5UP5@SusqcC+
z@>6jVH*g$xnoClvQz6h#IC3so;mN;+2<ZaNxssNjuKz+0ij;rQWCSt-4;dMObdwQC
zHyMF+lMzTa8G&?@5lA-~fpn7*NH-aQbo0L#_!A>!N)6yqQr7?g002ovPDHLkV1g4e
ByNLh*

literal 0
HcmV?d00001

diff --git a/icons/flag_light.png b/icons/flag_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..231da134d8f314eee4e28a76bbd70492b1e2d7cf
GIT binary patch
literal 1420
zcmV;71#|j|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v%52DkYv=0kQx91sO?1
zK~!ko?bvy2(`6jT@%OLC)??k#GVAV(bbvC495N7Dz(ow=0VJFflt2U$!#^H~B!Ch_
z)C3YkLZXle$f3Xl2XgG<FcUV0;~0bvM;T*np=;M}>-l^9W6=<!L^11v>61MFJjW+_
zJ>TE&$uB=i2*E(K%Lh*89}(<*%Hyvb=6CPQm|Wb5#S;3rInqD@T6dH$^duR-Qg#O-
zra*T%;JR9!Tade-Ay3z0u~`3Uj*0<l@r^&fqLktlPfmYL;gN*8xuT(r&sR)LocV^`
zSoB;irO)mo-%t(oJTOQI5&hoK@VI@^5~mHdh-|A8!Wk0X7o9?=UlOi3WKl4^_u8Vh
z_Z%B{)r*#nRYHg&A%yf-Sp!o6f7~SHb+-wibI%W$#uTH=HNoL8NiLftaic+Fv0c%4
zvW&@BerXtN$jNytV?<HCVsK758hsV{gKiD%JFvNCduaK(`RWt}qVpzgAHGA@M@zsT
zA$+i&(5$g&^}|7z4(>bfn35agMg`SLgIxNwygO1_R&B>1!!f_Ct&2XO?slSkcU4pG
zrY~~R^3ow}!+Xnt^W=8&CzL{00LSKU(64+Gy?Fv8B!TP$S1b5+`0{gcWLmtA^sKx0
z3eATUQ9pg3ZJgplW2TNS2znqvk3nrGykQ+dn;jD4Nm)D{y=f}F_EUX(H1Uv}20ASX
zHaqz>XANV^EAk4CpVLGi&}yBQSa(#Jhyr?g!54z;kywtM#<62R_yuZH65h(s@BujN
zAZtNZ0X~QeLUI^%z2SoD`u))blvgKky8Z=Ez=~whLr?;j1VJ5SPr$Tl8Lq=;0Wb_N
zB=l_+o!)cc_5;a%>wE5k-vugRRc9GbM;8zj#e8=zuY(}?+@Mf^N((&^2*#mRn=#J)
z6#tc*ppY<69)oM)2E6tvKn=!RP$l*4@i}U+9qf)O;Jm}}^39ct720{L=oKnL-ZKb~
z75u(FkTDN$U?0vcd!Q?bGDT0?dvgdf4cdN%ghVi=_H{-4(WqXdrKKMyPJBXHw{-NF
z%SLxkkN0-l=x%%a(ClNi1nj4X10=&xP-qBw8VT(@fo}F>P=Iq^CGyPYF`K7AvIb;d
z8**R-){}RYYu2oZ3ZS;4vTT!GH{W8BW{g=rvs|Y!T~F#!b=)g140%RP)P{7qdhOM2
zB$|;ULB#&AVag1YS!VQ^X?Xp5RFzv$$C)7<{GQfRJEK~G#q(Bg>*$t;94cR5a^J8-
zTez5}OXGXaHc#-m+lRVkXHI(Er9|hs3XHr6wl7J_N{34=_+Fh$pydK4ec>#8O?#sT
zShj4Lw%46}(J#b~UAsQ{yOJAeY8xH7c6pqu)i%jSAj8_)l9^#JtDjlD9JStn```(}
z3zj;%J=WqJA?`qwzDE7d)X|bEoGr`Jfd?#eQIvU9S(JG+6}G1O8E-sZS=Q8gX{5LH
zdPYiijxo8kgtm3>SLeLF=*}M{j7A0K&04)NULnufx@*1pA-0e5w_B%*&dyS$FH#Vf
zn*IU#**kup?DuPQ#flXwNg<boWwt+LM7<_`@Y=4f@XY4shIi}F|9Is7$$o!?dT;3q
zm2nIUDaGsmCC6M+a?e~+vir~D{a%5PHZmJ%X>b3ju|M+r9T15q7YLd1nwlE%NCJTK
zDj^-}ukdI9&P23<j{XWCu-__=QUzjw7$63S0b+m{AO?s5Vt^PR28aP-fEXYKhynhG
afZqVb--%K4{pM%@0000<MNUMnLSTYEo}1eM

literal 0
HcmV?d00001

diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 60249c852..c6e997c12 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -16,6 +16,8 @@
 #include <marble/MarbleModel.h>
 #include <marble/MarbleDirs.h>
 #include <marble/MapThemeManager.h>
+#include <marble/GeoDataStyle.h>
+#include <marble/GeoDataIconStyle.h>
 
 #ifdef MARBLE_SUBSURFACE_BRANCH
 #include <marble/MarbleDebug.h>
@@ -188,6 +190,8 @@ void GlobeGPS::mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit unit)
 
 void GlobeGPS::repopulateLabels()
 {
+	static GeoDataStyle otherSite, currentSite;
+	static GeoDataIconStyle darkFlag(QImage(":flagDark")), lightFlag(QImage(":flagLight"));
 	struct dive_site *ds;
 	int idx;
 	QMap<QString, GeoDataPlacemark *> locationMap;
@@ -196,12 +200,23 @@ void GlobeGPS::repopulateLabels()
 		delete loadedDives;
 	}
 	loadedDives = new GeoDataDocument;
+	otherSite.setIconStyle(darkFlag);
+	currentSite.setIconStyle(lightFlag);
 
+	if (displayed_dive_site.uuid && dive_site_has_gps_location(&displayed_dive_site)) {
+		GeoDataPlacemark *place = new GeoDataPlacemark(displayed_dive_site.name);
+		place->setStyle(&currentSite);
+		place->setCoordinate(displayed_dive_site.longitude.udeg / 1000000.0,
+				     displayed_dive_site.latitude.udeg / 1000000.0, 0, GeoDataCoordinates::Degree);
+		locationMap[QString(displayed_dive_site.name)] = place;
+		loadedDives->append(place);
+	}
 	for_each_dive_site(idx, ds) {
 		if (ds->uuid == displayed_dive_site.uuid)
 			continue;
 		if (dive_site_has_gps_location(ds)) {
 			GeoDataPlacemark *place = new GeoDataPlacemark(ds->name);
+			place->setStyle(&otherSite);
 			place->setCoordinate(ds->longitude.udeg / 1000000.0, ds->latitude.udeg / 1000000.0, 0, GeoDataCoordinates::Degree);
 
 			// don't add dive locations twice, unless they are at least 50m apart
@@ -221,14 +236,6 @@ void GlobeGPS::repopulateLabels()
 			loadedDives->append(place);
 		}
 	}
-
-	if (displayed_dive_site.uuid && dive_site_has_gps_location(&displayed_dive_site)) {
-		GeoDataPlacemark *place = new GeoDataPlacemark(displayed_dive_site.name);
-		place->setCoordinate(displayed_dive_site.longitude.udeg / 1000000.0,
-							 displayed_dive_site.latitude.udeg / 1000000.0, 0, GeoDataCoordinates::Degree);
-		locationMap[QString(displayed_dive_site.name)] = place;
-		loadedDives->append(place);
-	}
 	model()->treeModel()->addDocument(loadedDives);
 
 	struct dive_site *center = displayed_dive_site.uuid != 0 ?
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 0b8ba1f76..55ef51440 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -264,6 +264,7 @@ void MainWindow::current_dive_changed(int divenr)
 	}
 	graphics()->plotDive();
 	information()->updateDiveInfo();
+	globe()->reload();
 }
 
 void MainWindow::on_actionNew_triggered()
diff --git a/subsurface.qrc b/subsurface.qrc
index f6abf9063..7eff0d952 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -18,6 +18,8 @@
         <file alias="gaschangeNitrox">icons/Nx_change.png</file>
         <file alias="gaschangeTrimix">icons/Tmx_change.png</file>
         <file alias="flag">icons/flag.png</file>
+        <file alias="flagDark">icons/flag_dark.png</file>
+        <file alias="flagLight">icons/flag_light.png</file>
         <file alias="scale">icons/scale.png</file>
         <file alias="ruler">icons/ruler.png</file>
         <file alias="poster">icons/poster.png</file>