Branch: master

9d5193fd 2014-10-13 00:11:37 Timothy Pearson
Bring up, down, top, and bottom icons into XDG compliance
M amarok/src/columnlist.cpp
M amarok/src/contextbrowser.cpp
M amarok/src/iconloader.cpp
M amarok/src/playlistbrowseritem.cpp
M amarok/src/queuemanager.cpp
diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp
index 2deff87..ffb6d35 100644
--- a/amarok/src/columnlist.cpp
+++ b/amarok/src/columnlist.cpp
@@ -63,11 +63,11 @@
 
     TQVBox *buttonbox = new TQVBox( this );
 
-    m_up = new KPushButton( KGuiItem( TQString(), "up" ), buttonbox );
+    m_up = new KPushButton( KGuiItem( TQString(), "go-up" ), buttonbox );
     TQToolTip::add( m_up, i18n( "Move column up" ) );
     connect( m_up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUp() ) );
 
-    m_down = new KPushButton( KGuiItem( TQString(), "down" ), buttonbox );
+    m_down = new KPushButton( KGuiItem( TQString(), "go-down" ), buttonbox );
     TQToolTip::add( m_down, i18n( "Move column down" ) );
     connect( m_down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDown() ) );
 
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index de4375f..5411de9 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -938,7 +938,7 @@
         menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
         menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Podcast" ), ASNEXT );
         //menu.insertSeparator();
-        //menu.insertItem( SmallIconSet( "down" ), i18n( "&Download" ), DOWNLOAD );
+        //menu.insertItem( SmallIconSet( "go-down" ), i18n( "&Download" ), DOWNLOAD );
     }
     else if( url.protocol() == "file" || url.protocol() == "artist" || url.protocol() == "album" || url.protocol() == "compilation" || url.protocol() == "albumdisc" || url.protocol() == "compilationdisc")
     {
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index ae6e641..9e93609 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -80,7 +80,7 @@
         iconMap["remove"]               = "editdelete";
         iconMap["remove_from_playlist"] = "remove";
         iconMap["repeat_album"]         = "cdrom_unmount";
-        iconMap["repeat_no"]            = "bottom";
+        iconMap["repeat_no"]            = "go-bottom";
         iconMap["repeat_playlist"]      = "repeat_playlist";
         iconMap["repeat_track"]         = "repeat_track";
         iconMap["rescan"]               = "reload";
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 676c8fc..9932a5f 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -2516,7 +2516,7 @@
     if( isNew() )
         setPixmap( 0, SmallIcon( Amarok::icon( "podcast2" ) ) );
     else if( m_onDisk )
-        setPixmap( 0, SmallIcon( "down" ) );
+        setPixmap( 0, SmallIcon( "go-down" ) );
     else
         setPixmap( 0, SmallIcon( Amarok::icon( "podcast" ) ) );
 }
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index ee3c3a9..6228120 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -299,8 +299,8 @@
     m_listview = new QueueList( box );
 
     TQVBox *buttonBox = new TQVBox( box );
-    m_up     = new KPushButton( KGuiItem( TQString(), "up" ), buttonBox );
-    m_down   = new KPushButton( KGuiItem( TQString(), "down" ), buttonBox );
+    m_up     = new KPushButton( KGuiItem( TQString(), "go-up" ), buttonBox );
+    m_down   = new KPushButton( KGuiItem( TQString(), "go-down" ), buttonBox );
     m_remove = new KPushButton( KGuiItem( TQString(), Amarok::icon( "dequeue_track" ) ), buttonBox );
     m_add    = new KPushButton( KGuiItem( TQString(), Amarok::icon( "queue_track" ) ), buttonBox );
     m_clear  = new KPushButton( KGuiItem( TQString(), Amarok::icon( "playlist_clear" ) ), buttonBox );