Branch: master

ca46c504 2014-10-22 14:24:34 Timothy Pearson
Fix exec icon location and bring it into XDG compliance
M buildtools/ada/adaproject_part.cpp
M buildtools/autotools/autodetailsview.cpp
M buildtools/autotools/autoprojectpart.cpp
M buildtools/custommakefiles/customprojectpart.cpp
M buildtools/pascal/pascalproject_part.cpp
M buildtools/qmake/trollprojectpart.cpp
M buildtools/qmake/trollprojectwidget.cpp
M embedded/visualboyadvance/visualboyadvance_part.cpp
M languages/bash/bashsupport_part.cpp
M languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
M languages/csharp/csharpsupportpart.cpp
M languages/kjssupport/kjssupport_part.cpp
M languages/perl/perlsupportpart.cpp
M languages/php/phpsupportpart.cpp
M languages/python/pythonsupportpart.cpp
M languages/ruby/rubysupport_part.cpp
M languages/sql/sqlsupport_part.cpp
M parts/outputviews/kdevappoutputview.desktop
M parts/outputviews/makeviewpart.cpp
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 32833df..5eacf5d 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -56,7 +56,7 @@
     action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8,
                           this, TQT_SLOT(slotBuild()),
                           actionCollection(), "build_build" );
-    action = new TDEAction( i18n("Execute Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_execute" );
 
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 9751c23..a9215ca 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -222,7 +222,7 @@
 	buildTargetAction->setEnabled( false );
 
 	TQToolTip::add( m_button5, tr2i18n( "Execute Target..."));
-	executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0,
+	executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "application-x-executable", 0,
 	                                           TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions,
 	                                   "execute target" );
 	executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target "
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 6b408bd..6640a35 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -213,7 +213,7 @@
     TQDomDocument &dom = *projectDom();
     if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) {
         //ok we handle the execute in this kpart
-        action = new TDEAction( i18n("Execute Program"), "exec", SHIFT+Key_F9,
+        action = new TDEAction( i18n("Execute Program"), "application-x-executable", SHIFT+Key_F9,
                               this, TQT_SLOT(slotExecute()),
                               actionCollection(), "build_execute" );
         action->setToolTip(i18n("Execute program"));
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 4a390d6..c737f94 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -137,7 +137,7 @@
                                 "Environment variables and make arguments can be specified "
                                 "in the project settings dialog, <b>Build Options</b> tab." ) );
 
-    action = new TDEAction( i18n( "Execute Program" ), "exec", 0,
+    action = new TDEAction( i18n( "Execute Program" ), "application-x-executable", 0,
                           this, TQT_SLOT( slotExecute() ),
                           actionCollection(), "build_execute" );
     action->setToolTip( i18n( "Execute program" ) );
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 3264e44..98127f0 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -65,7 +65,7 @@
     action->setToolTip(i18n("Build project"));
     action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. "
         "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab."));
-    action = new TDEAction( i18n("Execute Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_execute" );
     action->setToolTip(i18n("Execute program"));
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 8906265..eeccf44 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -140,7 +140,7 @@
                               "project directory.<br>Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
-    action = new TDEAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9,
+    action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9,
                           this, TQT_SLOT(slotBuildAndExecuteProject()),
                           actionCollection(), "build_execute_project" );
     action->setToolTip(i18n("Execute main program"));
@@ -191,7 +191,7 @@
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
-    action = new TDEAction( i18n("Execute Subproject"), "exec", 0,
+    action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0,
                           this, TQT_SLOT(slotBuildAndExecuteTarget()),
                           actionCollection(), "build_execute_target" );
     action->setToolTip(i18n("Execute subproject"));
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index b125335..dd5c5d0 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -137,7 +137,7 @@
 
     // run
     executeProjectButton = new TQToolButton ( projectTools, "Run button" );
-    executeProjectButton->setPixmap ( SmallIcon ( "exec" ) );
+    executeProjectButton->setPixmap ( SmallIcon ( "application-x-executable" ) );
     executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
     executeProjectButton->setEnabled ( true );
     TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) );
@@ -255,7 +255,7 @@
 
     // run
     executeTargetButton = new TQToolButton ( fileTools, "Run sp button" );
-    executeTargetButton->setPixmap ( SmallIcon ( "exec" ) );
+    executeTargetButton->setPixmap ( SmallIcon ( "application-x-executable" ) );
     executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
     executeTargetButton->setEnabled ( true );
     TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) );
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index 3133434..6abe66c 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -30,7 +30,7 @@
   setXMLFile("kdevpart_visualboyadvance.rc");
   
   TDEAction *action;
-  action = new TDEAction( i18n("Execute Program"), "exec",  Key_F9,
+  action = new TDEAction( i18n("Execute Program"), "application-x-executable",  Key_F9,
 			this, TQT_SLOT(slotExecute()),
 			actionCollection(), "build_execute" );
 
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 9f1be20..7e30b91 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -43,7 +43,7 @@
 	setXMLFile("kdevbashsupport.rc");
 
 	TDEAction *action;
-	action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
 
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 559a931..69dcd7d 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -28,7 +28,7 @@
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
 
 
-	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
 
 	kdDebug() << "Creating %{APPNAMELC} Part" << endl;
 
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 154ff91..6da3303 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -62,17 +62,17 @@
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the CSharp program") );
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as CSharp code") );
 
-    action = new TDEAction( i18n("Start CSharp Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start CSharp Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the CSharp interpreter without a program") );
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 4a3dbc2..5a00e9c 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -69,7 +69,7 @@
 	setXMLFile("kdevkjssupport.rc");
 
 
-	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
 	m_build->setStatusText( i18n("Test the active script.") );
 
 	kdDebug() << "Creating kjssupport Part" << endl;
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index c8379c7..3236e72 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -62,17 +62,17 @@
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the Perl program") );
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as Perl code") );
 
-    action = new TDEAction( i18n("Start Perl Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Perl Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the Perl interpreter without a program") );
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 5b3668d..c189cc5 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -88,7 +88,7 @@
 
    TDEAction *action;
 
-   action = new TDEAction( i18n("&Run"), "exec",Key_F9,
+   action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,
    this, TQT_SLOT(slotRun()),
    actionCollection(), "build_execute" );
    action->setToolTip(i18n("Run"));
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 1f2c7b8..092f40b 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -60,19 +60,19 @@
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Execute program") );
     action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program."));
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Execute string") );
     action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code."));
 
-    action = new TDEAction( i18n("Start Python Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Python Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
 ** Diff limit reached (max: 250 lines) **