#3357 nextclouddeckdialog: treat new item and listing the same

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

src/dialogs/nextclouddeckdialog.cpp

@@ -13,25 +13,20 @@
 
 NextcloudDeckDialog::NextcloudDeckDialog(QWidget *parent, bool listMode)
     : MasterDialog(parent), ui(new Ui::NextcloudDeckDialog) {
+    Q_UNUSED(listMode)
     ui->setupUi(this);
     afterSetupUI();
     setupUi();
     _currentCard = NextcloudDeckService::Card();
-
-    ui->dueDateTimeEdit->setDateTime(QDateTime::currentDateTime());
     ui->saveButton->setEnabled(false);
     ui->dueDateTimeCheckBox->setChecked(true);
+    ui->newItemEdit->setFocus();
+
+    // Set default due date to one hour from now
+    ui->dueDateTimeEdit->setDateTime(QDateTime::currentDateTime().addSecs(3600));
 
     // Hide currently unused UI elements
     ui->showDueTodayItemsOnlyCheckBox->setHidden(true);
-
-    if (listMode) {
-        setWindowTitle(tr("Manage Nextcloud Deck Cards"));
-        ui->newItemEdit->setFocus();
-    } else {
-        ui->titleLineEdit->setFocus();
-        ui->selectFrame->setHidden(true);
-    }
 }
 
 NextcloudDeckDialog::~NextcloudDeckDialog() { delete ui; }
@@ -128,6 +123,9 @@ void NextcloudDeckDialog::on_saveButton_clicked() {
 
         // Reload the card list to reflect the changes
         reloadCardList();
+
+        ui->newItemEdit->clear();
+        ui->newItemEdit->setFocus();
     }
 
     if (cardIdToUpdate == -1) {
@@ -236,7 +234,7 @@ void NextcloudDeckDialog::resetEditFrameControls() {
     ui->titleLineEdit->setText(QString());
     ui->descriptionTextEdit->setPlainText(QString());
     ui->dueDateTimeCheckBox->setChecked(false);
-    ui->dueDateTimeEdit->hide();
+    ui->dueDateTimeEdit->setEnabled(false);
     ui->saveButton->setEnabled(false);
     _currentCard = NextcloudDeckService::Card();
 }
@@ -289,4 +287,7 @@ void NextcloudDeckDialog::on_newItemEdit_returnPressed() {
     ui->titleLineEdit->setText(ui->newItemEdit->text());
     ui->descriptionTextEdit->setFocus();
     ui->newItemEdit->clear();
+    // Set default due date to one hour from now
+    ui->dueDateTimeEdit->setDateTime(QDateTime::currentDateTime().addSecs(3600));
+    ui->dueDateTimeCheckBox->setChecked(true);
 }

src/dialogs/nextclouddeckdialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Insert Nextcloud Deck card link</string>
+   <string>Manage Nextcloud Deck Cards</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">

src/mainwindow.cpp

@@ -12450,10 +12450,5 @@ void MainWindow::on_actionReattach_panels_triggered() {
 }
 
 void MainWindow::on_actionManage_Nextcloud_Deck_cards_triggered() {
-    if (!nextCloudDeckCheck()) {
-        return;
-    }
-
-    auto *dialog = new NextcloudDeckDialog(this, true);
-    dialog->exec();
+    on_actionInsert_Nextcloud_Deck_card_triggered();
 }

src/mainwindow.ui

@@ -2815,9 +2815,6 @@ li.checked::marker { content: "\2612"; }
    <property name="text">
     <string>Insert Nextcloud Deck card link</string>
    </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+Alt+D</string>
-   </property>
   </action>
   <action name="actionCopy_path_to_note_to_clipboard">
    <property name="text">
@@ -2881,6 +2878,9 @@ li.checked::marker { content: &quot;\2612&quot;; }
    <property name="text">
     <string>Manage Nextcloud Deck cards</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+D</string>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>