[Marble-commits] KDE/kdeedu/marble/src/lib/geodata/data

[Dennis Nienhüser]

SVN commit 1215154 by nienhueser:

Icon style for folders and bookmarks

 M  +8 -0      GeoDataFeature.cpp  
 M  +3 -0      GeoDataFeature.h  
 M  +1 -0      GeoDataFolder.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.cpp #1215153:1215154
@@ -287,6 +287,14 @@
         = new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/unmanned_hard_landing.png" ) ), 
               QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
 
+    s_defaultStyle[Folder]
+        = new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/folder.png" ) ),
+              QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
+
+    s_defaultStyle[Bookmark]
+        = new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/bookmark.png" ) ),
+              QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
+
     s_defaultStyleInitialized = true;
     s_defaultFont = QFont("Sans Serif");
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.h #1215153:1215154
@@ -139,6 +139,9 @@
         UnmannedSoftLandingSite, // u
         UnmannedHardLandingSite, // i
 
+        Folder,
+        Bookmark,
+
         // Important: Make sure that this is always the last 
         // item and just use it to specify the array size
         LastIndex
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFolder.cpp #1215153:1215154
@@ -53,6 +53,7 @@
 GeoDataFolder::GeoDataFolder()
         : GeoDataContainer( new GeoDataFolderPrivate )
 {
+    setVisualCategory( GeoDataFeature::Folder );
 }
 
 GeoDataFolder::GeoDataFolder( const GeoDataFolder& other )