[QGIS Commit] r15307 - in trunk/qgis: images images/qgis_tips src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2011-03-02 01:54:44 -0800 (Wed, 02 Mar 2011)
New Revision: 15307

Added:
   trunk/qgis/images/qgis_tips/
   trunk/qgis/images/qgis_tips/symbol_levels.png
Modified:
   trunk/qgis/images/images.qrc
   trunk/qgis/src/app/qgstipfactory.cpp
Log:
Added new images folder for tip images and new tip from Alister Hood which demonstrates how to add a tip with an image. Note the use of alias in the qrc file.

Modified: trunk/qgis/images/images.qrc
===================================================================
--- trunk/qgis/images/images.qrc	2011-03-02 00:35:38 UTC (rev 15306)
+++ trunk/qgis/images/images.qrc	2011-03-02 09:54:44 UTC (rev 15307)
@@ -401,4 +401,7 @@
     <file>themes/newgis/mIconPolygonLayer.png</file>
     <file>themes/newgis/mIconTableLayer.png</file>
   </qresource>
+  <qresource prefix="/images/tips" >
+    <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
+  </qresource>
 </RCC>

Added: trunk/qgis/images/qgis_tips/symbol_levels.png
===================================================================
--- trunk/qgis/images/qgis_tips/symbol_levels.png	                        (rev 0)
+++ trunk/qgis/images/qgis_tips/symbol_levels.png	2011-03-02 09:54:44 UTC (rev 15307)
@@ -0,0 +1,20 @@
+‰PNG
+
+   
+IHDR   È   d   Æ   
sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs    
 šœ   tIMEÛ	4õú£t  ÌIDATxÚí]¯“ÛFýä1²ïŽ6¼ØG¥ÀÌ_pC%áàü™)´Lϸ¥ia/gÓ-°dË’vµÒþú$¿7£i’zî¤÷üÞ·?µ‘BÐEéÜ}ùÑòó“|ÜYèP×b*:, 1àÏLÓ»ç›2ª ƒ * ` €A  
  ` €A  €A  
  ` €A  
 Ä!¢)n, `à¶pAƒ   ã°¼lºŸævÔCqºTx*ÿû’eDD´NZ'	Ô·€My½dýŸ}:kVL†ÿˆˆ®œÁÝ(‡¢ OïޝÿþGLtÜ
+û«8¦UM fÿ‡â”HyžÓci¹òß2G³ÔE9w;«?¿.Xh±8Vô[â¿¥‡ƒ¨%BV	£+Ê*&Zup›ç¤t•X¡„ê
+e[üŸŒ¥WéCó¯4ȵPar(
+ú‘eJaöDô>¥Z©>]]ϲ!¢oiZL-ú*Žé>ˈ±*]þŸË?§©œÿª¯øé]õÙ”1ÿš	UUúRkÇô¹ü÷==x³bý~uš
+aÒ,
+T:üWÍ¡yNûóýӁ/ÿ
+âÓ,ªÔª“õ¦ÖI#
+2ôKá/Í¢`A¥ËÅC½9h¢/þ[ä’s•ûÖ5¯Û­øÇâ/¢Öõ=ŽÅëv{þìõïÓ¿W›÷àã¹÷Å¿+xðAÄU²É’KVbm%×Ðjâ'É"+ü©*Cùw©Cxþ-U[É&K
+Ub¸ª ¦÷嫂ج*&ÏéR‡pü·Ô°g¡M°±$ø0H8‘ü•éó¹ÖƒIœ¤O¬Mù Ü’+¼H~ø·ñ\ó®äçgtk™XO1ŸQ‰ô_š²7ˆÌ(O:¡+¹þ¯±¨:OÕ帿CB½nO3ÛÍI§ßv;–krÖIB÷YF«8nÌ_Æò¹£â^ˆÓ¤)ø×22B]à%ë^vð{)’ÎHŒËQ¬¾Ñžks0õ‘ž‡r¥°­¥&¡ù×áÊ·>øobQ¯Í‡qUUšâÜ¥Ý3âQ/.IvW[®rz–›ärXÑ»øß3çÞ7ÿgƒ4»ËݶÌr(ˆ~æÍYÒîf€Ì,Ð,õ?óÜZ©wT*þu¸¿þ;–š¡[FM›`ÿ$íôúe+_àÖ7黉ÕWêßZIõ…Í¿‚]S÷­“ôn¹µÙk.…¾KÕâô%›ë¦ÈR¿rй•q?ö¹MøbÞ¹ðOD´Sþ›ä\ŸC.ï6Ëû˜‘Y²]Ò)Œh?óÓùê,ÖMRç_‡{ü«¸ç Wü/mŠ5ä‹z—=dæ‚ÉŒâÚ,••0>aT6øç`_ü/m‰56ÙÌU™+l•Mþ爥Ášb}Œˆ>zù¨ÍE‘Óy®›Ycƒê‰üð?ÇfÖ•X²Î%Ñ2k^éšÅõpñC–µ:‹\*‹*|ð¯Â”ø_ø+íxßË[dF™óë3+£¨øi’)pïåÍŠ})_f‘µ™mŠ¢ÓnrO¾¹oòo;¨lóïÅ õ2x—¦ôÅòø~ZueC¬f™çØä’ñϵª›4³ló¿-žÏQ°®Ÿ#.žö+YM¸¯óbòz†>,ÿKŽ‚™Œï÷U)‹5— RñÏ-¨–SËw²ÝbUqTS­*Ë©ˆ"ÙPUTË)
+¦›l6;›*±na"®/¨BöU\ò?»tT£06Ó·º8g8ÌëÂ,¡*§Š{'ß'ááIÿn|3ïÒÔh9€É˜¹í§íZ%û+³æ—mþ»›šažÍ5ÿÞçAl—ûz¢ûN—.|i|8Ìsœ›ñÉ?šXŠfPÓ4®'ÂÒ”ÿ–aAeÚüuÉ¿IP餇\õj³s©Ú„Äy,ÿB´MâšÓ0/q¹¹%ŠÌH¶9\,Û„z¸2äæ.A¥âß4¨&5Ìk»Yà{lÎó*œ‚ªÿ!AÌ šY!÷ØËĺþMƒÊ„ÿ!AåÍ œË|È=ö¾öwOÿ{ìûªŠ×Q¬cã½E&/ürÕÑyy^×ØŽ…ß=þ]rß·
+Âÿ²i¯éz
ñ,cùh™X"úzýÎ2ZÅD÷±‡þ}ÕcäžÿºQ¼d$­|w;¯3^kCíóÖ?ïú_ÀÆ
ø7
+ª.þW‰þ…4Qèóݪ6ñºÝ¶Åí;š ÜÁÿ1A%ã?Ïò/ ë@”1'шÃ[ÈâISßãXl”ǝ¹¦Ã¿O†òoëà¡ DVê¹öG¤§À&	={Þ_þ»ùW
+ª˜`T¤æ‰AEÛ—T‘Ü<I~gþ­›£Á¿pT" l²:ôœ>ŸHo~M‡×:Ø<…wl,¨Anéœn}¡ÄäLâ áø¿¾¼l˜2)£«$¡uy©FBlàr(†<EçýÜg™ñA—êC‰Ädøw¡ƒkþ%˜@–ªÔ°]AÆ܃á܉6þmëÀÿæ3°¨ }I&K3[É¥J-›•C'ÙBÊ1”[$4ÿªªÂÊ ºdUC”ë$¡7åYuC…9ÔÎØîû]}MŒ9a(ÿë$e
+}+·s⿵`’›AtÒ¬Nàçòÿ§åy{²%‡‚èS¹†'MS©(>«w£èð_™%ÏsÚS÷qÞÿ‡rô8ω©½d„ÿ•QØD'ÍÚ¤¶ª<ñí^U¢ßRÕ°ÅÿžˆÞ§ó⟵AšB©Ê±	ºš
+ øŸŒAdbý™çÊR-OºKÔÁãùc˜==Ó¥¹Ë™ÿɤ‰Ç(¢MÙÑAž—ÍýôIφ©Þ(©£Ã‡ü²
+šû×oò¹ê~~Â@X at Z ¸
ƒÌýLt 
T0 À   ƒð F£ @PÁ   ƒ   0 À   ƒ  0WƒDX„À  ‚
+1&Ô
@PÁ .›
ø0€ ²†ÿ
kI´Ô™uIå    IEND®B`‚
\ No newline at end of file

Modified: trunk/qgis/src/app/qgstipfactory.cpp
===================================================================
--- trunk/qgis/src/app/qgstipfactory.cpp	2011-03-02 00:35:38 UTC (rev 15306)
+++ trunk/qgis/src/app/qgstipfactory.cpp	2011-03-02 09:54:44 UTC (rev 15307)
@@ -162,6 +162,15 @@
                         " it on again when you are ready to have the map draw itself again!"
                       ) );
   addGuiTip( myTip );
+  // Tip contributed by Alister Hood
+  myTip.setTitle(tr("Join intersected polylines when rendering"));
+  myTip.setContent(tr("When applying layered styles to a polyline layer, you can join"
+                      " intersecting lines together simply by enabling symbol levels."
+                      " The image below shows a before (left) and after (right) view of"
+                      " an intersection when symbol levels are enabled.") +
+                      QString("<p><img src=\":/images/tips/symbol_levels.png\"/></p>")
+        );
+  addGuiTip(myTip);
   /* Template for adding more tips
   myTip.setTitle(tr(""));
   myTip.setContent(tr(""