| 19ae0d41 | 2014-10-13 15:43:42 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M amarok/src/collectionbrowser.cpp M amarok/src/iconloader.cpp M amarok/src/mediabrowser.cpp M amarok/src/mediadevice/ipod/ipodmediadevice.cpp M amarok/src/playlist.cpp M amarok/src/playlistbrowser.cpp |
||
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 5437020..467459b 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -1465,7 +1465,7 @@
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 a7812d2..7429147 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -50,7 +50,7 @@
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 @@
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 @@
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 ac57761..70ea034 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -3258,7 +3258,7 @@
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 e07cd23..a47b790 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -999,7 +999,7 @@
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 fdd8b03..3bd33d3 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -3898,18 +3898,18 @@
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 6867600..87c6440 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -175,7 +175,7 @@
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 );
|
||