[Marble-commits] KDE/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1181020 by nienhueser:

Use oxygen bookmark folder icon for bookmark folders. Icon for crosshairs plugin. Add go home action to bookmarks.

 M  +3 -1      QtMainWindow.cpp  
 M  +3 -0      marble.qrc  
 M  +1 -1      plugins/render/crosshairs/CrosshairsPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1181019:1181020
@@ -452,6 +452,8 @@
 
     m_bookmarkMenu->addSeparator();
 
+    m_bookmarkMenu->addAction( QIcon( ":/icons/go-home.png" ), "&Home",
+                               m_controlView->marbleWidget(), SLOT( goHome() ) );
     createFolderList();
 }
 
@@ -463,7 +465,7 @@
     QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
 
     for (; i != end; ++i ) {
-        QMenu *m_bookmarksListMenu = m_bookmarkMenu->addMenu( (*i)->name() );
+        QMenu *m_bookmarksListMenu = m_bookmarkMenu->addMenu( QIcon( ":/icons/folder-bookmark.png" ), (*i)->name() );
 
         createBookmarksListMenu( m_bookmarksListMenu, *(*i) );
         connect( m_bookmarksListMenu, SIGNAL( triggered ( QAction *) ),
--- trunk/KDE/kdeedu/marble/src/marble.qrc #1181019:1181020
@@ -5,6 +5,7 @@
         <file>icons/arrow-left.png</file>
         <file>icons/arrow-right.png</file>
         <file>icons/arrow-up.png</file>
+        <file>icons/bookmarks.png</file>
         <file>icons/bookmark-add-folder.png</file>
         <file>icons/bookmark-edit.png</file>
         <file>icons/bookmark-new.png</file>
@@ -13,6 +14,7 @@
         <file>icons/document-print.png</file>
         <file>icons/document-save-as.png</file>
         <file>icons/edit-copy.png</file>
+        <file>icons/folder-bookmark.png</file>
         <file>icons/go-home.png</file>
         <file>icons/go-home-large.png</file>
         <file>icons/get-hot-new-stuff.png</file>
@@ -42,6 +44,7 @@
         <file>icons/instruction-next.png</file>
         <file>icons/flag.png</file>
         <file>icons/gps.png</file>
+        <file>icons/crosshairs.png</file>
         <file>../data/editors/potlatch.png</file>
         <file>../data/editors/merkaartor.png</file>
         <file>../data/editors/josm.png</file>
--- trunk/KDE/kdeedu/marble/src/plugins/render/crosshairs/CrosshairsPlugin.cpp #1181019:1181020
@@ -56,7 +56,7 @@
 
 QIcon CrosshairsPlugin::icon () const
 {
-    return QIcon();
+    return QIcon( ":/icons/crosshairs.png" );
 }
 
 void CrosshairsPlugin::initialize ()