diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2015-03-13 16:03:03 +0300 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2015-03-13 16:03:03 +0300 |
commit | 457f9b587d684f063084df3a0346d04a997391a4 (patch) | |
tree | 4823983dd69a4250e5c63131d3c097739493ef15 /src/gui/sharedialog.h | |
parent | 40cdbda31285d9090d8109b10b244aa4740a5891 (diff) | |
parent | 09749e2c7f2a1203a6c96d870f113596b5cec7ec (diff) |
Merge remote-tracking branch 'origin/1.8'
Conflicts:
src/gui/sharedialog.cpp
src/gui/sharedialog.h
Diffstat (limited to 'src/gui/sharedialog.h')
-rw-r--r-- | src/gui/sharedialog.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/gui/sharedialog.h b/src/gui/sharedialog.h index 74c1c6cd7..7c090e972 100644 --- a/src/gui/sharedialog.h +++ b/src/gui/sharedialog.h @@ -1,5 +1,6 @@ /* * Copyright (C) by Roeland Jago Douma <roeland@famdouma.nl> + * Copyright (C) 2015 by Klaas Freitag <freitag@owncloud.com> * * 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 @@ -56,7 +57,8 @@ class ShareDialog : public QDialog Q_OBJECT public: - explicit ShareDialog(AccountPtr account, const QString &sharePath, const QString &localPath, QWidget *parent = 0); + explicit ShareDialog(AccountPtr account, const QString &sharePath, const QString &localPath, + bool resharingAllowed, QWidget *parent = 0); ~ShareDialog(); void getShares(); @@ -71,20 +73,27 @@ private slots: void slotCheckBoxPasswordClicked(); void slotCheckBoxExpireClicked(); void slotPasswordReturnPressed(); + void slotPasswordChanged(const QString& newText); void slotPushButtonCopyLinkPressed(); void slotThumbnailFetched(const int &statusCode, const QByteArray &reply); private: + void setShareCheckBoxTitle(bool haveShares); void displayError(int code); - void displayInfo( const QString& msg ); + void displayError(const QString& errMsg); + void setShareLink( const QString& url ); Ui::ShareDialog *_ui; AccountPtr _account; QString _sharePath; QString _localPath; + QString _shareUrl; +#if 0 QString _folderAlias; int _uploadFails; QString _expectedSyncFile; +#endif + bool _passwordJobRunning; QList<QVariant> _shares; qulonglong _public_share_id; void setPassword(const QString &password); @@ -94,6 +103,8 @@ private: QProgressIndicator *_pi_link; QProgressIndicator *_pi_password; QProgressIndicator *_pi_date; + + bool _resharingAllowed; }; } |