feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: Base MainScriptAspect on FilePathAspect

Browse Source 
Instead of StringAspect.

Change-Id: Idc5cbe4a28ece5b053eee9f260be9a5f22912f81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-13 07:34:37 +02:00
parent 2cc3c3b681
commit 4cf878aecf
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -949,7 +949,7 @@ SymbolFileAspect::SymbolFileAspect(AspectContainer *container)
{} {}
MainScriptAspect::MainScriptAspect(AspectContainer *container) MainScriptAspect::MainScriptAspect(AspectContainer *container)
: StringAspect(container) : FilePathAspect(container)
{} {}
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/projectexplorer/runconfigurationaspects.h
View File

@@ -254,7 +254,7 @@ private:
Utils::Id m_settingsDialogId; Utils::Id m_settingsDialogId;
}; };
class PROJECTEXPLORER_EXPORT MainScriptAspect : public Utils::StringAspect class PROJECTEXPLORER_EXPORT MainScriptAspect : public Utils::FilePathAspect
{ {
Q_OBJECT Q_OBJECT

9
src/plugins/python/pythonrunconfiguration.cpp
View File

@@ -343,7 +343,7 @@ public:
mainScript.setSettingsKey("PythonEditor.RunConfiguation.Script"); mainScript.setSettingsKey("PythonEditor.RunConfiguation.Script");
mainScript.setLabelText(Tr::tr("Script:")); mainScript.setLabelText(Tr::tr("Script:"));
mainScript.setDisplayStyle(StringAspect::LabelDisplay); mainScript.setReadOnly(true);
environment.setSupportForBuildEnvironment(target); environment.setSupportForBuildEnvironment(target);
@@ -358,16 +358,15 @@ public:
CommandLine cmd{interpreter.currentInterpreter().command}; CommandLine cmd{interpreter.currentInterpreter().command};
if (!buffered()) if (!buffered())
cmd.addArg("-u"); cmd.addArg("-u");
cmd.addArg(mainScript.filePath().fileName()); cmd.addArg(mainScript().fileName());
cmd.addArgs(arguments(), CommandLine::Raw); cmd.addArgs(arguments(), CommandLine::Raw);
return cmd; return cmd;
}); });
setUpdater([this] { setUpdater([this] {
const BuildTargetInfo bti = buildTargetInfo(); const BuildTargetInfo bti = buildTargetInfo();
const QString script = bti.targetFilePath.toUserOutput(); setDefaultDisplayName(Tr::tr("Run %1").arg(bti.targetFilePath.toUserOutput()));
setDefaultDisplayName(Tr::tr("Run %1").arg(script)); mainScript.setValue(bti.targetFilePath);
mainScript.setValue(script);
workingDir.setDefaultWorkingDirectory(bti.targetFilePath.parentDir()); workingDir.setDefaultWorkingDirectory(bti.targetFilePath.parentDir());
}); });