Branch: master

bbd35ce4 2014-10-14 11:39:29 Timothy Pearson
Bring package_development, package_games, package_graphics, package_network, package_multimedia, package_wordprocessing, edu_science, package_utilities, input_devices_settings, kcmsystem, personal, and looknfeel icons into XDG compliance
M amarok/src/collectionbrowser.cpp
M amarok/src/covermanager.cpp
M amarok/src/iconloader.cpp
M amarok/src/konquisidebar/universalamarok.cpp
M amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 731c55d..c756c3f 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -2717,10 +2717,10 @@
             icon = "cdrom_unmount";
             break;
         case IdArtist:
-            icon = "personal";
+            icon = "preferences-desktop-personal";
             break;
         case IdComposer:
-            icon = "personal";
+            icon = "preferences-desktop-personal";
             break;
 
         case IdGenre:
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 33b2ff9..e591ab1 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -130,7 +130,7 @@
     qb.setLimit( 0, 1 );
     if ( qb.run().count() ) {
         item = new ArtistItem( m_artistView, last, i18n( "Various Artists" ) );
-        item->setPixmap( 0, SmallIcon("personal") );
+        item->setPixmap( 0, SmallIcon("preferences-desktop-personal") );
     }
 
     TQVBox *vbox = new TQVBox( this );
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index 167e6a7..012f29f 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -36,7 +36,7 @@
         iconMap["add_lyrics"]           = "edit_add";
         iconMap["add_playlist"]         = "1downarrow";
         iconMap["album"]                = "cdrom_unmount";
-        iconMap["artist"]               = "personal";
+        iconMap["artist"]               = "preferences-desktop-personal";
         iconMap["audioscrobbler"]       = "audioscrobbler";
         iconMap["love"]                 = "bookmark";
         iconMap["back"]                 = "media-skip-backward";
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 3c95f2d..2df9475 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -86,7 +86,7 @@
     topBar->setIconSize(16);
     topBar->insertButton( "today",    0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( currentTrack() ) );
     topBar->insertButton( "document", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) );
-    topBar->insertButton( "personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) );
+    topBar->insertButton( "preferences-desktop-personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) );
 
     browser = new TDEHTMLPart(widget, "widget-browser");
 //browser=new TDEHTMLPart(widget);
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index 01560b7..82c2cd1 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -34,7 +34,7 @@
 {
     TDEListViewItem::setText( 0, artist.getName() );
 
-    setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
+    setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
 
     setDragEnabled ( true );
 }