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

7 files changed, 12 insertions, 12 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index dde61c8a..95954cce 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -266,7 +266,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 			const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
 			if (supportedViewModes & Kexi::DataViewMode) {
 				item = new ActionSelectorDialogListItem("open", this, i18n("Open in Data View"));
-				item->setPixmap(0, SmallIcon("fileopen"));
+				item->setPixmap(0, SmallIcon("document-open"));
 			}
 			if (part->info()->isExecuteSupported()) {
 				item = new ActionSelectorDialogListItem("execute", this, i18n("Execute"));
@@ -275,7 +275,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 			if (part->info()->isPrintingSupported()) {
 				ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem(
 					"print", this, i18n("Print"));
-				printItem->setPixmap(0, SmallIcon("fileprint"));
+				printItem->setPixmap(0, SmallIcon("document-print"));
 				TDEAction *a = KStdAction::printPreview(0, 0, 0);
 				item = new ActionSelectorDialogListItem("printPreview", printItem, 
 					a->text().replace("&", "").replace("...", ""));
@@ -301,7 +301,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 				exportItem->setExpandable(false);
 			}
 			item = new ActionSelectorDialogListItem("new", this, i18n("Create New Object"));
-			item->setPixmap(0, SmallIcon("filenew"));
+			item->setPixmap(0, SmallIcon("document-new"));
 			if (supportedViewModes & Kexi::DesignViewMode) {
 				item = new ActionSelectorDialogListItem("design", this, i18n("Open in Design View"));
 				item->setPixmap(0, SmallIcon("edit"));
@@ -311,7 +311,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 				item->setPixmap(0, noIcon);
 			}
 			item = new ActionSelectorDialogListItem("close", this, i18n("Close View"));
-			item->setPixmap(0, SmallIcon("fileclose"));
+			item->setPixmap(0, SmallIcon("window-close"));
 			updateWidth();
 		}
 
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 69ca6602..76492ed5 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -173,7 +173,7 @@ void KexiFormPart::initInstanceActions()
 	//connect actions provided by widget factories
 	connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction()));
 
-	createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "editclear", 0, "formpart_clear_contents");
+	createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents");
 	createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder");
 //TODO	createSharedAction(Kexi::DesignViewMode, i18n("Edit Pixmap Collection"), "icons", 0, "formpart_pixmap_collection");
 //TODO	createSharedAction(Kexi::DesignViewMode, i18n("Edit Form Connections"), "connections", 0, "formpart_connections");
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 104e43b3..b2d3940c 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -130,7 +130,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_exportOptionsPage
 	);
 	if (m_options.mode==KexiCSVExport::Clipboard)
-		m_infoLblTo->setIcon("editpaste");
+		m_infoLblTo->setIcon("edit-paste");
 	exportOptionsLyr->addMultiCellWidget(m_infoLblTo, 1, 1, 0, 2);
 
 	m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"),
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 941a7bd0..a1b1c6ea 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -358,7 +358,7 @@ if ( m_mode == Clipboard )
 	}
 
 	if (m_mode==Clipboard) {
-		m_infoLbl->setIcon("editpaste");
+		m_infoLbl->setIcon("edit-paste");
 	}
 	//updateRowCountInfo();
 
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 39e36bbb..c9f9e1c5 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -147,9 +147,9 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	static const TQString msg_back = i18n("Back to Selected Query");
 	static const TQString msg_clear = i18n("Clear History");
 	d->historyHead->addButton("select_item", msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
-	d->historyHead->addButton("editclear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear()));
+	d->historyHead->addButton("edit-clear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear()));
 	d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
-	d->history->popupMenu()->insertItem(SmallIcon("editclear"), msg_clear, d->history, TQT_SLOT(clear()));
+	d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQT_SLOT(clear()));
 	connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
 
 	d->heightForHistoryMode = -1; //height() / 2;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index c528540a..fba543db 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -41,7 +41,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const
 	m_history->setAutoDelete(true);
 
 	m_popup = new TDEPopupMenu(this);
-	m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
+	m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 }
 
 KexiQueryDesignerSQLHistory::~KexiQueryDesignerSQLHistory()
@@ -162,7 +162,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *)
 {
 	TDEPopupMenu p(this);
-	p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
+	p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 	
 
 #ifndef KEXI_NO_UNFINISHED
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 5b8538a7..2a9b61d3 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -188,7 +188,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K
 	int r = KMessageBox::questionYesNo(parent, 
 		"<p>"+msg+"</p><p>"+openedObjectsStr+"</p><p>"
 		+i18n("Do you want to close all windows for these objects?"), 
-		TQString(), KGuiItem(i18n("Close windows"),"fileclose"), KStdGuiItem::cancel());
+		TQString(), KGuiItem(i18n("Close windows"),"window-close"), KStdGuiItem::cancel());
 	tristate res;
 	if (r == KMessageBox::Yes) {
 		//try to close every window