Branch: master

042168b3 2014-10-13 15:43:55 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M kicker-applets/kbinaryclock/kbinaryclock.cpp
M konq-plugins/domtreeviewer/domtreewindow.cpp
M konq-plugins/rellinks/plugin_rellinks.cpp
M konq-plugins/sidebar/delicious/mainWidget.cpp
M ksig/ksig.cpp
M noatun-plugins/dub/dub/fileselectorwidget.cpp
M noatun-plugins/oblique/cmodule.cpp
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 4738e75..04497f4 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -312,7 +312,7 @@
 				menu->insertItem(SmallIcon("kcontrol"), i18n("Date && Time &Format..."), 104, 5);
 		}
 
-		menu->insertItem(SmallIcon("editcopy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
+		menu->insertItem(SmallIcon("edit-copy"), i18n("C&opy to Clipboard"), copyMenu, 105, 6);
 		if (!bImmutable)
 		{
 				menu->insertSeparator(7);
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index b8ce0cb..9c9933f 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -155,7 +155,7 @@
 
     // actions for the dom tree list view context menu
 
-    del_tree = new TDEAction(i18n("&Delete"), "editdelete",
+    del_tree = new TDEAction(i18n("&Delete"), "edit-delete",
     			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
 			actionCollection(), "tree_delete");
     del_tree->setToolTip(i18n("Delete nodes"));
@@ -168,7 +168,7 @@
 			actionCollection(), "tree_add_text");
 
     // actions for the info panel attribute list context menu
-    del_attr = new TDEAction(i18n("&Delete"), "editdelete",
+    del_attr = new TDEAction(i18n("&Delete"), "edit-delete",
     			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
 			actionCollection(), "attr_delete");
     del_attr->setToolTip(i18n("Delete attributes"));
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index e58c43a..1f1b4a6 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -103,19 +103,19 @@
     m_document->insert(tdeaction_map["contents"]);
     tdeaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
 
-    tdeactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
+    tdeactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "document-open", actionCollection(), "rellinks_chapters" );
     m_document->insert(tdeactionmenu_map["chapter"]);
     connect( tdeactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
     tdeactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
     tdeactionmenu_map["chapter"]->setDelayed(false);
 
-    tdeactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
+    tdeactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "document-open", actionCollection(), "rellinks_sections" );
     m_document->insert(tdeactionmenu_map["section"]);
     connect( tdeactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
     tdeactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
     tdeactionmenu_map["section"]->setDelayed(false);
 
-    tdeactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
+    tdeactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "document-open", actionCollection(), "rellinks_subsections" );
     m_document->insert(tdeactionmenu_map["subsection"]);
     connect( tdeactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
     tdeactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index c979429..a376297 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -323,7 +323,7 @@
     TQPopupMenu * menu = new TQPopupMenu( this );
     TQ_CHECK_PTR( menu );
 
-    menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "editdelete", TDEIcon::Small ),
+    menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit-delete", TDEIcon::Small ),
                       i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) );
 
     menu->exec( pos );
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 9a7a323..a8a04a8 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -64,14 +64,14 @@
 void KSig::setupActions()
 {
     KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection());
-    new TDEAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove");
+    new TDEAction(i18n("Remove"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove");
     KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
 
     KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection());
     KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection());
     KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection());
-    new TDEAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear");
+    new TDEAction(i18n("C&lear"), "edit-clear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear");
 
     new TDEAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader");
     new TDEAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter");
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index 3e7ba33..4a62ecb 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -48,7 +48,7 @@
 	lo->addWidget(hlow);
 
 	home = new TQPushButton( hlow );
-	home->setPixmap(SmallIcon("gohome"));
+	home->setPixmap(SmallIcon("go-home"));
 	TQToolTip::add(home, i18n("Home folder"));
 	up = new TQPushButton( /*i18n("&Up"),*/ hlow );
 	up->setPixmap(SmallIcon("go-up"));
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index ce5caea..044119e 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -51,17 +51,17 @@
 				TQT_SLOT(selectSchema(const TQString&))
 			);
 
-		mAdd = new TQPushButton(BarIconSet("filenew"), 0, box);
+		mAdd = new TQPushButton(BarIconSet("document-new"), 0, box);
 		mAdd->setFixedWidth(mAdd->height());
 		TQToolTip::add(mAdd, i18n("Create new schema"));
 		connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(newSchema()));
 
-		mRemove = new TQPushButton(BarIconSet("editdelete"), 0, box);
+		mRemove = new TQPushButton(BarIconSet("edit-delete"), 0, box);
 		mRemove->setFixedWidth(mRemove->height());
 		TQToolTip::add(mRemove, i18n("Remove this schema"));
 		connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSchema()));
 
-		mCopy = new TQPushButton(BarIconSet("editcopy"), 0, box);
+		mCopy = new TQPushButton(BarIconSet("edit-copy"), 0, box);
 		mCopy->setFixedWidth(mCopy->height());
 		TQToolTip::add(mCopy, i18n("Copy this schema"));
 		connect(mCopy, TQT_SIGNAL(clicked()), TQT_SLOT(copySchema()));
@@ -104,7 +104,7 @@
 		connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild()));
 		TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one"));
 
-		mRemoveSelf = new TQPushButton(BarIconSet("filenew", TDEIcon::SizeSmall), "", buttons);
+		mRemoveSelf = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons);
 		mRemoveSelf->setFixedWidth(mRemoveSelf->height());
 		connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf()));
 		TQToolTip::add(mRemoveSelf, i18n("Remove the selected item"));
@@ -525,7 +525,7 @@
 		connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling()));
 		TQToolTip::add(mAdd, i18n("Create a new item"));
 
-		mRemove = new TQPushButton(BarIconSet("filenew", TDEIcon::SizeSmall), "", buttons);
+		mRemove = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons);
 		mRemove->setFixedWidth(mRemove->height());
 		connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf()));
 		TQToolTip::add(mRemove, i18n("Remove the selected item"));