From 4cf878aecf02b9d40a6a317ccb2d3e645d68217b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 13 Jul 2023 07:34:37 +0200
Subject: [PATCH] Python: Base MainScriptAspect on FilePathAspect

Instead of StringAspect.

Change-Id: Idc5cbe4a28ece5b053eee9f260be9a5f22912f81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/projectexplorer/runconfigurationaspects.cpp | 2 +-
 src/plugins/projectexplorer/runconfigurationaspects.h   | 2 +-
 src/plugins/python/pythonrunconfiguration.cpp           | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 7c31f92bf86..1e7bc6f05b0 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -949,7 +949,7 @@ SymbolFileAspect::SymbolFileAspect(AspectContainer *container)
 {}
 
 MainScriptAspect::MainScriptAspect(AspectContainer *container)
-    : StringAspect(container)
+    : FilePathAspect(container)
 {}
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index 7b2e453ad88..7865aef3775 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -254,7 +254,7 @@ private:
     Utils::Id m_settingsDialogId;
 };
 
-class PROJECTEXPLORER_EXPORT MainScriptAspect : public Utils::StringAspect
+class PROJECTEXPLORER_EXPORT MainScriptAspect : public Utils::FilePathAspect
 {
     Q_OBJECT
 
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 13b7f42b928..110b92a19e1 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -343,7 +343,7 @@ public:
 
         mainScript.setSettingsKey("PythonEditor.RunConfiguation.Script");
         mainScript.setLabelText(Tr::tr("Script:"));
-        mainScript.setDisplayStyle(StringAspect::LabelDisplay);
+        mainScript.setReadOnly(true);
 
         environment.setSupportForBuildEnvironment(target);
 
@@ -358,16 +358,15 @@ public:
             CommandLine cmd{interpreter.currentInterpreter().command};
             if (!buffered())
                 cmd.addArg("-u");
-            cmd.addArg(mainScript.filePath().fileName());
+            cmd.addArg(mainScript().fileName());
             cmd.addArgs(arguments(), CommandLine::Raw);
             return cmd;
         });
 
         setUpdater([this] {
             const BuildTargetInfo bti = buildTargetInfo();
-            const QString script = bti.targetFilePath.toUserOutput();
-            setDefaultDisplayName(Tr::tr("Run %1").arg(script));
-            mainScript.setValue(script);
+            setDefaultDisplayName(Tr::tr("Run %1").arg(bti.targetFilePath.toUserOutput()));
+            mainScript.setValue(bti.targetFilePath);
             workingDir.setDefaultWorkingDirectory(bti.targetFilePath.parentDir());
         });