Wip: Focus

Author: TheOneRing

src/gui/folderstatusmodel.cpp

@@ -32,6 +32,7 @@
 #include <QVarLengthArray>
 
 #include <set>
+#include <winrt/base.h>
 
 using namespace std::chrono_literals;
 
@@ -181,7 +182,7 @@ namespace {
 
 
 FolderStatusModel::FolderStatusModel(QObject *parent)
-    : QAbstractTableModel(parent)
+    : QAbstractListModel(parent)
     , _accountState(nullptr)
 {
 }
@@ -243,23 +244,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
     if (!f)
         return QVariant();
 
-    const auto getSpace = [&]() -> GraphApi::Space * {
-        if (_accountState->supportsSpaces()) {
-            return _accountState->account()->spacesManager()->space(f->spaceId());
-        }
-        return nullptr;
-    };
-
-    switch (static_cast<Roles>(role)) {
-    case Roles::Subtitle: {
-        if (auto *space = getSpace()) {
-            if (!space->drive().getDescription().isEmpty()) {
-                return space->drive().getDescription();
-            }
-        }
-        return tr("Local folder: %1").arg(f->shortGuiLocalPath());
-    }
-    case Roles::FolderErrorMsg: {
+    auto getErrors = [f] {
         auto errors = f->syncResult().errorStrings();
         const auto legacyError = FolderMan::instance()->unsupportedConfiguration(f->path());
         if (!legacyError) {
@@ -276,13 +261,24 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
             });
         }
         return errors;
-    }
-    case Roles::DisplayName: {
-        if (auto *space = getSpace()) {
-            return space->displayName();
+    };
+
+    auto getDescription = [f] {
+        if (auto *space = f->space()) {
+            if (!space->drive().getDescription().isEmpty()) {
+                return space->drive().getDescription();
+            }
         }
+        return tr("Local folder: %1").arg(f->shortGuiLocalPath());
+    };
+
+    switch (static_cast<Roles>(role)) {
+    case Roles::Subtitle:
+        return getDescription();
+    case Roles::FolderErrorMsg:
+        return getErrors();
+    case Roles::DisplayName:
         return f->displayName();
-    }
     case Roles::FolderImageUrl:
         if (f->accountState()->supportsSpaces()) {
             // TODO: the url hast random parts to enforce a reload
@@ -323,15 +319,17 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         }
         return tr("%1 of %2 used").arg(Utility::octetsToString(used), Utility::octetsToString(total));
     }
-    case Roles::ToolTip: {
-        if (_accountState->isConnected()) {
-            return tr("The status of %1 is %2").arg(f->displayName(), Utility::enumToDisplayName(f->syncResult().status()));
-        } else {
-            return tr("The account %1 is currently not connected.").arg(f->accountState()->account()->displayName());
-        }
-    }
     case Roles::Folder:
         return QVariant::fromValue(f);
+    case Roles::AccessibleDescriptionRole: {
+        QStringList desc = {f->displayName(), Utility::enumToDisplayName(f->syncResult().status())};
+        desc << getErrors();
+        if (f->syncResult().status() == SyncResult::SyncRunning) {
+            desc << folderInfo->_progress._overallSyncString << QStringLiteral("%1%").arg(QString::number(folderInfo->_progress._overallPercent));
+        }
+        desc << getDescription();
+        return desc.join(QLatin1Char(','));
+    }
     }
     return {};
 }
@@ -365,8 +363,8 @@ QHash<int, QByteArray> FolderStatusModel::roleNames() const
         {static_cast<int>(Roles::SyncProgressItemString), "itemText"},
         {static_cast<int>(Roles::FolderErrorMsg), "errorMsg"},
         {static_cast<int>(Roles::Quota), "quota"},
-        {static_cast<int>(Roles::ToolTip), "toolTip"},
         {static_cast<int>(Roles::Folder), "folder"},
+        {static_cast<int>(Roles::AccessibleDescriptionRole), "accessibleDescription"},
     };
 }
 

src/gui/folderstatusmodel.h

@@ -40,13 +40,13 @@ namespace {
  * @brief The FolderStatusModel class
  * @ingroup gui
  */
-class FolderStatusModel : public QAbstractTableModel
+class FolderStatusModel : public QAbstractListModel
 {
     Q_OBJECT
     QML_ELEMENT
 public:
     enum class Roles {
-        ToolTip = Qt::ToolTipRole,
+        AccessibleDescriptionRole,
         DisplayName = Qt::UserRole + 1, // must be 0 as it is also used from the default delegate
         Subtitle,
         FolderErrorMsg,

src/gui/qml/AccountBar.qml

@@ -60,7 +60,7 @@ Pane {
             Layout.maximumWidth: widthHint
             icon.source: "image://ownCloud/core/plus-solid"
             text: qsTr("Add Account")
-            visible: Theme.multiAccount | !AccountManager.accounts
+            visible: Theme.multiAccount || AccountManager.accounts.length === 0
 
             Keys.onBacktabPressed: event => {
                 // If there are no account buttons, we're the first button, so handle the back-tab

src/gui/qml/AccountButton.qml

@@ -27,7 +27,8 @@ ToolButton {
     implicitWidth: Math.min(implicitContentWidth + leftPadding + rightPadding, widthHint)
 
     // make the current button pop
-    palette.button: palette.highlight
+    // don't get highlight from our own palette or we create a binding loop
+    palette.button: parent.palette.highlight
 
     contentItem: ColumnLayout {
         spacing: control.spacing