[Pkg-owncloud-commits] [owncloud-client] 331/484: Merge branch 'newactivity'

[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 87aa1de67aabf25db9a163347e79b702e52f9632
Merge: 74ed0b4 ccb871c
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Nov 16 17:02:05 2015 +0100

    Merge branch 'newactivity'

 src/gui/CMakeLists.txt           |   5 +
 src/gui/accountmanager.cpp       |  10 +
 src/gui/accountmanager.h         |   5 +
 src/gui/activityitemdelegate.cpp | 153 +++++++++++++
 src/gui/activityitemdelegate.h   |  53 +++++
 src/gui/activitywidget.cpp       | 462 +++++++++++++++++++++++++++++++++++++++
 src/gui/activitywidget.h         | 195 +++++++++++++++++
 src/gui/activitywidget.ui        |  38 ++++
 src/gui/folderman.cpp            |  18 ++
 src/gui/folderman.h              |   7 +
 src/gui/generalsettings.cpp      |   2 +
 src/gui/generalsettings.h        |   2 +
 src/gui/generalsettings.ui       |  67 ++++--
 src/gui/owncloudgui.cpp          |   4 +
 src/gui/protocolwidget.cpp       | 150 ++++++++-----
 src/gui/protocolwidget.h         |  15 +-
 src/gui/protocolwidget.ui        |  92 ++++----
 src/gui/settingsdialog.cpp       |  44 +++-
 src/gui/settingsdialog.h         |   9 +-
 src/gui/synclogdialog.cpp        |  52 +++++
 src/gui/synclogdialog.h          |  51 +++++
 src/gui/synclogdialog.ui         |  38 ++++
 src/libsync/networkjobs.cpp      |   9 +-
 src/libsync/networkjobs.h        |  14 ++
 src/libsync/utility.cpp          |   9 +
 src/libsync/utility.h            |   2 +
 26 files changed, 1364 insertions(+), 142 deletions(-)

diff --cc src/gui/CMakeLists.txt
index 1c7832d,6fe16fb..2cf4886
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@@ -21,11 -21,10 +21,13 @@@ set(client_U
      ignorelisteditor.ui
      networksettings.ui
      protocolwidget.ui
+     activitywidget.ui
+     synclogdialog.ui
      settingsdialog.ui
      sharedialog.ui
 +    sharelinkwidget.ui
 +    shareusergroupwidget.ui
 +    sharewidget.ui
      sslerrordialog.ui
      owncloudsetuppage.ui
      addcertificatedialog.ui
@@@ -60,13 -56,11 +62,15 @@@ set(client_SRC
      owncloudgui.cpp
      owncloudsetupwizard.cpp
      protocolwidget.cpp
+     activitywidget.cpp
+     activityitemdelegate.cpp
      selectivesyncdialog.cpp
      settingsdialog.cpp
 +    share.cpp
      sharedialog.cpp
 +    sharelinkwidget.cpp
 +    shareusergroupwidget.cpp
 +    sharee.cpp
      socketapi.cpp
      sslbutton.cpp
      sslerrordialog.cpp
diff --cc src/gui/settingsdialog.cpp
index 0d983e8,f086148..d329e03
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@@ -81,15 -78,19 +82,17 @@@ SettingsDialog::SettingsDialog(ownCloud
  
      // Note: all the actions have a '\n' because the account name is in two lines and
      // all buttons must have the same size in order to keep a good layout
-     _protocolAction = createColorAwareAction(QLatin1String(":/client/resources/activity.png"), tr("Activity"));
-     _actionGroup->addAction(_protocolAction);
-     _toolBar->addAction(_protocolAction);
-     ProtocolWidget *protocolWidget = new ProtocolWidget;
-     _ui->stack->addWidget(protocolWidget);
+     _activityAction = createColorAwareAction(QLatin1String(":/client/resources/activity.png"), tr("Activity"));
+     _actionGroup->addAction(_activityAction);
+     addActionToToolBar(_activityAction);
+     _activitySettings = new ActivitySettings;
+     _ui->stack->addWidget(_activitySettings);
+     connect( _activitySettings, SIGNAL(guiLog(QString,QString)), _gui,
+              SLOT(slotShowOptionalTrayMessage(QString,QString)) );
  
 -    // Add the protocol widget
 -
      QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General"));
      _actionGroup->addAction(generalAction);
 -    addActionToToolBar(generalAction);
 +    _toolBar->addAction(generalAction);
      GeneralSettings *generalSettings = new GeneralSettings;
      _ui->stack->addWidget(generalSettings);
  
diff --cc src/gui/settingsdialog.h
index bc57763,ec04dcf..290fadd
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@@ -66,8 -69,9 +69,10 @@@ private slots
  
  private:
      void customizeStyle();
++    void addActionToToolBar(QAction* action);
++
      QIcon createColorAwareIcon(const QString &name);
      QAction *createColorAwareAction(const QString &iconName, const QString &fileName);
 -    void addActionToToolBar(QAction *action);
      Ui::SettingsDialog * const _ui;
  
      QActionGroup* _actionGroup;
@@@ -75,8 -79,12 +80,10 @@@
      QHash<QAction*, QWidget*> _actionGroupWidgets;
  
      QToolBar* _toolBar;
 -    // Maps the actions from the action group to the toolbar actions
 -    QHash<QAction*, QAction*> _toolbarAccountActions;
  
-     QAction * _protocolAction;
+     ActivitySettings *_activitySettings;
+ 
+     QAction * _activityAction;
      ownCloudGui *_gui;
  };
  

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