mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
Tray tooltip: Use aliasGui #4096
This commit is contained in:
parent
05d1cc9a94
commit
c871d721fd
1 changed files with 1 additions and 8 deletions
|
@ -286,7 +286,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
|
||||||
foreach(Folder* folder, map.values()) {
|
foreach(Folder* folder, map.values()) {
|
||||||
qDebug() << "Folder in overallStatus Message: " << folder << " with name " << folder->alias();
|
qDebug() << "Folder in overallStatus Message: " << folder << " with name " << folder->alias();
|
||||||
QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused());
|
QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused());
|
||||||
allStatusStrings += tr("Folder %1: %2").arg(folder->alias(), folderMessage);
|
allStatusStrings += tr("Folder %1: %2").arg(folder->aliasGui(), folderMessage);
|
||||||
}
|
}
|
||||||
trayMessage = allStatusStrings.join(QLatin1String("\n"));
|
trayMessage = allStatusStrings.join(QLatin1String("\n"));
|
||||||
#endif
|
#endif
|
||||||
|
@ -331,13 +331,6 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
|
||||||
menu->addAction(tr("Managed Folders:"))->setDisabled(true);
|
menu->addAction(tr("Managed Folders:"))->setDisabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there can only be a single sync folder, showing the alias is
|
|
||||||
// unnecessary.
|
|
||||||
QString folderName = folder->alias();
|
|
||||||
if (singleSyncFolder) {
|
|
||||||
folderName = Theme::instance()->appNameGUI();
|
|
||||||
}
|
|
||||||
|
|
||||||
QAction *action = new QAction( tr("Open folder '%1'").arg(folder->path()), this );
|
QAction *action = new QAction( tr("Open folder '%1'").arg(folder->path()), this );
|
||||||
connect(action, SIGNAL(triggered()),_folderOpenActionMapper, SLOT(map()));
|
connect(action, SIGNAL(triggered()),_folderOpenActionMapper, SLOT(map()));
|
||||||
_folderOpenActionMapper->setMapping( action, folder->alias() );
|
_folderOpenActionMapper->setMapping( action, folder->alias() );
|
||||||
|
|
Loading…
Reference in a new issue