New Activity View

src/gui/CMakeLists.txt

@@ -21,6 +21,8 @@ set(client_UI
     ignorelisteditor.ui
     networksettings.ui
     protocolwidget.ui
+    activitywidget.ui
+    synclogdialog.ui
     settingsdialog.ui
     sharedialog.ui
     sslerrordialog.ui
@@ -54,6 +56,8 @@ set(client_SRCS
     owncloudgui.cpp
     owncloudsetupwizard.cpp
     protocolwidget.cpp
+    activitywidget.cpp
+    activityitemdelegate.cpp
     selectivesyncdialog.cpp
     settingsdialog.cpp
     sharedialog.cpp
@@ -68,6 +72,7 @@ set(client_SRCS
     authenticationdialog.cpp
     proxyauthhandler.cpp
     proxyauthdialog.cpp
+    synclogdialog.cpp
     creds/credentialsfactory.cpp
     creds/httpcredentialsgui.cpp
     creds/shibbolethcredentials.cpp

src/gui/accountmanager.cpp

@@ -215,6 +215,16 @@ AccountPtr AccountManager::load(QSettings& settings)
     return acc;
 }
 
+AccountStatePtr AccountManager::account(const QString& name)
+{
+    foreach (const auto& acc, _accounts) {
+        if (acc->account()->displayName() == name) {
+            return acc;
+        }
+    }
+    return AccountStatePtr();
+}
+
 AccountState *AccountManager::addAccount(const AccountPtr& newAccount)
 {
     auto id = newAccount->id();

src/gui/accountmanager.h

@@ -58,6 +58,11 @@ class AccountManager : public QObject {
      */
     QList<AccountStatePtr> accounts() { return _accounts; }
 
+    /**
+     * Return the account state pointer for an account identified by its display name
+     */
+    AccountStatePtr account(const QString& name);
+
     /**
      * Delete the AccountState
      */

src/gui/activityitemdelegate.cpp

@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) by Klaas Freitag <[email protected]>
+ * Copyright (C) by Olivier Goffart <[email protected]>
+ *
+ *
+ * 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 "activityitemdelegate.h"
+#include "folderstatusmodel.h"
+#include "folderman.h"
+#include "accountstate.h"
+#include "utility.h"
+#include <theme.h>
+#include <account.h>
+
+#include <QFileIconProvider>
+#include <QPainter>
+#include <QApplication>
+
+namespace OCC {
+
+int ActivityItemDelegate::_iconHeight = 0;
+int ActivityItemDelegate::_margin = 0;
+
+int ActivityItemDelegate::iconHeight()
+{
+    if( _iconHeight == 0 ) {
+        QStyleOptionViewItem option;
+        QFont font = option.font;
+
+        QFontMetrics fm(font);
+
+        _iconHeight = qRound(fm.height() / 5.0 * 8.0);
+    }
+    return _iconHeight;
+}
+
+int ActivityItemDelegate::rowHeight()
+{
+    if( _margin == 0 ) {
+    QStyleOptionViewItem opt;
+
+    QFont f = opt.font;
+    QFontMetrics fm(f);
+
+    _margin = fm.height()/4;
+    }
+    return iconHeight() + 2 * _margin;
+}
+
+QSize ActivityItemDelegate::sizeHint(const QStyleOptionViewItem & option ,
+                                     const QModelIndex & /* index */) const
+{
+    QFont font = option.font;
+
+    return QSize( 0, rowHeight() );
+}
+
+void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) const
+{
+    QStyledItemDelegate::paint(painter,option,index);
+
+    QFont font = option.font;
+
+    QFontMetrics fm( font );
+    int margin = fm.height()/4;
+
+    painter->save();
+
+    QIcon actionIcon      = qvariant_cast<QIcon>(index.data(ActionIconRole));
+    QIcon userIcon        = qvariant_cast<QIcon>(index.data(UserIconRole));
+    QString actionText    = qvariant_cast<QString>(index.data(ActionTextRole));
+    QString pathText      = qvariant_cast<QString>(index.data(PathRole));
+
+    QString remoteLink    = qvariant_cast<QString>(index.data(LinkRole));
+    QString timeText      = qvariant_cast<QString>(index.data(PointInTimeRole));
+    QString accountRole   = qvariant_cast<QString>(index.data(AccountRole));
+    bool    accountOnline = qvariant_cast<bool>   (index.data(AccountConnectedRole));
+
+    QRect actionIconRect = option.rect;
+    QRect userIconRect   = option.rect;
+
+    int iconHeight = qRound(fm.height() / 5.0 * 8.0);
+    int iconWidth = iconHeight;
+
+    actionIconRect.setLeft( option.rect.left() + margin );
+    actionIconRect.setWidth( iconWidth );
+    actionIconRect.setHeight( iconHeight );
+    actionIconRect.setTop( actionIconRect.top() + margin );
+    userIconRect.setLeft( actionIconRect.right() + margin );
+    userIconRect.setWidth( iconWidth );
+    userIconRect.setHeight( iconHeight );
+    userIconRect.setTop( actionIconRect.top() );
+
+    int textTopOffset = qRound( (iconHeight - fm.height())/ 2.0 );
+    // time rect
+    QRect timeBox;
+    int timeBoxWidth = fm.boundingRect(QLatin1String("4 hour(s) ago on longlongdomain.org")).width(); // FIXME.
+    timeBox.setTop( actionIconRect.top()+textTopOffset);
+    timeBox.setLeft( option.rect.right() - timeBoxWidth- margin );
+    timeBox.setWidth( timeBoxWidth);
+    timeBox.setHeight( fm.height() );
+
+    QRect actionTextBox = timeBox;
+    actionTextBox.setLeft( userIconRect.right()+margin );
+    actionTextBox.setRight( timeBox.left()-margin );
+
+    /* === start drawing === */
+    QPixmap pm = actionIcon.pixmap(iconWidth, iconHeight, QIcon::Normal);
+    painter->drawPixmap(QPoint(actionIconRect.left(), actionIconRect.top()), pm);
+
+    pm = userIcon.pixmap(iconWidth, iconHeight, QIcon::Normal);
+    painter->drawPixmap(QPoint(userIconRect.left(), userIconRect.top()), pm);
+
+    const QString elidedAction = fm.elidedText(actionText, Qt::ElideRight, actionTextBox.width());
+    painter->drawText(actionTextBox, elidedAction);
+
+    int atPos = accountRole.indexOf(QLatin1Char('@'));
+    if( atPos > -1 )  {
+        accountRole.remove(0, atPos+1);
+    }
+
+    QString timeStr = tr("%1 on %2").arg(timeText).arg(accountRole);
+    if( !accountOnline ) {
+        QPalette p = option.palette;
+        painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
+        timeStr.append(" ");
+        timeStr.append(tr("(disconnected)"));
+    }
+    const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, timeBox.width());
+
+    painter->drawText(timeBox, elidedTime);
+    painter->restore();
+
+}
+
+bool ActivityItemDelegate::editorEvent ( QEvent * event, QAbstractItemModel * model,
+                                         const QStyleOptionViewItem & option, const QModelIndex & index )
+{
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+}
+
+} // namespace OCC

src/gui/activityitemdelegate.h

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) by Klaas Freitag <[email protected]>
+ * Copyright (C) by Olivier Goffart <[email protected]>
+ *
+ * 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 <QStyledItemDelegate>
+
+namespace OCC {
+
+/**
+ * @brief The ActivityItemDelegate class
+ * @ingroup gui
+ */
+class ActivityItemDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+
+    enum datarole { ActionIconRole = Qt::UserRole + 1,
+                    UserIconRole,
+                    AccountRole,
+                    ActionTextRole,
+                    PathRole,
+                    LinkRole,
+                    PointInTimeRole,
+                    AccountConnectedRole };
+
+    void paint( QPainter*, const QStyleOptionViewItem&, const QModelIndex& ) const Q_DECL_OVERRIDE;
+    QSize sizeHint( const QStyleOptionViewItem&, const QModelIndex& ) const Q_DECL_OVERRIDE;
+    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option,
+                      const QModelIndex& index ) Q_DECL_OVERRIDE;
+
+    static int rowHeight();
+    static int iconHeight();
+
+private:
+    static int _margin;
+    static int _iconHeight;
+};
+
+} // namespace OCC
+