More code cleanupand style-preference adjustments.
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 19 May 2020 22:09:41 +0000 (00:09 +0200)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 19 May 2020 22:09:41 +0000 (00:09 +0200)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/owncloudgui.cpp
src/gui/tray/Window.qml

index b9cc1e421d4cfdaa1b93a297b88fe126111b780f..27904376c7be43f9995b651d578aee4625539a5c 100644 (file)
@@ -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();
index ac1fa9848502c13df5713a9d410db4176daad75f..2f2eaf4f8b524458265ee4c4ce8ae9e7cf54e2c6 100644 (file)
@@ -602,7 +602,9 @@ Window {
 \r
                     Text {\r
                         id: activityTextInfo\r
-                        text: (type === "Activity" || type === "Sync") ? displayPath : ((type === "File") ? subject : message)\r
+                        text: (type === "Activity" || type === "Sync") ? displayPath\r
+                            : ((type === "File") ? subject\r
+                            : message)\r
                         height: (text === "") ? 0 : activityTextTitle.height\r
                         width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8\r
                         elide: Text.ElideRight\r