[Marble-commits] KDE/kdeedu/marble

[Thibaut Gridel]

SVN commit 1193165 by tgridel:

show user places if places property is true

BUG: 232871

 M  +9 -1      data/maps/earth/openstreetmap/openstreetmap.dgml  
 M  +1 -1      src/lib/MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/data/maps/earth/openstreetmap/openstreetmap.dgml #1193164:1193165
@@ -76,9 +76,17 @@
             </property>
             <group name="Places">
                 <property name="places">
+                    <value>true</value>
+                    <available>true</available>
+                </property>
+                <property name="cities">
                     <value>false</value>
                     <available>false</available>
                 </property>
+                <property name="terrain">
+                    <value>false</value>
+                    <available>false</available>
+                </property>
                 <property name="otherplaces">
                     <value>false</value>
                     <available>false</available>
@@ -254,7 +262,7 @@
                     <text>Military area</text>
                 </item>
             </section>
-            <section name="places" checkable="false" spacing="12">
+            <section name="places" checkable="true" connect="places" spacing="12">
                 <heading>Places of Interest</heading>
                 <item name="school_university">
                     <icon color="#f0f0d8"/>
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1193164:1193165
@@ -695,7 +695,7 @@
     viewParams->propertyValue( "terrain", showTerrain );
     viewParams->propertyValue( "otherplaces", showOtherPlaces );
 
-    if ( showPlaces && ( showCities || showTerrain || showOtherPlaces )
+    if ( ( showPlaces || showCities || showTerrain || showOtherPlaces )
          && d->m_popSortModel->rowCount() > 0 )
     {
         d->m_placemarkLayout->paintPlaceFolder( painter, viewParams,