[Pkg-owncloud-commits] [owncloud-client] 273/484: ActivityView: Add a second treeview for sync issues.

[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 cf9fec73cf5550516e6c72b4dff360ab3bcbb6ff
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Nov 6 11:43:43 2015 +0100

    ActivityView: Add a second treeview for sync issues.
    
    So there are three views now: One displaying the server activities, one for
    the sync protocol and a third one for ignored files and issues.
---
 src/gui/protocolwidget.cpp | 18 ++++++++++++++++--
 src/gui/protocolwidget.h   |  3 +++
 src/gui/settingsdialog.cpp |  6 +++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 5ecd4a9..a226763 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -27,6 +27,7 @@
 #include "folder.h"
 #include "openfilemanager.h"
 #include "owncloudpropagator.h"
+#include "activityitemdelegate.h"
 
 #include "ui_protocolwidget.h"
 
@@ -65,7 +66,6 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
 #if defined(Q_OS_MAC)
     _ui->_treeWidget->setMinimumWidth(400);
 #endif
-
     connect(this, SIGNAL(guiLog(QString,QString)), Logger::instance(), SIGNAL(guiLog(QString,QString)));
 
     _retrySyncBtn = _ui->_dialogButtonBox->addButton(tr("Retry Sync"), QDialogButtonBox::ActionRole);
@@ -76,6 +76,15 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
     _copyBtn->setToolTip( tr("Copy the activity list to the clipboard."));
     _copyBtn->setEnabled(false);
     connect(_copyBtn, SIGNAL(clicked()), SLOT(copyToClipboard()));
+
+    _issueItemView = new QTreeWidget(this);
+    header.removeLast();
+    _issueItemView->setHeaderLabels( header );
+    _issueItemView->setColumnWidth(1, 180);
+    _issueItemView->setColumnCount(4);
+    _issueItemView->setRootIsDecorated(false);
+    _issueItemView->setTextElideMode(Qt::ElideMiddle);
+    _issueItemView->header()->setObjectName("ActivityErrorListHeader");
 }
 
 ProtocolWidget::~ProtocolWidget()
@@ -233,6 +242,7 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo
         twitem->setData(0, IgnoredIndicatorRole, true);
     }
 
+    twitem->setData(0, Qt::SizeHintRole, QSize(0, ActivityItemDelegate::rowHeight()));
     twitem->setIcon(0, icon);
     twitem->setToolTip(0, longTimeStr);
     twitem->setToolTip(1, item._file);
@@ -286,7 +296,11 @@ void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem
 
     QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, item);
     if(line) {
-        _ui->_treeWidget->insertTopLevelItem(0, line);
+       if( item.hasErrorStatus() ) {
+            _issueItemView->insertTopLevelItem(0, line);
+        } else {
+            _ui->_treeWidget->insertTopLevelItem(0, line);
+        }
         if (!_copyBtn->isEnabled()) {
             _copyBtn->setEnabled(true);
         }
diff --git a/src/gui/protocolwidget.h b/src/gui/protocolwidget.h
index 1a07eca..610bea3 100644
--- a/src/gui/protocolwidget.h
+++ b/src/gui/protocolwidget.h
@@ -45,6 +45,8 @@ public:
     ~ProtocolWidget();
     QSize sizeHint() const { return ownCloudGui::settingsDialogSize(); }
 
+    QTreeWidget *issueWidget() { return _issueItemView; }
+
 public slots:
     void slotProgressInfo( const QString& folder, const ProgressInfo& progress );
     void slotItemCompleted( const QString& folder, const SyncFileItem& item, const PropagatorJob& job);
@@ -72,6 +74,7 @@ private:
 
     const int IgnoredIndicatorRole;
     Ui::ProtocolWidget *_ui;
+    QTreeWidget *_issueItemView;
     QPushButton *_retrySyncBtn;
     QPushButton *_copyBtn;
 };
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 980cb3c..d7b288f 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -86,7 +86,11 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
     _activityWidget = new ActivityWidget;
     _activityWidget->setParent(this);
     _ui->stack->addWidget(_activityWidget);
-    _activityWidget->tabWidget()->addTab(new ProtocolWidget(this), tr("Sync Protocol"));
+    _activityWidget->tabWidget()->setTabIcon(0, Theme::instance()->applicationIcon());
+
+    ProtocolWidget *pw = new ProtocolWidget(this);
+    _activityWidget->tabWidget()->addTab(pw, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));
+    _activityWidget->tabWidget()->addTab(pw->issueWidget(), Theme::instance()->syncStateIcon(SyncResult::Problem), tr("Not Synced"));
 
     QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General"));
     _actionGroup->addAction(generalAction);

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