Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong "Rescan ..." in file item action

This commit is contained in:
Martchus 2018-12-22 16:27:08 +01:00
parent b599da308e
commit 52f6e51e1a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fileitemactionplugin/syncthingfileitemaction.cpp
View File

@ -29,8 +29,8 @@ SyncthingItem::SyncthingItem(const SyncthingDir *dir, const QString &path)
: dir(dir)
, path(path)
{
int lastSep = path.lastIndexOf(QChar('/'));
if (lastSep > 0) {
const auto lastSep = path.lastIndexOf(QChar('/'));
if (lastSep >= 0) {
name = path.mid(lastSep + 1);
} else {
name = path;
@ -108,10 +108,13 @@ QList<QAction *> SyncthingFileItemAction::createActions(const KFileItemListPrope
// add actions for the selected items itself
actions.reserve(32);
if (!detectedItems.isEmpty()) {
actions << new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")),
detectedItems.size() == 1 ? tr("Rescan \"%1\" (in \"%2\")").arg(detectedItems.front().name, detectedItems.front().dir->displayName())
: tr("Rescan selected items"),
parentWidget);
QString rescanLabel;
if (detectedItems.size() > 1) {
rescanLabel = tr("Rescan selected items");
} else {
rescanLabel = tr("Rescan \"%1\"").arg(detectedItems.front().name);
}
actions << new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), rescanLabel, parentWidget);
if (connection.isConnected()) {
for (const SyncthingItem &item : detectedItems) {
connect(actions.back(), &QAction::triggered, bind(&SyncthingFileItemActionStaticData::rescanDir, &data, item.dir->id, item.path));