Branch: master

f5a0acac 2014-10-13 15:43:43 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M katapult/katapult/katapult.cpp
M katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
M katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 7e79597..a2d2e14 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -130,8 +130,8 @@
 	contextMenu()->clear();
 	
 	new TDEAction(i18n("Execute"), "exec", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute");
-	new TDEAction(i18n("Clear"), "editclear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear");
-	new TDEAction(i18n("Close"), "fileclose", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close");
+	new TDEAction(i18n("Clear"), "edit-clear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear");
+	new TDEAction(i18n("Close"), "window-close", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close");
 	new TDEAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query");
 	new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu");
 	
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
index f6299ad..7e7234b 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
@@ -35,7 +35,7 @@
 
 TQPixmap ActionOpenBookmark::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::NoGroup, size);
 }
 
 TQString ActionOpenBookmark::text() const
diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
index 95e7511..52385d0 100644
--- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
@@ -39,7 +39,7 @@
 
 TQPixmap ActionOpenDocument::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::NoGroup, size);
 }
 
 TQString ActionOpenDocument::text() const