Sharedialog: Some more refinements after the merge of the branch.

- Some dialog changes: Made it less vertical space comsuming
- Some variable cleanups
- Allow to share files that are not within the synced dir by
  copying them to the root of a sync dir first.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/gui/sharedialog.h b/src/gui/sharedialog.h
index c0a8d45a3..131d5e44a 100644
--- a/src/gui/sharedialog.h
+++ b/src/gui/sharedialog.h
@@ -45,6 +45,7 @@ class AbstractCredentials;
 class Account;
 class QuotaInfo;
 class MirallAccessManager;
+class SyncResult;
 
 class ShareDialog : public QDialog
 {
@@ -54,6 +55,10 @@ public:
     explicit ShareDialog(const QString &sharePath, const QString &localPath, QWidget *parent = 0);
     ~ShareDialog();
     void getShares();
+
+public slots:
+    void slotNextSyncFinished( const SyncResult& result );
+
 private slots:
     void slotSharesFetched(const QString &reply);
     void slotCreateShareFetched(const QString &reply);
@@ -66,9 +71,18 @@ private slots:
     void slotCheckBoxExpireClicked();
     void slotPasswordReturnPressed();
 private:
+    void displayError(int code);
+    void displayInfo( const QString& msg );
+
+    bool uploadExternalFile();
+
     Ui::ShareDialog *_ui;
     QString _sharePath;
     QString _localPath;
+    QString _folderAlias;
+    int     _uploadFails;
+    QString _expectedSyncFile;
+
     QList<QVariant> _shares;
     qulonglong _public_share_id;
     void setPassword(const QString &password);