Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/elidedtext #7679

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −2
Open

Bugfix/elidedtext #7679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
095309c
Use Qt::ElideRight.
camilasan Dec 17, 2024
cf0fe1b
Remove extra \n.
camilasan Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/folderman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,7 @@ Result<void, QString> FolderMan::unsupportedConfiguration(const QString &path) c
if (numberOfSyncJournals(path) > 1) {
return tr("The folder %1 is linked to multiple accounts.\n"
"This setup can cause data loss and it is no longer supported.\n"
"To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.\n\n"
"To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.\n"
"For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.")
.arg(path);
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/folderstatusdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/gui/folderstatusdelegate.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on src/gui/folderstatusdelegate.cpp 

File src/gui/folderstatusdelegate.cpp does not conform to Custom style guidelines. (lines 276)
* Copyright (C) by Klaas Freitag <freitag@kde.org>
* Copyright (C) by Olivier Goffart <ogoffart@woboq.com>
*
Expand Down Expand Up @@ -273,7 +273,7 @@
subFm.height());

for (const auto &eText : texts) {
painter->drawText(QStyle::visualRect(option.direction, option.rect, textRect), textAlign, subFm.elidedText(eText, Qt::ElideLeft, textRect.width()));
painter->drawText(QStyle::visualRect(option.direction, option.rect, textRect), textAlign, subFm.elidedText(eText, Qt::ElideRight, textRect.width()));
textRect.translate(0, textRect.height());
}
// restore previous state
Expand Down
Loading