From ca46c5047fd0f619486b89e032c34d9a5664cdcb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 14:24:34 -0500 Subject: [PATCH] Fix exec icon location and bring it into XDG compliance --- buildtools/ada/adaproject_part.cpp | 2 +- buildtools/autotools/autodetailsview.cpp | 2 +- buildtools/autotools/autoprojectpart.cpp | 2 +- buildtools/custommakefiles/customprojectpart.cpp | 2 +- buildtools/pascal/pascalproject_part.cpp | 2 +- buildtools/qmake/trollprojectpart.cpp | 4 ++-- buildtools/qmake/trollprojectwidget.cpp | 4 ++-- embedded/visualboyadvance/visualboyadvance_part.cpp | 2 +- languages/bash/bashsupport_part.cpp | 2 +- languages/cpp/app_templates/kdevlang/kdevlang_part.cpp | 2 +- languages/csharp/csharpsupportpart.cpp | 6 +++--- languages/kjssupport/kjssupport_part.cpp | 2 +- languages/perl/perlsupportpart.cpp | 6 +++--- languages/php/phpsupportpart.cpp | 2 +- languages/python/pythonsupportpart.cpp | 6 +++--- languages/ruby/rubysupport_part.cpp | 4 ++-- languages/sql/sqlsupport_part.cpp | 2 +- parts/outputviews/kdevappoutputview.desktop | 2 +- parts/outputviews/makeviewpart.cpp | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 32833dfd..5eacf5d0 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -56,7 +56,7 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin 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 9751c23f..a9215cab 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -222,7 +222,7 @@ void AutoDetailsView::initActions() 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("Execute target

Executes the target " diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 6b408bd0..6640a353 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -213,7 +213,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr 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 4a390d6f..c737f941 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -137,7 +137,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Build Options 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 3264e44a..98127f0a 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -65,7 +65,7 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("Build project

Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, Pascal Compiler 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 89062656..eeccf445 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -140,7 +140,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "project directory.
Environment variables and make arguments can be specified " "in the project settings dialog, Make Options 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 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options 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 b1253355..dd5c5d03 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -137,7 +137,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // 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 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // 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 31334344..6abe66c5 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -30,7 +30,7 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c 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 9f1be201..7e30b913 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -43,7 +43,7 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr 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("Run

Starts an application.")); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 559a931b..69dcd7d8 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); 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 154ff911..6da33030 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -62,17 +62,17 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T 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 4a3dbc25..5a00e9c6 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -69,7 +69,7 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin 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 c8379c77..3236e72e 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -62,17 +62,17 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr 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 5b3668de..c189cc5c 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -88,7 +88,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin 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 1f2c7b87..092f40b9 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -60,19 +60,19 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T 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("Execute program

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("Execute String

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" ); action->setToolTip( i18n("Start Python interpreter") ); diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index e1745a02..0b4627b9 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -48,14 +48,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevrubysupport.rc"); TDEAction *action; - action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9, + action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("Run

Starts an application.")); action->setIcon("ruby_run.png"); - action = new TDEAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9, + action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9, this, TQT_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 12335214..e676cee5 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -40,7 +40,7 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri setXMLFile( "kdevsqlsupport.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("Run

Executes a SQL script.")); diff --git a/parts/outputviews/kdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop index a5faf631..f84de45e 100644 --- a/parts/outputviews/kdevappoutputview.desktop +++ b/parts/outputviews/kdevappoutputview.desktop @@ -76,7 +76,7 @@ GenericName[tg]=Тирезаи хориҷ кардани гузориш GenericName[tr]=Uygulama Çıktı Görünümü GenericName[zh_CN]=应用程序输出查看器 GenericName[zh_TW]=應用程式輸出檢視 -Icon=exec +Icon=application-x-executable X-TDE-ServiceTypes=TDevelop/AppFrontend X-TDE-Library=libkdevappview X-TDevelop-Version=5 diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 9324bcb0..8b441e94 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -40,7 +40,7 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis m_dcop = new KDevMakeFrontendIface(this); m_widget = new MakeWidget(this); - m_widget->setIcon( SmallIcon("exec") ); + m_widget->setIcon( SmallIcon("application-x-executable") ); m_widget->setCaption(i18n("Messages Output")); TQWhatsThis::add(m_widget, i18n("Messages output

" "The messages window shows the output of the compiler and "