[Pkg-owncloud-commits] [owncloud-client] 47/120: UI: Fix up 6152ce4187d253fc2495e5d87093df3ca18be582 #3595

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit dc44ebf41b54536aeb29261cd4e8b686c4d6a06b
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Aug 12 09:08:30 2015 +0200

    UI: Fix up 6152ce4187d253fc2495e5d87093df3ca18be582 #3595
---
 src/gui/folderstatusdelegate.cpp | 2 +-
 src/gui/folderstatusdelegate.h   | 1 +
 src/gui/folderstatusmodel.cpp    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index d836c85..4f0d757 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -132,7 +132,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     int margin = subFm.height()/4;
 
     QIcon statusIcon      = qvariant_cast<QIcon>(index.data(FolderStatusIconRole));
-    QString aliasText     = qvariant_cast<QString>(index.data(FolderAliasRole));
+    QString aliasText     = qvariant_cast<QString>(index.data(HeaderRole));
     QString pathText      = qvariant_cast<QString>(index.data(FolderPathRole));
     QString remotePath    = qvariant_cast<QString>(index.data(FolderSecondPathRole));
     QStringList errorTexts= qvariant_cast<QStringList>(index.data(FolderErrorMsg));
diff --git a/src/gui/folderstatusdelegate.h b/src/gui/folderstatusdelegate.h
index a6585f3..a7b6795 100644
--- a/src/gui/folderstatusdelegate.h
+++ b/src/gui/folderstatusdelegate.h
@@ -28,6 +28,7 @@ class FolderStatusDelegate : public QStyledItemDelegate
 public:
 
     enum datarole { FolderAliasRole = Qt::UserRole + 100,
+                    HeaderRole,
                     FolderPathRole,
                     FolderSecondPathRole,
                     FolderRemotePath,
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index b9ec109..5b32bc6 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -156,7 +156,8 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
     switch (role) {
     case FolderStatusDelegate::FolderPathRole         : return  f->nativePath();
     case FolderStatusDelegate::FolderSecondPathRole   : return  f->remotePath();
-    case FolderStatusDelegate::FolderAliasRole        : return  f->aliasGui();
+    case FolderStatusDelegate::HeaderRole             : return  f->aliasGui();
+    case FolderStatusDelegate::FolderAliasRole        : return  f->alias();
     case FolderStatusDelegate::FolderSyncPaused       : return  f->syncPaused();
     case FolderStatusDelegate::FolderAccountConnected : return  accountConnected;
     case Qt::ToolTipRole:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git