Branch: master

6200c1cb 2014-10-13 15:43:51 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M src/svnfrontend/tdesvnfilelist.cpp
M src/tdesvn.cpp
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index aa88573..5938561 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -303,7 +303,7 @@
         TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
 
     /* 3. actions only on dirs */
-    m_MkdirAction = new TDEAction(i18n("New folder"),"folder_new",
+    m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new",
         TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
     m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch",
         TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch");
@@ -315,7 +315,7 @@
         TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned");
     tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted."));
 
-    m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"gohome",TDEShortcut(),
+    m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(),
         TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo");
     m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from"));
 
@@ -1872,7 +1872,7 @@
     if (action==TQDropEvent::UserAction) {
          TQPopupMenu popup;
          popup.insertItem(SmallIconSet("goto"), i18n( "Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 );
-         popup.insertItem(SmallIconSet("editcopy"), i18n( "Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 );
+         popup.insertItem(SmallIconSet("edit-copy"), i18n( "Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 );
          popup.insertSeparator();
          popup.insertItem(SmallIconSet("cancel"), i18n( "Cancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5);
          int result = popup.exec(m_pList->intern_drop_pos);
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index ac08597..5aa30f2 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -122,16 +122,16 @@
             setCentralWidget(m_part->widget());
 
             TDEAction*tmpAction;
-            tmpAction = new TDEAction(i18n("Create and open new repository"),"filenew",
+            tmpAction = new TDEAction(i18n("Create and open new repository"),"document-new",
                 TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
             tmpAction->setToolTip(i18n("Create and opens a new local subversion repository"));
-            tmpAction = new TDEAction(i18n("Dump repository to file"),"filenew",
+            tmpAction = new TDEAction(i18n("Dump repository to file"),"document-new",
                 TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
             tmpAction->setToolTip(i18n("Dump a subversion repository to a file"));
-            tmpAction = new TDEAction(i18n("Hotcopy a repository"),"filenew",
+            tmpAction = new TDEAction(i18n("Hotcopy a repository"),"document-new",
                 TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
             tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder"));
-            tmpAction = new TDEAction(i18n("Load dump into repository"),"filenew",
+            tmpAction = new TDEAction(i18n("Load dump into repository"),"document-new",
                 TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
             tmpAction->setToolTip(i18n("Load a dump file into a repository."));
             tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password",