[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src: Add icons to the mapview context menu. Add icons for settings dialog.
From:       Torsten Rahn <rahn () kde ! org>
Date:       2013-01-06 1:48:11
Message-ID: 20130106014811.CCB9FA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 43fa93f44f8a530c8a7cd0e99b09550bc3fd28ab by Torsten Rahn.
Committed on 06/01/2013 at 02:47.
Pushed by rahn into branch 'master'.

Add icons to the mapview context menu. Add icons for settings dialog.

A  +-    --    src/icons/cache.png
A  +-    --    src/icons/plugin.png
A  +-    --    src/icons/transform-move.png
M  +2    -2    src/lib/MapViewWidget.cpp
M  +3    -0    src/marble.qrc

http://commits.kde.org/marble/43fa93f44f8a530c8a7cd0e99b09550bc3fd28ab

diff --git a/src/icons/cache.png b/src/icons/cache.png
new file mode 100644
index 0000000..82a149e
Binary files /dev/null and b/src/icons/cache.png differ
diff --git a/src/icons/plugin.png b/src/icons/plugin.png
new file mode 100644
index 0000000..a633007
Binary files /dev/null and b/src/icons/plugin.png differ
diff --git a/src/icons/transform-move.png b/src/icons/transform-move.png
new file mode 100644
index 0000000..d6c44ce
Binary files /dev/null and b/src/icons/transform-move.png differ
diff --git a/src/lib/MapViewWidget.cpp b/src/lib/MapViewWidget.cpp
index 8a93c13..8abd412 100644
--- a/src/lib/MapViewWidget.cpp
+++ b/src/lib/MapViewWidget.cpp
@@ -563,12 +563,12 @@ void MapViewWidget::Private::showContextMenu( const QPoint& pos \
                )
     QAction* iconSizeAction = menu.addAction( tr( "&Show Large Icons" ), q, SLOT( \
toggleIconSize() ) );  iconSizeAction->setCheckable( true );
     iconSizeAction->setChecked( m_mapViewUi.marbleThemeSelectView->iconSize() == \
                QSize( 96, 96 ) );
-    QAction *favAction = menu.addAction( tr( "&Favorite" ), q, SLOT( \
toggleFavorite() ) ); +    QAction *favAction = menu.addAction( QIcon( \
":/icons/bookmarks.png" ), tr( "&Favorite" ), q, SLOT( toggleFavorite() ) );  \
favAction->setCheckable( true );  favAction->setChecked( isCurrentFavorite() );
     menu.addSeparator();
 
-    menu.addAction( "&Create a New Map...", q, SIGNAL( showMapWizard() ) );
+    menu.addAction( QIcon( ":/icons/create-new-map.png" ), tr("&Create a New \
                Map..."), q, SIGNAL( showMapWizard() ) );
     if( QFileInfo( MarbleDirs::localPath() + "/maps/" + currentThemePath() \
                ).exists() )
         menu.addAction( tr( "&Delete Map Theme" ), q, SLOT( deleteMap() ) );
     menu.addAction( tr( "&Upload Map..." ), q, SIGNAL( showUploadDialog() ) );
diff --git a/src/marble.qrc b/src/marble.qrc
index 80f9f96..7fcc47f 100644
--- a/src/marble.qrc
+++ b/src/marble.qrc
@@ -87,5 +87,8 @@
         <file>icons/clouds.png</file>
         <file>icons/atmosphere.png</file>
         <file>icons/copy-coordinates.png</file>
+        <file>icons/cache.png</file>
+        <file>icons/plugin.png</file>
+        <file>icons/transform-move.png</file>
     </qresource>
 </RCC>


[prev in list] [next in list] [prev in thread] [next in thread]