Icon renaming (code and icon changes - KDE/):

* bookmark -> bookmarks
* and finally, remove user-2 and konv-message[2] from Oxygen

svn path=/trunk/KDE/kdegraphics/okular/; revision=757019

part.cpp

@@ -203,7 +203,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
 
     // [left toolbox: Bookmarks] | []
     BookmarkList * bookmarkList = new BookmarkList( m_document, 0 );
-    m_sidebar->addItem( bookmarkList, KIcon("bookmark"), i18n("Bookmarks") );
+    m_sidebar->addItem( bookmarkList, KIcon("bookmarks"), i18n("Bookmarks") );
     m_sidebar->setItemEnabled( 3, false );
 
     // widgets: [../miniBarContainer] | []

ui/annotationwidgets.cpp

@@ -240,7 +240,7 @@ QWidget * StampAnnotationWidget::widget()
 
     // FIXME!!! use the standard names instead (when we'll have the artwork)
     m_pixmapSelector->addItem( i18n( "okular" ), "graphics-viewer-document" );
-    m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmark" );
+    m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmarks" );
     m_pixmapSelector->addItem( i18n( "KDE" ), "kde" );
     m_pixmapSelector->addItem( i18n( "Information" ), "help-about" );
 #if 0

ui/bookmarklist.cpp

@@ -105,7 +105,7 @@ BookmarkList::BookmarkList( Okular::Document *document, QWidget *parent )
     sp.setVerticalPolicy( QSizePolicy::Minimum );
     bookmarkController->setSizePolicy( sp );
     // insert a togglebutton [show only bookmarks in the current document]
-    m_showBoomarkOnlyAction = bookmarkController->addAction( KIcon( "bookmark" ), i18n( "Current document only" ) );
+    m_showBoomarkOnlyAction = bookmarkController->addAction( KIcon( "bookmarks" ), i18n( "Current document only" ) );
     m_showBoomarkOnlyAction->setCheckable( true );
     connect( m_showBoomarkOnlyAction, SIGNAL( toggled( bool ) ), this, SLOT( slotFilterBookmarks( bool ) ) );
 
@@ -250,7 +250,7 @@ void BookmarkList::rebuildTree( bool filter )
         if ( currenturlitem )
         {
             currenturlitem->setExpanded( true );
-            currenturlitem->setIcon( 0, KIcon( "bookmark" ) );
+            currenturlitem->setIcon( 0, KIcon( "bookmarks" ) );
             m_tree->scrollToItem( currenturlitem, QAbstractItemView::PositionAtTop );
         }
     }

ui/thumbnaillist.cpp

@@ -520,7 +520,7 @@ void ThumbnailList::slotDelayTimeout()
     delete m_bookmarkOverlay;
     int expectedWidth = viewport()->width() / 4;
     if ( expectedWidth > 10 )
-        m_bookmarkOverlay = new QPixmap( DesktopIcon( "bookmark", expectedWidth ) );
+        m_bookmarkOverlay = new QPixmap( DesktopIcon( "bookmarks", expectedWidth ) );
     else
         m_bookmarkOverlay = 0;
 
@@ -757,7 +757,7 @@ ThumbnailController::ThumbnailController( QWidget * parent, ThumbnailList * list
     // insert a togglebutton [show only bookmarked pages]
     //insertSeparator();
     QAction * showBoomarkOnlyAction = addAction(
-        KIcon( "bookmark" ), i18n( "Show bookmarked pages only" ) );
+        KIcon( "bookmarks" ), i18n( "Show bookmarked pages only" ) );
     showBoomarkOnlyAction->setCheckable( true );
     connect( showBoomarkOnlyAction, SIGNAL( toggled( bool ) ), list, SLOT( slotFilterBookmarks( bool ) ) );
     showBoomarkOnlyAction->setChecked( Okular::Settings::filterBookmarks() );