diff options
-rw-r--r-- | amarok/src/collectionbrowser.cpp | 2 | ||||
-rw-r--r-- | amarok/src/iconloader.cpp | 6 | ||||
-rw-r--r-- | amarok/src/mediabrowser.cpp | 2 | ||||
-rw-r--r-- | amarok/src/mediadevice/ipod/ipodmediadevice.cpp | 2 | ||||
-rw-r--r-- | amarok/src/playlist.cpp | 8 | ||||
-rw-r--r-- | amarok/src/playlistbrowser.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 54370202..467459b9 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -1465,7 +1465,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // menu.insertSeparator(); TDEPopupMenu fileMenu; - fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n( "&Organize File..." , "&Organize %n Files..." , selection.count() ) , ORGANIZE ); + fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n( "&Organize File..." , "&Organize %n Files..." , selection.count() ) , ORGANIZE ); fileMenu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n( "&Delete File..." , "&Delete %n Files..." , selection.count() ) , DELETE ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Manage &Files" ), &fileMenu, FILE_MENU ); diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp index a7812d2b..7429147a 100644 --- a/amarok/src/iconloader.cpp +++ b/amarok/src/iconloader.cpp @@ -50,7 +50,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h iconMap["download"] = "tdehtml_kget"; iconMap["dynamic"] = "dynamic"; iconMap["edit"] = "edit"; - iconMap["editcopy"] = "editcopy"; + iconMap["edit-copy"] = "edit-copy"; iconMap["equalizer"] = "equalizer"; iconMap["external"] = "exec"; iconMap["fastforward"] = "2rightarrow"; @@ -77,7 +77,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h iconMap["random_track"] = "random"; iconMap["redo"] = "edit-redo"; iconMap["refresh"] = "reload"; - iconMap["remove"] = "editdelete"; + iconMap["remove"] = "edit-delete"; iconMap["remove_from_playlist"] = "remove"; iconMap["repeat_album"] = "cdrom_unmount"; iconMap["repeat_no"] = "go-bottom"; @@ -85,7 +85,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h iconMap["repeat_track"] = "repeat_track"; iconMap["rescan"] = "reload"; iconMap["rewind"] = "2leftarrow"; - iconMap["save"] = "filesave"; + iconMap["save"] = "document-save"; iconMap["scripts"] = "pencil"; iconMap["search"] = "edit-find"; iconMap["settings_engine"] = "amarok"; diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index ac57761a..70ea0349 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -3258,7 +3258,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) numFiles ), TQString(), - KGuiItem(i18n("&Delete"),"editdelete") ); + KGuiItem(i18n("&Delete"),"edit-delete") ); if ( button != KMessageBox::Continue ) { diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index e07cd23c..a47b7908 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -999,7 +999,7 @@ IpodMediaDevice::createLockFile( bool silent ) if( !silent ) { if( KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Remove iTunes Lock File?" ), - KGuiItem(i18n("&Remove"), "editdelete"), TQString(), KMessageBox::Dangerous ) + KGuiItem(i18n("&Remove"), "edit-delete"), TQString(), KMessageBox::Dangerous ) == KMessageBox::Continue ) { msg = i18n( "Media Device: removing lockfile %1 failed: %2. " ) diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index fdd8b03b..3bd33d32 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -3898,18 +3898,18 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S TDEPopupMenu fileMenu; if( CollectionDB::instance()->isDirInCollection( item->url().directory() ) ) { - fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n("&Organize File...", "&Organize %n Files...", itemCount), ORGANIZE ); + fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Organize File...", "&Organize %n Files...", itemCount), ORGANIZE ); } else { - fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n("&Copy Track to Collection...", "&Copy %n Tracks to Collection...", itemCount), COPY_TO_COLLECTION ); - fileMenu.insertItem( SmallIconSet( "filesaveas" ), i18n("&Move Track to Collection...", "&Move %n Tracks to Collection...", itemCount), MOVE_TO_COLLECTION ); + fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Copy Track to Collection...", "&Copy %n Tracks to Collection...", itemCount), COPY_TO_COLLECTION ); + fileMenu.insertItem( SmallIconSet( "document-save-as" ), i18n("&Move Track to Collection...", "&Move %n Tracks to Collection...", itemCount), MOVE_TO_COLLECTION ); } fileMenu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n("&Delete File...", "&Delete %n Selected Files...", itemCount ), this, TQT_SLOT( deleteSelectedFiles() ), SHIFT+Key_Delete, DELETE ); popup.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n("Manage &Files"), &fileMenu, FILE_MENU ); if( itemCount == 1 ) - popup.insertItem( SmallIconSet( Amarok::icon( "editcopy" ) ), i18n( "&Copy Tags to Clipboard" ), COPY ); + popup.insertItem( SmallIconSet( Amarok::icon( "edit-copy" ) ), i18n( "&Copy Tags to Clipboard" ), COPY ); if( itemCount > 1 ) popup.insertItem( trackColumn diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index 68676000..87c64403 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -175,7 +175,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) addMenu->insertItem( i18n("Podcast..."), PODCAST ); connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) ); - renameButton = new TDEAction( i18n("Rename"), "editclear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac ); + renameButton = new TDEAction( i18n("Rename"), "edit-clear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac ); removeButton = new TDEAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), m_ac ); m_toolbar = new Browser::ToolBar( browserBox ); |