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

[Gaurav Gupta]

SVN commit 1164455 by ggupta:

Bookmark icons in kde version and changing names in Qt version


 M  +3 -3      QtMainWindow.cpp  
 M  +4 -4      marble.qrc  
 M  +3 -0      marble_part.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1164454:1164455
@@ -242,15 +242,15 @@
      connect(m_aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
      //Bookmark Actions
-     m_addBookmarkAct = new QAction( QIcon(":/icons/bookmarkNew.png"), tr("&Add Bookmark"),this);
+     m_addBookmarkAct = new QAction( QIcon(":/icons/bookmark-new.png"), tr("&Add Bookmark"),this);
      m_addBookmarkAct->setShortcut(tr("Ctrl+B"));
      m_addBookmarkAct->setStatusTip(tr("Add Bookmark"));
      connect( m_addBookmarkAct, SIGNAL( triggered() ), this, SLOT( openBookmarkInfoDialog() ) );
 
-     m_removeAllBookmarksAct = new QAction( QIcon(":/icons/bookmarkRemove.png"), tr("&Remove all Bookmarks"),this);
+     m_removeAllBookmarksAct = new QAction( QIcon(":/icons/bookmark-remove.png"), tr("&Remove all Bookmarks"),this);
      m_removeAllBookmarksAct->setStatusTip(tr("Remove all Bookmarks"));
      connect( m_removeAllBookmarksAct, SIGNAL( triggered() ), this, SLOT( removeAllBookmarks() ) );
-     m_addBookmarkFolderAct = new QAction( QIcon(":/icons/bookmarkAddFolder.png"), tr("&New Bookmark Folder"),this);
+     m_addBookmarkFolderAct = new QAction( QIcon(":/icons/bookmark-add-folder.png"), tr("&New Bookmark Folder"),this);
      m_addBookmarkFolderAct->setStatusTip(tr("New Bookmark Folder"));
      connect( m_addBookmarkFolderAct, SIGNAL( triggered() ), this, SLOT( openNewBookmarkFolderDialog() ) );
 
--- trunk/KDE/kdeedu/marble/src/marble.qrc #1164454:1164455
@@ -5,10 +5,10 @@
         <file>icons/arrow-left.png</file>
         <file>icons/arrow-right.png</file>
         <file>icons/arrow-up.png</file>
-        <file>icons/bookmarkAddFolder.png</file>
-        <file>icons/bookmarkEdit.png</file>
-        <file>icons/bookmarkNew.png</file>
-        <file>icons/bookmarkRemove.png</file>
+        <file>icons/bookmark-add-folder.png</file>
+        <file>icons/bookmark-edit.png</file>
+        <file>icons/bookmark-new.png</file>
+        <file>icons/bookmark-remove.png</file>
         <file>icons/document-open.png</file>
         <file>icons/document-print.png</file>
         <file>icons/document-save-as.png</file>
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1164454:1164455
@@ -848,6 +848,7 @@
     m_addBookmarkAction = new KAction( this );
     actionCollection()->addAction( "add_bookmark", m_addBookmarkAction );
     m_addBookmarkAction->setText( i18nc( "Add Bookmark", "&Add Bookmark" ) );
+    m_addBookmarkAction->setIcon( KIcon( ":/icons/bookmark-new.png" ) );
     m_addBookmarkAction->setShortcut( Qt::CTRL + Qt::Key_B );
     connect( m_addBookmarkAction, SIGNAL( triggered( ) ),
              this,                SLOT( openBookmarkInfoDialog() ) );
@@ -855,6 +856,7 @@
     
     m_removeAllBookmarksAction = new KAction( this );
     actionCollection()->addAction( "remove_all_bookmark", m_removeAllBookmarksAction );
+    m_removeAllBookmarksAction->setIcon( KIcon( ":/icons/bookmark-remove.png" ) );
     m_removeAllBookmarksAction->setText( i18nc( "Remove All Bookmarks", "&Remove All Bookmarks" ) );
     connect( m_removeAllBookmarksAction, SIGNAL( triggered( ) ),
              this,                SLOT( removeAllBookmarks() ) );
@@ -862,6 +864,7 @@
     
     m_addBookmarkFolderAction = new KAction( this );
     actionCollection()->addAction( "new_bookmark_folder", m_addBookmarkFolderAction );
+    m_addBookmarkFolderAction->setIcon( KIcon( ":/icons/bookmark-add-folder.png" ) );
     m_addBookmarkFolderAction->setText( i18nc( "New Bookmark Folder", "&New Bookmark Folder" ) );
     connect( m_addBookmarkFolderAction, SIGNAL( triggered( ) ),
              this,                SLOT( openNewBookmarkFolderDialog() ) );