Share dialog: Initialize expected expire date #4075

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 9c64dde6525d0f27bfc53f6d34f0fa4a6c3d8f3d..5f2148804b92a56b6221d1c8b4bbaed477a5890e 100644 (file)
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -69,7 +69,7 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
     connect(_ui->lineEdit_password, SIGNAL(textChanged(QString)), this, SLOT(slotPasswordChanged(QString)));
     connect(_ui->pushButton_setPassword, SIGNAL(clicked(bool)), SLOT(slotPasswordReturnPressed()));
     connect(_ui->checkBox_expire, SIGNAL(clicked()), this, SLOT(slotCheckBoxExpireClicked()));
-    connect(_ui->calendar, SIGNAL(dateChanged(QDate)), SLOT(slotCalendarClicked(QDate)));
+    connect(_ui->calendar, SIGNAL(dateChanged(QDate)), SLOT(slotExpireDateChanged(QDate)));
     connect(_ui->checkBox_editing, SIGNAL(clicked()), this, SLOT(slotCheckBoxEditingClicked()));
 
     //Disable checkbox
@@ -156,9 +156,11 @@ void ShareLinkWidget::slotExpireSet()
     _pi_date->stopAnimation();
 }
 
-void ShareLinkWidget::slotCalendarClicked(const QDate &date)
+void ShareLinkWidget::slotExpireDateChanged(const QDate &date)
 {
-    setExpireDate(date);
+    if (_ui->checkBox_expire->isChecked()) {
+        setExpireDate(date);
+    }
 }
 
 ShareLinkWidget::~ShareLinkWidget()
@@ -246,9 +248,9 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
             }
 
             _ui->checkBox_expire->setEnabled(true);
+            _ui->calendar->setMinimumDate(QDate::currentDate().addDays(1));
             if (_share->getExpireDate().isValid()) {
                 _ui->calendar->setDate(_share->getExpireDate());
-                _ui->calendar->setMinimumDate(QDate::currentDate().addDays(1));
                 _ui->calendar->setEnabled(true);
                 _ui->checkBox_expire->setChecked(true);
             } else {

diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h
index 6fb78ffad539d4089289a80b6d605bb0c67615a5..d6950b37f0595650961f64614680dd3e9fdfde3a 100644 (file)
--- a/src/gui/sharelinkwidget.h
+++ b/src/gui/sharelinkwidget.h
@@ -60,7 +60,7 @@ private slots:
     void slotDeleteShareFetched();
     void slotPasswordSet();
     void slotExpireSet();
-    void slotCalendarClicked(const QDate &date);
+    void slotExpireDateChanged(const QDate &date);
     void slotCheckBoxShareLinkClicked();
     void slotCheckBoxPasswordClicked();
     void slotCheckBoxExpireClicked();