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

PE: Welcome: Fix displaying project paths

Browse Source 
Do not use native separators by default as the separators
depend on the context.

Change-Id: I28e73395ae2d7bb71774c060dd9540dc48c4c992
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-09-30 10:50:52 +02:00
parent b7c15d4d8d
commit f4a7c74daa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/projectwelcomepage.cpp
View File

@@ -320,14 +320,14 @@ public:
QFontMetrics fm(option.widget->font()); QFontMetrics fm(option.widget->font());
for (const QString &project : projects) { for (const QString &project : projects) {
// Project name. // Project name.
QFileInfo fi(project); FilePath projectPath = FilePath::fromString(project);
QString completeBase = fi.completeBaseName(); QString completeBase = projectPath.completeBaseName();
painter->setPen(textColor); painter->setPen(textColor);
painter->drawText(x1, yy, completeBase); painter->drawText(x1, yy, completeBase);
yy += 18; yy += 18;
// Project path. // Project path.
QString pathWithTilde = Utils::withTildeHomePath(QDir::toNativeSeparators(project)); QString pathWithTilde = Utils::withTildeHomePath(projectPath.toUserOutput());
painter->setPen(foregroundColor1); painter->setPen(foregroundColor1);
painter->drawText(x1, yy, fm.elidedText(pathWithTilde, Qt::ElideMiddle, rc.width() - 40)); painter->drawText(x1, yy, fm.elidedText(pathWithTilde, Qt::ElideMiddle, rc.width() - 40));
yy += 22; yy += 22;
@@ -454,7 +454,7 @@ public:
painter->drawPixmap(x + 11, y + 6, projectIcon); painter->drawPixmap(x + 11, y + 6, projectIcon);
QString projectName = idx.data(Qt::DisplayRole).toString(); QString projectName = idx.data(Qt::DisplayRole).toString();
QString projectPath = idx.data(ProjectModel::FilePathRole).toString(); FilePath projectPath = FilePath::fromVariant(idx.data(ProjectModel::FilePathRole));
painter->setPen(themeColor(Theme::Welcome_ForegroundSecondaryColor)); painter->setPen(themeColor(Theme::Welcome_ForegroundSecondaryColor));
painter->setFont(sizedFont(10, option.widget)); painter->setFont(sizedFont(10, option.widget));
@@ -468,7 +468,7 @@ public:
painter->setPen(themeColor(Theme::Welcome_ForegroundPrimaryColor)); painter->setPen(themeColor(Theme::Welcome_ForegroundPrimaryColor));
painter->setFont(sizedFont(13, option.widget)); painter->setFont(sizedFont(13, option.widget));
QString pathWithTilde = Utils::withTildeHomePath(QDir::toNativeSeparators(projectPath)); QString pathWithTilde = Utils::withTildeHomePath(projectPath.toUserOutput());
painter->drawText(x + 36, secondBase, pathWithTilde); painter->drawText(x + 36, secondBase, pathWithTilde);
} }