Display list of files to be restored in restore dialog.

Issue #129.
Tarsnap · Jun 5, 2017 · 87394c6 · 87394c6
1 parent 9b0f84a
commit 87394c6
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 32 deletions.
diff --git a/forms/restoredialog.ui b/forms/restoredialog.ui
@@ -7,35 +7,41 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>300</height>
+    <height>335</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>500</width>
-    <height>300</height>
+    <width>400</width>
+    <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Archive restore</string>
   </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" name="restoreDialogLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
    <property name="leftMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="topMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="rightMargin">
-    <number>12</number>
+    <number>6</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
+   <item alignment="Qt::AlignTop">
     <widget class="QLabel" name="infoLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -51,6 +57,41 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QListWidget" name="filesListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">#filesListWidget
+{
+font-family: Monospace, Monaco;
+font-size: 12px;
+}
+
+#filesListWidget::item
+{
+height: 25px;
+}
+</string>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="layoutMode">
+      <enum>QListView::Batched</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="optionsGroupBox">
      <layout class="QGridLayout" name="optionsGridLayout">
@@ -158,16 +199,6 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QCheckBox" name="preservePermCheckBox">
-        <property name="toolTip">
-         <string>Attempt to restore the full permissions, including owner, file modes, file flags and ACLs, if available, for each item extracted from the archive.</string>
-        </property>
-        <property name="text">
-         <string>Preserve file permissions</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0" colspan="2">
        <widget class="QRadioButton" name="optionBaseDirRadio">
         <property name="toolTip">
@@ -185,6 +216,16 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="0" colspan="2">
+       <widget class="QCheckBox" name="preservePermCheckBox">
+        <property name="toolTip">
+         <string>Attempt to restore the full permissions, including owner, file modes, file flags and ACLs, if available, for each item extracted from the archive.</string>
+        </property>
+        <property name="text">
+         <string>Preserve file permissions</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/src/widgets/archivelistwidget.cpp b/src/widgets/archivelistwidget.cpp
@@ -168,7 +168,7 @@ void ArchiveListWidget::restoreSelectedItem()
             static_cast<ArchiveListWidgetItem *>(selectedItems().first());
         if(archiveItem && !archiveItem->archive()->deleteScheduled())
         {
-            RestoreDialog restoreDialog(archiveItem->archive(), this);
+            RestoreDialog restoreDialog(this, archiveItem->archive());
             if(QDialog::Accepted == restoreDialog.exec())
                 emit restoreArchive(archiveItem->archive(),
                                     restoreDialog.getOptions());
@@ -257,7 +257,7 @@ void ArchiveListWidget::restoreItem()
         qobject_cast<ArchiveListWidgetItem *>(sender());
     if(archiveItem)
     {
-        RestoreDialog restoreDialog(archiveItem->archive(), this);
+        RestoreDialog restoreDialog(this, archiveItem->archive());
         if(QDialog::Accepted == restoreDialog.exec())
             emit restoreArchive(archiveItem->archive(),
                                 restoreDialog.getOptions());

diff --git a/src/widgets/archivewidget.cpp b/src/widgets/archivewidget.cpp
@@ -186,12 +186,11 @@ void ArchiveWidget::restoreFiles()
     foreach(QModelIndex index, indexes)
         files << index.data().toString();
 
-    RestoreDialog restoreDialog(_archive, this);
+    RestoreDialog restoreDialog(this, _archive, files);
     restoreDialog.displayTarOption(false);
     if(QDialog::Accepted == restoreDialog.exec())
     {
         ArchiveRestoreOptions options = restoreDialog.getOptions();
-        options.files = files;
         emit restoreArchive(_archive, options);
     }
 }

diff --git a/src/widgets/joblistwidget.cpp b/src/widgets/joblistwidget.cpp
@@ -111,7 +111,7 @@ void JobListWidget::restoreItem()
         if(!job->archives().isEmpty())
         {
             ArchivePtr    archive = job->archives().first();
-            RestoreDialog restoreDialog(archive, this);
+            RestoreDialog restoreDialog(this, archive);
             if(QDialog::Accepted == restoreDialog.exec())
                 emit restoreArchive(archive, restoreDialog.getOptions());
         }
@@ -218,7 +218,7 @@ void JobListWidget::restoreSelectedItem()
         if(!job->archives().isEmpty())
         {
             ArchivePtr    archive = job->archives().first();
-            RestoreDialog restoreDialog(archive, this);
+            RestoreDialog restoreDialog(this, archive);
             if(QDialog::Accepted == restoreDialog.exec())
                 emit restoreArchive(archive, restoreDialog.getOptions());
         }

diff --git a/src/widgets/jobwidget.cpp b/src/widgets/jobwidget.cpp
@@ -249,7 +249,7 @@ void JobWidget::restoreButtonClicked()
     if(_job && !_job->archives().isEmpty())
     {
         ArchivePtr    archive = _job->archives().first();
-        RestoreDialog restoreDialog(archive, this);
+        RestoreDialog restoreDialog(this, archive);
         if(QDialog::Accepted == restoreDialog.exec())
             emit restoreJobArchive(archive, restoreDialog.getOptions());
     }

diff --git a/src/widgets/restoredialog.cpp b/src/widgets/restoredialog.cpp
@@ -6,12 +6,10 @@
 #include <QMessageBox>
 #include <QSettings>
 
-RestoreDialog::RestoreDialog(ArchivePtr archive, QWidget *parent)
-    : QDialog(parent), _archive(archive)
+RestoreDialog::RestoreDialog(QWidget *parent, ArchivePtr archive, QStringList files)
+    : QDialog(parent), _archive(archive), _files(files)
 {
     _ui.setupUi(this);
-    setWindowFlags((windowFlags() | Qt::CustomizeWindowHint)
-                   & ~Qt::WindowMaximizeButtonHint);
 
     QSettings settings;
     _downDir = settings.value("app/downloads_dir", DEFAULT_DOWNLOADS).toString();
@@ -58,6 +56,10 @@ RestoreDialog::RestoreDialog(ArchivePtr archive, QWidget *parent)
     displayRestoreOption(canRestore);
     _ui.optionRestoreRadio->setChecked(canRestore);
     _ui.optionBaseDirRadio->setChecked(!canRestore);
+    if(!_files.isEmpty())
+        _ui.filesListWidget->addItems(_files);
+    else
+        _ui.filesListWidget->addItems(_archive->contents().split(QChar('\n')));
 }
 
 RestoreDialog::~RestoreDialog()
@@ -73,6 +75,7 @@ ArchiveRestoreOptions RestoreDialog::getOptions()
     options.overwriteFiles   = _ui.overwriteCheckBox->isChecked();
     options.keepNewerFiles   = _ui.keepNewerCheckBox->isChecked();
     options.preservePerms    = _ui.preservePermCheckBox->isChecked();
+    options.files            = _files;
     if(options.optionRestoreDir)
         options.path = _ui.baseDirLineEdit->text();
     else if(options.optionTarArchive)
@@ -94,7 +97,7 @@ void RestoreDialog::displayTarOption(bool display)
 
 void RestoreDialog::optionBaseDirToggled(bool checked)
 {
-    _ui.infoLabel->setText(tr("Restore archive <b>%1</b> contents to specified"
+    _ui.infoLabel->setText(tr("Restore from archive <b>%1</b> to specified"
                               " directory? Any existing files will not be"
                               " replaced by default. Use the options below to"
                               " modify this behavior:")
@@ -110,7 +113,7 @@ void RestoreDialog::optionBaseDirToggled(bool checked)
 void RestoreDialog::optionTarArchiveToggled(bool checked)
 {
     _ui.infoLabel->setText(tr("Download archive <b>%1</b> contents as an"
-                              " uncompressed TAR archive.")
+                              " uncompressed TAR archive?")
                                .arg(_archive->name()));
     _ui.archiveLineEdit->setVisible(checked);
     _ui.changeArchiveButton->setVisible(checked);
@@ -119,7 +122,7 @@ void RestoreDialog::optionTarArchiveToggled(bool checked)
 
 void RestoreDialog::optionRestoreToggled(bool checked)
 {
-    _ui.infoLabel->setText(tr("Restore archive <b>%1</b> contents to original"
+    _ui.infoLabel->setText(tr("Restore from archive <b>%1</b> to original"
                               " locations? Any existing files will not be"
                               " replaced by default. Use the options below to"
                               " modify this behavior:")

diff --git a/src/widgets/restoredialog.h b/src/widgets/restoredialog.h
@@ -19,7 +19,8 @@ class RestoreDialog : public QDialog
     //! Constructor.
     //! \param archive: the ArchivePtr to restore.
     //! \param parent: standard Qt parameter.
-    explicit RestoreDialog(ArchivePtr archive, QWidget *parent = nullptr);
+    explicit RestoreDialog(QWidget *parent, ArchivePtr archive,
+                           QStringList files = QStringList());
     ~RestoreDialog();
 
     //! Returns options from the dialog window.
@@ -38,6 +39,7 @@ private slots:
 private:
     Ui::RestoreDialog _ui;
     ArchivePtr        _archive;
+    QStringList       _files;
     QString           _downDir;
 
     void displayRestoreOption(bool display);