Redesign local folder information in the account adding wizard

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

Author: claucambra

src/gui/CMakeLists.txt

@@ -245,6 +245,8 @@ set(client_SRCS
     wizard/welcomepage.cpp
     wizard/linklabel.h
     wizard/linklabel.cpp
+    wizard/elidedfilepathlabel.h
+    wizard/elidedfilepathlabel.cpp
     )
 
 if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)

src/gui/wizard/elidedfilepathlabel.cpp

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 by Claudio Cambra <claudio.cambra@nextcloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "elidedfilepathlabel.h"
+
+#include <QDir>
+
+namespace OCC {
+
+ElidedFilePathLabel::ElidedFilePathLabel(QWidget *parent)
+    : QLabel(parent)
+{
+    setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+}
+
+QString ElidedFilePathLabel::filePath() const
+{
+    return _fullPath;
+}
+
+void ElidedFilePathLabel::setFilePath(const QString &filePath)
+{
+    _fullPath = filePath;
+    Q_EMIT filePathChanged();
+    updateLabelText();
+}
+
+void ElidedFilePathLabel::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+    updateLabelText();
+}
+
+void ElidedFilePathLabel::updateLabelText()
+{
+    const QFontMetrics metrics(font());
+    const auto elidedPath = metrics.elidedText(QDir::toNativeSeparators(_fullPath), Qt::ElideMiddle, width());
+    setText(elidedPath);
+}
+
+}

src/gui/wizard/elidedfilepathlabel.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 by Claudio Cambra <claudio.cambra@nextcloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#pragma once
+
+#include <QLabel>
+
+namespace OCC {
+
+class ElidedFilePathLabel : public QLabel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString filePath READ filePath WRITE setFilePath NOTIFY filePathChanged)
+
+public:
+    ElidedFilePathLabel(QWidget *parent = nullptr);
+
+    QString filePath() const;
+    void setFilePath(const QString &filePath);
+
+signals:
+    void filePathChanged();
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+
+private:
+    void updateLabelText();
+    QString _fullPath;
+};
+
+}

src/gui/wizard/owncloudadvancedsetuppage.cpp

@@ -43,9 +43,11 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage(OwncloudWizard *wizard)
     , _ocWizard(wizard)
 {
     _ui.setupUi(this);
-
     setupResoultionWidget();
 
+    _filePathLabel.reset(new ElidedFilePathLabel);
+    _ui.locationsGridLayout->addWidget(_filePathLabel.data(), 3, 3);
+
     registerField(QLatin1String("OCSyncFromScratch"), _ui.cbSyncFromScratch);
 
     auto sizePolicy = _progressIndi->sizePolicy();
@@ -116,6 +118,7 @@ void OwncloudAdvancedSetupPage::setupCustomization()
     variant = theme->customMedia(Theme::oCSetupBottom);
     WizardCommon::setupCustomMedia(variant, _ui.bottomLabel);
 
+    WizardCommon::customizeHintLabel(_filePathLabel.data());
     WizardCommon::customizeHintLabel(_ui.lFreeSpace);
     WizardCommon::customizeHintLabel(_ui.lSyncEverythingSizeLabel);
     WizardCommon::customizeHintLabel(_ui.lSelectiveSyncSizeLabel);
@@ -188,10 +191,11 @@ void OwncloudAdvancedSetupPage::fetchUserAvatar()
 {
     // Reset user avatar
     const auto appIcon = Theme::instance()->applicationIcon();
-    _ui.lServerIcon->setPixmap(appIcon.pixmap(48));
+    // To match the folder icon opposite the avatar -- that is 60x60, minus padding
+    _ui.lServerIcon->setPixmap(appIcon.pixmap(32));
     // Fetch user avatar
     const auto account = _ocWizard->account();
-    auto avatarSize = 64;
+    auto avatarSize = 32;
     if (Theme::isHidpi()) {
         avatarSize *= 2;
     }
@@ -256,8 +260,6 @@ void OwncloudAdvancedSetupPage::updateStatus()
 
     QString t;
 
-    setLocalFolderPushButtonPath(locFolder);
-
     if (dataChanged()) {
         if (_remoteFolder.isEmpty() || _remoteFolder == QLatin1String("/")) {
             t = "";
@@ -277,6 +279,8 @@ void OwncloudAdvancedSetupPage::updateStatus()
         setResolutionGuiVisible(false);
     }
 
+    _filePathLabel->setFilePath(locFolder);
+
     QString lfreeSpaceStr = Utility::octetsToString(availableLocalSpace());
     _ui.lFreeSpace->setText(QString(tr("%1 free space", "%1 gets replaced with the size and a matching unit. Example: 3 MB or 5 GB")).arg(lfreeSpaceStr));
 
@@ -428,7 +432,6 @@ void OwncloudAdvancedSetupPage::slotSelectFolder()
         // TODO: remove when UX decision is made
         refreshVirtualFilesAvailibility(dir);
 
-        setLocalFolderPushButtonPath(dir);
         wizard()->setProperty("localFolder", dir);
         updateStatus();
     }
@@ -438,22 +441,6 @@ void OwncloudAdvancedSetupPage::slotSelectFolder()
     setErrorString(errorStr);
 }
 
-
-void OwncloudAdvancedSetupPage::setLocalFolderPushButtonPath(const QString &path)
-{
-    const auto homeDir = QDir::homePath().endsWith('/') ? QDir::homePath() : QDir::homePath() + QLatin1Char('/');
-
-    if (!path.startsWith(homeDir)) {
-        _ui.pbSelectLocalFolder->setText(QDir::toNativeSeparators(path));
-        return;
-    }
-
-    auto prettyPath = path;
-    prettyPath.remove(0, homeDir.size());
-
-    _ui.pbSelectLocalFolder->setText(QDir::toNativeSeparators(prettyPath));
-}
-
 void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
 {
     AccountPtr acc = static_cast<OwncloudWizard *>(wizard())->account();

src/gui/wizard/owncloudadvancedsetuppage.h

@@ -20,6 +20,7 @@
 
 #include "wizard/owncloudwizardcommon.h"
 #include "ui_owncloudadvancedsetuppage.h"
+#include "elidedfilepathlabel.h"
 
 class QProgressIndicator;
 
@@ -76,7 +77,6 @@ private slots:
     QString checkLocalSpace(qint64 remoteSize) const;
     void customizeStyle();
     void setServerAddressLabelUrl(const QUrl &url);
-    void setLocalFolderPushButtonPath(const QString &path);
     void styleSyncLogo();
     void styleLocalFolderLabel();
     void setResolutionGuiVisible(bool value);
@@ -93,10 +93,12 @@ private slots:
     bool _localFolderValid = false;
     QProgressIndicator *_progressIndi;
     QString _remoteFolder;
+    QString _localPath;
     QStringList _selectiveSyncBlacklist;
     qint64 _rSize = -1;
     qint64 _rSelectedSize = -1;
     OwncloudWizard *_ocWizard;
+    QScopedPointer<ElidedFilePathLabel> _filePathLabel;
 };
 
 } // namespace OCC