Branch: master

0422c8d5 2014-10-22 14:24:09 Timothy Pearson
Fix exec icon location and bring it into XDG compliance
M kexi/kexiutils/debuggui.cpp
M kexi/plugins/macros/kexipart/keximacropart.cpp
M lib/kross/main/wdgscriptsmanager.cpp
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index dd36052..c48f0d8 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -102,7 +102,7 @@
 		hbox->addWidget(btn_exec);
 		KPushButton *btn_clear = new KPushButton(KGuiItem("Clear", "clear_left"), page);
 		hbox->addWidget(btn_clear);
-		KPushButton *btn_sim = new KPushButton(KGuiItem("Simulate Execution", "exec"), page);
+		KPushButton *btn_sim = new KPushButton(KGuiItem("Simulate Execution", "application-x-executable"), page);
 		btn_sim->setName("simulateAlterTableExecution");
 		hbox->addWidget(btn_sim);
 
diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp
index c189b8c..65bfaeb 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.cpp
+++ b/kexi/plugins/macros/kexipart/keximacropart.cpp
@@ -120,7 +120,7 @@
 void KexiMacroPart::initInstanceActions()
 {
 	//kdDebug() << "KexiMacroPart::initInstanceActions()" << endl;
-	//createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "exec", 0, "data_execute");
+	//createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "application-x-executable", 0, "data_execute");
 }
 
 KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*)
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index e2e063c..50a0101 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -137,7 +137,7 @@
     slotSelectionChanged(0);
     connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
 
-    btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", TDEIcon::MainToolbar, 16 ));
+    btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "application-x-executable", TDEIcon::MainToolbar, 16 ));
     connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
     btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 ));
     connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
@@ -154,7 +154,7 @@
 /*
     toolBar->setIconText( TDEToolBar::IconTextRight );
 
-    toolBar->insertButton("exec", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute"));
+    toolBar->insertButton("application-x-executable", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute"));
     toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
     toolBar->insertLineSeparator();
     toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load"));