From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Tue, 19 May 2020 22:09:41 +0000 (+0200) Subject: More code cleanupand style-preference adjustments. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~198^2~6 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9bfcdbae3a8ad5925217fd367b0a622cd9aaf180;p=nextcloud-desktop.git More code cleanupand style-preference adjustments. Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index b9cc1e421..27904376c 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -89,9 +89,10 @@ ownCloudGui::ownCloudGui(Application *parent) connect(_tray.data(), &Systray::shutdown, this, &ownCloudGui::slotShutdown); + connect(_tray.data(), &Systray::openShareDialog, this, [=](const QString &sharePath, const QString &localPath) { - slotShowShareDialog(sharePath,localPath, ShareDialogStartPage::UsersAndGroups); + slotShowShareDialog(sharePath, localPath, ShareDialogStartPage::UsersAndGroups); }); ProgressDispatcher *pd = ProgressDispatcher::instance(); diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index ac1fa9848..2f2eaf4f8 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -602,7 +602,9 @@ Window { Text { id: activityTextInfo - text: (type === "Activity" || type === "Sync") ? displayPath : ((type === "File") ? subject : message) + text: (type === "Activity" || type === "Sync") ? displayPath + : ((type === "File") ? subject + : message) height: (text === "") ? 0 : activityTextTitle.height width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8 elide: Text.ElideRight