Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

ksquirrel/ksquirrel.cpp

@@ -796,8 +796,8 @@ void KSquirrel::createActions()
     pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
     pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
     pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
-    pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "fileopen", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
+    pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
-    pAOpen = new TDEAction(i18n("Open file"), "fileopen", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
+    pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
     pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
     pASelectAll = KStdAction::selectAll(0, 0, actionCollection(), "SQ Select All");
     pADeselectAll = KStdAction::deselect(0, 0, actionCollection(), "SQ Deselect All");

ksquirrel/ksquirrelpart/ksquirrelpart.cpp

@@ -108,10 +108,10 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
 
     // copy/move
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
-    new TDEAction(i18n("Copy to..."), "editcopy",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
+    new TDEAction(i18n("Copy to..."), "edit-copy",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7));
-    new TDEAction(i18n("Move to..."), "editcut",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
+    new TDEAction(i18n("Move to..."), "edit-cut",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6));
     new TDEAction(i18n("Copy to last folder"), "",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
@@ -120,7 +120,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
     new TDEAction(i18n("Move to last folder"), "",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S));
-    new TDEAction(i18n("Save As..."), "filesaveas",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
+    new TDEAction(i18n("Save As..."), "document-save-as",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
 
     sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
     sa->setEditable(true);

ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp

@@ -869,7 +869,7 @@ void SQ_GLWidget::initAccelsAndMenu()
 #define SQ_ADD_KACTION(b) \
     (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
 
-    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
 
 #ifndef KSQUIRREL_PART
     menuFile->insertSeparator();

ksquirrel/sidebar/sq_categoriesview.cpp

@@ -166,7 +166,7 @@ SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox(
 
     toolbar->setIconSize(TDEIcon::SizeSmall);
 
-    toolbar->insertButton("folder_new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
+    toolbar->insertButton("folder-new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
     toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
     toolbar->insertButton("info", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
     toolbar->insertButton("bookmark_add", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));

ksquirrel/sidebar/sq_treeviewmenu.cpp

@@ -15,11 +15,11 @@
 
 SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name)
 {
-    id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
+    id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder-new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
     insertSeparator();
     id_rename = insertItem(i18n("Rename"), this, TQT_SLOT(slotDirectoryRename()));
     id_clear  = insertItem(i18n("Clear contents"), this, TQT_SLOT(slotDirectoryClear()));
-    id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
+    id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
     insertSeparator();
     id_prop = insertItem(i18n("Properties"), this, TQT_SLOT(slotDirectoryProperties()));
 }

ksquirrel/sq_diroperator.cpp

@@ -368,9 +368,9 @@ void SQ_DirOperator::setupActionsMy()
 
     TDEAction *sep = actionCollection()->action("separator");
 
-    file->insert(new TDEAction(i18n("Copy"), "editcopy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
+    file->insert(new TDEAction(i18n("Copy"), "edit-copy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
-    file->insert(new TDEAction(i18n("Cut"), "editcut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
+    file->insert(new TDEAction(i18n("Cut"), "edit-cut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
-    file->insert(new TDEAction(i18n("Paste"), "editpaste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
+    file->insert(new TDEAction(i18n("Paste"), "edit-paste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
     file->insert(sep);
     file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
     file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQT_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));

ksquirrel/sq_externaltools.ui.h

@@ -32,8 +32,8 @@ void SQ_ExternalTools::init()
 
     pushToolUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
     pushToolDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
-    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("document-new", TDEIcon::Desktop, TDEIcon::SizeSmall));
-    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall));
     pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
     pushHelp->setPixmap(SQ_IconLoader::instance()->loadIcon("help", TDEIcon::Desktop, TDEIcon::SizeSmall));
 

ksquirrel/sq_filters.ui.h

@@ -35,8 +35,8 @@ void SQ_Filters::init()
 
     pushFilterUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
     pushFilterDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
-    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("document-new", TDEIcon::Desktop, TDEIcon::SizeSmall));
-    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+    pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall));
     pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
 
     listFilters->setCurrentItem(listFilters->firstChild());

ksquirrel/sq_glview.cpp

@@ -233,7 +233,7 @@ void SQ_GLView::addPage(const TQString &label)
     SQ_Config::instance()->setGroup("GL view");
 
     if(m_tabsclose)
-        tab->setIconSet(SmallIcon("fileclose"));
+        tab->setIconSet(SmallIcon("window-close"));
 }
 
 void SQ_GLView::removePage(int index)
@@ -267,7 +267,7 @@ void SQ_GLView::setupTabbar()
         cnt = m_tabbar->count();
 
         for(int i = 0;i < cnt;i++)
-            m_tabbar->tabAt(i)->setIconSet(m_tabsclose ? SmallIcon("fileclose") : TQPixmap());
+            m_tabbar->tabAt(i)->setIconSet(m_tabsclose ? SmallIcon("window-close") : TQPixmap());
 
         m_tabbar->setHoverCloseButton(m_tabsclose);
         m_tabbar->layoutTabs();

ksquirrel/sq_glwidget_stuff.cpp

@@ -869,7 +869,7 @@ void SQ_GLWidget::initAccelsAndMenu()
 #define SQ_ADD_KACTION(b) \
     (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
 
-    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+    id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
 
 #ifndef KSQUIRREL_PART
     menuFile->insertSeparator();

ksquirrel/sq_navigatordropmenu.cpp

@@ -39,7 +39,7 @@ SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *parent) : TQObject(parent)
     dropmenu = new SQ_PopupMenu(0);
 
     // "copy" action
-    TDEAction *pACopy = new TDEAction(i18n("Copy here"), "editpaste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
+    TDEAction *pACopy = new TDEAction(i18n("Copy here"), "edit-paste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
 
     // "move" action
     TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQT_SLOT(slotMove()), ac, "sq_move");

ksquirrel/sq_pluginsinfo.ui.h

@@ -13,8 +13,8 @@
 
 void SQ_PluginsInfo::init()
 {
-    tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("fileopen", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
+    tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("document-open", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
-    tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("filesave", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
+    tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("document-save", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
 
     showLibs();
 }