[Pkg-owncloud-commits] [owncloud-client] 88/470: Disable sharing dialog if account state is not connected

[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 ba42d40df96b8835dd4663ccb9d6c3d3bf4cf921
Author: Roeland Jago Douma <rullzer at owncloud.com>
Date:   Mon Feb 22 10:38:10 2016 +0100

    Disable sharing dialog if account state is not connected
    
    Fixes #4185
---
 src/gui/owncloudgui.cpp |  2 +-
 src/gui/sharedialog.cpp | 32 +++++++++++++++++++++++++-------
 src/gui/sharedialog.h   |  9 ++++++---
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index b97a637..86cc718 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -777,7 +777,7 @@ void ownCloudGui::slotShowShareDialog(const QString &sharePath, const QString &l
         w = _shareDialogs[localPath];
     } else {
         qDebug() << Q_FUNC_INFO << "Opening share dialog" << sharePath << localPath;
-        w = new ShareDialog(accountState->account(), sharePath, localPath, resharingAllowed);
+        w = new ShareDialog(accountState, sharePath, localPath, resharingAllowed);
         w->getShares();
         w->setAttribute( Qt::WA_DeleteOnClose, true );
 
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index cfef4fa..51134c2 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -17,6 +17,7 @@
 #include "ui_sharedialog.h"
 
 #include "account.h"
+#include "accountstate.h"
 #include "configfile.h"
 #include "theme.h"
 #include "thumbnailjob.h"
@@ -24,15 +25,16 @@
 #include <QFileInfo>
 #include <QFileIconProvider>
 #include <QDebug>
+#include <QPointer>
 #include <QPushButton>
 #include <QFrame>
 
 namespace OCC {
 
-ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QString &localPath, bool resharingAllowed, QWidget *parent) :
+ShareDialog::ShareDialog(QPointer<AccountState> accountState, const QString &sharePath, const QString &localPath, bool resharingAllowed, QWidget *parent) :
     QDialog(parent),
     _ui(new Ui::ShareDialog),
-    _account(account),
+    _accountState(accountState),
     _sharePath(sharePath),
     _localPath(localPath),
     _resharingAllowed(resharingAllowed),
@@ -47,6 +49,9 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     QPushButton *closeButton = _ui->buttonBox->button(QDialogButtonBox::Close);
     connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
 
+    // We want to act on account state changes
+    connect(_accountState, SIGNAL(stateChanged(int)), SLOT(slotAccountStateChanged(int)));
+
     // Because people press enter in the dialog and we don't want to close for that
     closeButton->setDefault(false);
     closeButton->setAutoDefault(false);
@@ -87,7 +92,7 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
 
     this->setWindowTitle(tr("%1 Sharing").arg(Theme::instance()->appNameGUI()));
 
-    if (!account->capabilities().shareAPI()) {
+    if (!accountState->account()->capabilities().shareAPI()) {
         _ui->shareWidgetsLayout->addWidget(new QLabel(tr("The server does not allow sharing")));
         return;
     }
@@ -96,8 +101,8 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     bool autoShare = true;
 
     // We only do user/group sharing from 8.2.0
-    if (theme->userGroupSharing() && account->serverVersionInt() >= ((8 << 16) + (2 << 8))) {
-        _userGroupWidget = new ShareUserGroupWidget(account, sharePath, localPath, resharingAllowed, this);
+    if (theme->userGroupSharing() && accountState->account()->serverVersionInt() >= ((8 << 16) + (2 << 8))) {
+        _userGroupWidget = new ShareUserGroupWidget(accountState->account(), sharePath, localPath, resharingAllowed, this);
         _ui->shareWidgetsLayout->addWidget(_userGroupWidget);
 
 
@@ -114,7 +119,7 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     }
 
     if (theme->linkSharing()) {
-        _linkWidget = new ShareLinkWidget(account, sharePath, localPath, resharingAllowed, autoShare, this);
+        _linkWidget = new ShareLinkWidget(accountState->account(), sharePath, localPath, resharingAllowed, autoShare, this);
         _linkWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
         _ui->shareWidgetsLayout->addWidget(_linkWidget);
     }
@@ -134,7 +139,7 @@ void ShareDialog::done( int r ) {
 void ShareDialog::getShares()
 {
     if (QFileInfo(_localPath).isFile()) {
-        ThumbnailJob *job = new ThumbnailJob(_sharePath, _account, this);
+        ThumbnailJob *job = new ThumbnailJob(_sharePath, _accountState->account(), this);
         connect(job, SIGNAL(jobFinished(int, QByteArray)), SLOT(slotThumbnailFetched(int, QByteArray)));
         job->start();
     }
@@ -159,5 +164,18 @@ void ShareDialog::slotThumbnailFetched(const int &statusCode, const QByteArray &
     _ui->label_icon->setPixmap(p);
 }
 
+void ShareDialog::slotAccountStateChanged(int state) {
+    bool enabled = (state == AccountState::State::Connected);
+    qDebug() << Q_FUNC_INFO << enabled;
+
+    if (_userGroupWidget != NULL) {
+        _userGroupWidget->setEnabled(enabled);
+    }
+
+    if (_linkWidget != NULL) {
+        _linkWidget->setEnabled(enabled);
+    }
+}
+
 }
 
diff --git a/src/gui/sharedialog.h b/src/gui/sharedialog.h
index abf4ab4..0a88c69 100644
--- a/src/gui/sharedialog.h
+++ b/src/gui/sharedialog.h
@@ -14,7 +14,9 @@
 #ifndef SHAREDIALOG_H
 #define SHAREDIALOG_H
 
-#include "accountfwd.h"
+#include "accountstate.h"
+
+#include <QPointer>
 #include <QString>
 #include <QDialog>
 #include <QWidget>
@@ -33,7 +35,7 @@ class ShareDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ShareDialog(AccountPtr account,
+    explicit ShareDialog(QPointer<AccountState> accountState,
                          const QString &sharePath,
                          const QString &localPath,
                          bool resharingAllowed,
@@ -45,10 +47,11 @@ public:
 private slots:
     void done( int r );
     void slotThumbnailFetched(const int &statusCode, const QByteArray &reply);
+    void slotAccountStateChanged(int state);
 
 private:
     Ui::ShareDialog *_ui;
-    AccountPtr _account;
+    QPointer<AccountState> _accountState;
     QString _sharePath;
     QString _localPath;
 

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