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

Utils: Return FilePath from PathChooser::homePath()

Browse Source 
Change-Id: Ib67435cb828e6bb55f76bfd6eb13165f46922c00
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-08-16 09:43:03 +02:00
parent 906348ed50
commit 0416e15612
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/pathchooser.cpp
View File

@@ -641,14 +641,14 @@ QString PathChooser::label()
return tr("Path:");
}
QString PathChooser::homePath()
FilePath PathChooser::homePath()
{
// Return 'users/<name>/Documents' on Windows, since Windows explorer
// does not let people actually display the contents of their home
// directory. Alternatively, create a QtCreator-specific directory?
if (HostOsInfo::isWindowsHost())
return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
return QDir::homePath();
return FilePath::fromString(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
return FilePath::fromString(QDir::homePath());
}
/*!

2
src/libs/utils/pathchooser.h
View File

@@ -110,7 +110,7 @@ public:
void setValidationFunction(const FancyLineEdit::ValidationFunction &fn);
/** Return the home directory, which needs some fixing under Windows. */
static QString homePath();
static FilePath homePath();
void addButton(const QString &text, QObject *context, const std::function<void()> &callback);
void insertButton(int index, const QString &text, QObject *context, const std::function<void()> &callback);

4
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -1369,7 +1369,7 @@ void DocumentManager::saveSettings()
s->beginGroup(directoryGroupC);
s->setValueWithDefault(projectDirectoryKeyC,
d->m_projectsDirectory.toString(),
PathChooser::homePath());
PathChooser::homePath().toString());
s->setValueWithDefault(useProjectDirectoryKeyC,
d->m_useProjectsDirectory,
kUseProjectsDirectoryDefault);
@@ -1400,7 +1400,7 @@ void readSettings()
if (!settingsProjectDir.isEmpty() && settingsProjectDir.isDir())
d->m_projectsDirectory = settingsProjectDir;
else
d->m_projectsDirectory = FilePath::fromString(PathChooser::homePath());
d->m_projectsDirectory = PathChooser::homePath();
d->m_useProjectsDirectory
= s->value(QLatin1String(useProjectDirectoryKeyC), kUseProjectsDirectoryDefault).toBool();

3
src/plugins/git/gitplugin.cpp
View File

@@ -1208,8 +1208,7 @@ void GitPluginPrivate::startChangeRelatedAction(const Id &id)
{
const VcsBasePluginState state = currentState();
ChangeSelectionDialog dialog(state.hasTopLevel()
? state.topLevel() : FilePath::fromString(PathChooser::homePath()),
ChangeSelectionDialog dialog(state.hasTopLevel() ? state.topLevel() : PathChooser::homePath(),
id, ICore::dialogParent());
int result = dialog.exec();

6
src/plugins/incredibuild/buildconsolebuildstep.cpp
View File

@@ -128,7 +128,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
profileXml->setLabelText(tr("Profile.xml:"));
profileXml->setDisplayStyle(StringAspect::PathChooserDisplay);
profileXml->setExpectedKind(PathChooser::Kind::File);
profileXml->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
profileXml->setBaseFileName(PathChooser::homePath());
profileXml->setHistoryCompleter("IncrediBuild.BuildConsole.ProfileXml.History");
profileXml->setToolTip(tr("Defines how Automatic "
"Interception Interface should handle the various processes "
@@ -190,7 +190,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
monFile->setLabelText(tr("Save IncrediBuild monitor file:"));
monFile->setDisplayStyle(StringAspect::PathChooserDisplay);
monFile->setExpectedKind(PathChooser::Kind::Any);
monFile->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
monFile->setBaseFileName(PathChooser::homePath());
monFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.MonFile.History"));
monFile->setToolTip(tr("Writes a copy of the build progress file (.ib_mon) to the specified "
"location. If only a folder name is given, a generated GUID will serve "
@@ -207,7 +207,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
logFile->setLabelText(tr("Output Log file:"));
logFile->setDisplayStyle(StringAspect::PathChooserDisplay);
logFile->setExpectedKind(PathChooser::Kind::SaveFile);
logFile->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
logFile->setBaseFileName(PathChooser::homePath());
logFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.LogFile.History"));
logFile->setToolTip(tr("Writes build output to a file."));

2
src/plugins/incredibuild/commandbuilderaspect.cpp
View File

@@ -150,7 +150,7 @@ void CommandBuilderAspect::addToLayout(LayoutBuilder &builder)
if (!d->makePathChooser) {
d->makePathChooser = new PathChooser;
d->makePathChooser->setExpectedKind(PathChooser::Kind::ExistingCommand);
d->makePathChooser->setBaseDirectory(FilePath::fromString(PathChooser::homePath()));
d->makePathChooser->setBaseDirectory(PathChooser::homePath());
d->makePathChooser->setHistoryCompleter("IncrediBuild.BuildConsole.MakeCommand.History");
connect(d->makePathChooser, &PathChooser::rawPathChanged, this, [this] {
d->m_activeCommandBuilder->setCommand(d->makePathChooser->rawPath());

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

@@ -75,7 +75,7 @@ MakeStep::MakeStep(BuildStepList *parent, Id id)
m_makeCommandAspect->setSettingsKey(id.withSuffix(MAKE_COMMAND_SUFFIX).toString());
m_makeCommandAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
m_makeCommandAspect->setExpectedKind(PathChooser::ExistingCommand);
m_makeCommandAspect->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
m_makeCommandAspect->setBaseFileName(PathChooser::homePath());
m_makeCommandAspect->setHistoryCompleter("PE.MakeCommand.History");
m_userArgumentsAspect = addAspect<StringAspect>();