Branch: master

48fce57a 2014-10-13 15:43:46 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M kftpgrabber/src/mainactions.cpp
M kftpgrabber/src/widgets/bookmarks/listview.cpp
M kftpgrabber/src/widgets/browser/actions.cpp
M kftpgrabber/src/widgets/failedtransfers.cpp
M kftpgrabber/src/widgets/filtereditor.cpp
M kftpgrabber/src/widgets/queueview/queueview.cpp
diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp
index 217a710..76f4649 100644
--- a/kftpgrabber/src/mainactions.cpp
+++ b/kftpgrabber/src/mainactions.cpp
@@ -75,7 +75,7 @@
 {
   // setup File menu
   m_fileConnectAction = new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut(), mainWidget(), SLOT(slotQuickConnect()), actionCollection(), "file_quick_connect");
-  m_newSessionAction = new TDEActionMenu(i18n("&New Session"), "filenew", actionCollection(), "file_newsession");
+  m_newSessionAction = new TDEActionMenu(i18n("&New Session"), "document-new", actionCollection(), "file_newsession");
 
   TDEAction *leftSide = new TDEAction(i18n("&Left Side"), TDEShortcut(), this, SLOT(slotNewSessionLeft()), actionCollection());
   TDEAction *rightSide = new TDEAction(i18n("&Right Side"), TDEShortcut(), this, SLOT(slotNewSessionRight()), actionCollection());
diff --git a/kftpgrabber/src/widgets/bookmarks/listview.cpp b/kftpgrabber/src/widgets/bookmarks/listview.cpp
index e90ab06..59d4ce6 100644
--- a/kftpgrabber/src/widgets/bookmarks/listview.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/listview.cpp
@@ -109,10 +109,10 @@
   connect(this, SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int)));
 
   /* Init the actions */
-  m_newAction = new TDEAction(i18n("&New..."), "filenew", TDEShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new");
+  m_newAction = new TDEAction(i18n("&New..."), "document-new", TDEShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new");
   m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, SLOT(slotRenameAction()), actionCollection(), "bookmark_rename");
-  m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", TDEShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
-  m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder_new", TDEShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
+  m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
+  m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder-new", TDEShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
   m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate");
 }
 
diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp
index 390507a..c2eeaea 100644
--- a/kftpgrabber/src/widgets/browser/actions.cpp
+++ b/kftpgrabber/src/widgets/browser/actions.cpp
@@ -106,7 +106,7 @@
   m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter");
   
   m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, SLOT(slotRename()), m_actionCollection, "edit_rename");
-  m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete");
+  m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete");
   m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, SLOT(slotProps()), m_actionCollection, "edit_properties");
   m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, SLOT(slotShred()), m_actionCollection, "edit_shred");
   
@@ -124,8 +124,8 @@
   
   m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, SLOT(slotTransfer()), m_actionCollection, "transfer");
   m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer");
-  m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder_new", TDEShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir");
-  m_fileEditAction = new TDEAction(i18n("&Open file"), "fileopen", TDEShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file");
+  m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder-new", TDEShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir");
+  m_fileEditAction = new TDEAction(i18n("&Open file"), "document-open", TDEShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file");
   m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, SLOT(slotVerify()), m_actionCollection, "verify");
 
   populateEncodings();
diff --git a/kftpgrabber/src/widgets/failedtransfers.cpp b/kftpgrabber/src/widgets/failedtransfers.cpp
index e256284..752ca59 100644
--- a/kftpgrabber/src/widgets/failedtransfers.cpp
+++ b/kftpgrabber/src/widgets/failedtransfers.cpp
@@ -117,7 +117,7 @@
   m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, SLOT(slotRestart()), actionCollection(), "launch");
   m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, SLOT(slotAddToQueue()), actionCollection(), "addtoqueue");
   m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue");
-  m_removeAction = new TDEAction(i18n("R&emove"), "editdelete", TDEShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove");
+  m_removeAction = new TDEAction(i18n("R&emove"), "edit-delete", TDEShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove");
   m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, SLOT(slotRemoveAll()), actionCollection(), "removeall");
 }
 
diff --git a/kftpgrabber/src/widgets/filtereditor.cpp b/kftpgrabber/src/widgets/filtereditor.cpp
index a9479f7..6e63594 100644
--- a/kftpgrabber/src/widgets/filtereditor.cpp
+++ b/kftpgrabber/src/widgets/filtereditor.cpp
@@ -159,15 +159,15 @@
   hb->setSpacing(4);
   
   m_buttonNew = new TQPushButton(TQString::null, hb);
-  m_buttonNew->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall));
+  m_buttonNew->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall));
   m_buttonNew->setMinimumSize(m_buttonNew->sizeHint() * 1.2);
   
   m_buttonCopy = new TQPushButton(TQString::null, hb);
-  m_buttonCopy->setPixmap(BarIcon("editcopy", TDEIcon::SizeSmall));
+  m_buttonCopy->setPixmap(BarIcon("edit-copy", TDEIcon::SizeSmall));
   m_buttonCopy->setMinimumSize(m_buttonCopy->sizeHint() * 1.2);
   
   m_buttonDelete = new TQPushButton(TQString::null, hb);
-  m_buttonDelete->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall));
+  m_buttonDelete->setPixmap(BarIcon("edit-delete", TDEIcon::SizeSmall));
   m_buttonDelete->setMinimumSize(m_buttonDelete->sizeHint() * 1.2);
   
   m_buttonRename = new TQPushButton(i18n("Rename..."), hb);
diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp
index a1adfb8..30b4d18 100644
--- a/kftpgrabber/src/widgets/queueview/queueview.cpp
+++ b/kftpgrabber/src/widgets/queueview/queueview.cpp
@@ -556,7 +556,7 @@
   // Create all the actions
   m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, SLOT(slotLaunch()), m_actionCollection, "launch");
   m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort");
-  m_removeAction = new TDEAction(i18n("&Remove"), "editdelete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove");
+  m_removeAction = new TDEAction(i18n("&Remove"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove");
   m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, SLOT(slotRemoveAll()), m_actionCollection, "removeAll");
   m_moveUpAction = new TDEAction(i18n("Move &Up"), "go-up", TDEShortcut(), this, SLOT(slotMoveUp()), m_actionCollection, "moveUp");
   m_moveDownAction = new TDEAction(i18n("Move &Down"), "go-down", TDEShortcut("del"), this, SLOT(slotMoveDown()), m_actionCollection, "moveDown");
@@ -565,12 +565,12 @@
   m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, SLOT(slotEdit()), m_actionCollection, "changeTransfer");
 
   // Create the toolbar actions
-  m_loadAction = new TDEAction(i18n("&Load Queue From File"), "fileopen", TDEShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load");
-  m_saveAction = new TDEAction(i18n("&Save Queue to File"), "filesaveas", TDEShortcut(), this, SLOT(slotSave()), m_actionCollection, "save");
+  m_loadAction = new TDEAction(i18n("&Load Queue From File"), "document-open", TDEShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load");
+  m_saveAction = new TDEAction(i18n("&Save Queue to File"), "document-save-as", TDEShortcut(), this, SLOT(slotSave()), m_actionCollection, "save");
   m_startAction = new TDEAction(i18n("S&tart"), "player_play", TDEShortcut(), this, SLOT(slotStart()), m_actionCollection, "start");
   m_pauseAction = new TDEAction(i18n("&Pause"), "player_pause", TDEShortcut(), this, SLOT(slotPause()), m_actionCollection, "pause");
   m_stopAction = new TDEAction(i18n("St&op"), "player_stop", TDEShortcut(), this, SLOT(slotStop()), m_actionCollection, "stop");
-  m_addAction = new TDEAction(i18n("&Add Transfer..."), "filenew", TDEShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add");
+  m_addAction = new TDEAction(i18n("&Add Transfer..."), "document-new", TDEShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add");
   m_searchAction = new TDEAction(i18n("&Search && Replace..."), "edit-find", TDEShortcut(), this, SLOT(slotSearch()), m_actionCollection, "search");
   m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotFilter()), m_actionCollection, "filter");