Add support for downloading multiple favicons from the context menu

keepassxreboot · May 22, 2019 · d88e382 · d88e382
1 parent 60ab999
commit d88e382
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -659,16 +659,40 @@ void DatabaseWidget::openUrl()
 void DatabaseWidget::downloadFavicon()
 {
 #ifdef WITH_XC_NETWORKING
+    const QModelIndexList selected = m_entryView->selectionModel()->selectedRows();
+    if (selected.isEmpty()) {
+        return;
+    }
+
+    QList<Entry*> selectedEntries;
+    for (const QModelIndex& index : selected) {
+        selectedEntries.append(m_entryView->entryFromIndex(index));
+    }
+
+    if (selectedEntries.isEmpty()) {
+        return;
+    }
+
     auto* iconDownloader = new IconDownloaderDialog(this);
     connect(iconDownloader, SIGNAL(entryUpdated()), SIGNAL(databaseModified()));
     connect(iconDownloader,
             SIGNAL(messageEditEntry(QString,MessageWidget::MessageType)),
             SLOT(showMessage(QString,MessageWidget::MessageType)));
 
-    Entry* currentEntry = m_entryView->currentEntry();
-    if (currentEntry) {
-        iconDownloader->downloadFavicon(m_db, currentEntry);
+    if (selectedEntries.count() == 1) {
+        iconDownloader->downloadFavicon(m_db, selectedEntries.first());
+        return;
     }
+
+    m_iconDownloaderState = IconDownloaderState::Downloading;
+    iconDownloader->raiseWindow();
+    iconDownloader->show();
+    iconDownloader->activateWindow();
+    iconDownloader->raise();
+    auto result = AsyncTask::runAndWaitForFuture(
+        [&]() { return iconDownloader->downloadAllFavicons(m_db, selectedEntries); });
+    Q_UNUSED(result);
+    m_iconDownloaderState = IconDownloaderState::Idle;
 #endif
 }
 

diff --git a/src/gui/IconDownloaderDialog.cpp b/src/gui/IconDownloaderDialog.cpp
@@ -50,6 +50,7 @@ IconDownloaderDialog::IconDownloaderDialog(QWidget* parent)
     setAttribute(Qt::WA_DeleteOnClose);
     m_ui->tableView->setModel(m_dataModel);
     m_ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    m_ui->progressBar->setMinimumHeight(20);
     m_dataModel->clear();
     m_dataModel->setHorizontalHeaderLabels({"URL", "Status"});
 }

diff --git a/src/gui/IconDownloaderDialog.ui b/src/gui/IconDownloaderDialog.ui
@@ -31,18 +31,18 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QProgressBar" name="progressBar">
-         <property name="value">
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="sizeConstraint">
           <enum>QLayout::SetDefaultConstraint</enum>
          </property>
+         <item>
+          <widget class="QProgressBar" name="progressBar">
+           <property name="value">
+            <number>0</number>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="abortButton">
            <property name="sizePolicy">
@@ -51,6 +51,12 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="maximumSize">
+            <size>
+             <width>100</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
             <string>Abort</string>
            </property>

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -569,7 +569,8 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             m_ui->actionEntryCopyTotp->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp());
             m_ui->actionEntrySetupTotp->setEnabled(singleEntrySelected);
             m_ui->actionEntryTotpQRCode->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp());
-            m_ui->actionEntryDownloadIcon->setEnabled(singleEntrySelected && !dbWidget->currentEntryHasIconSet() && dbWidget->currentEntryHasUrl());
+            m_ui->actionEntryDownloadIcon->setEnabled((entriesSelected  && !singleEntrySelected) || 
+                (singleEntrySelected && !dbWidget->currentEntryHasIconSet() && dbWidget->currentEntryHasUrl()));
             m_ui->actionGroupNew->setEnabled(groupSelected);
             m_ui->actionGroupEdit->setEnabled(groupSelected);
             m_ui->actionGroupDelete->setEnabled(groupSelected && dbWidget->canDeleteCurrentGroup());