From 20832dfc887ec2c8039f13a5401490543b107a64 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Tue, 30 Jul 2019 14:04:51 +0200 Subject: [PATCH] Scripts: set sensible default editors on Windows and Linux --- ApplicationCode/Application/RiaPreferences.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 725e2cd101..ebfb3cf641 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -30,6 +30,10 @@ #include "cafPdmUiFieldHandle.h" #include "cafPdmUiFilePathEditor.h" +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include +#endif + namespace caf { template<> @@ -57,6 +61,20 @@ RiaPreferences::RiaPreferences(void) CAF_PDM_InitFieldNoDefault(&scriptDirectories, "scriptDirectory", "Shared Script Folder(s)", "", "", ""); scriptDirectories.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); + QString defaultTextEditor; +#ifdef WIN32 + defaultTextEditor = QString("notepad.exe"); +#else + defaultTextEditor = QString("kate"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + defaultTextEditor = QStandardPaths::findExecutable("kate"); + if (defaultTextEditor.isEmpty()) + { + defaultTextEditor = QStandardPaths::findExecutable("gedit"); + } +#endif +#endif + CAF_PDM_InitField(&scriptEditorExecutable, "scriptEditorExecutable", QString("kate"), "Script Editor", "", "", ""); scriptEditorExecutable.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());