Update upstream source from tag 'upstream/3.4.4+dfsg'

Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed

1 files changed, 15 insertions, 9 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
index 795158a..c083cbd 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
@@ -1,14 +1,12 @@
 #include "ddlhistorywindow.h"
 #include "ui_ddlhistorywindow.h"
 #include "services/config.h"
-#include "common/userinputfilter.h"
-#include "common/extlineedit.h"
-#include "dblistmodel.h"
 #include "ddlhistorymodel.h"
 #include "common/unused.h"
 #include "iconmanager.h"
 #include <QDate>
 #include <QLineEdit>
+#include <QMessageBox>
 #include <QStringListModel>
 
 DdlHistoryWindow::DdlHistoryWindow(QWidget *parent) :
@@ -58,6 +56,7 @@ void DdlHistoryWindow::init()
 
     connect(ui->tableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
             this, SLOT(activated(QModelIndex,QModelIndex)));
+    connect(ui->clearButton, SIGNAL(clicked(bool)), this, SLOT(clearHistory()));
 }
 
 void DdlHistoryWindow::activated(const QModelIndex& current, const QModelIndex& previous)
@@ -76,12 +75,8 @@ void DdlHistoryWindow::activated(const QModelIndex& current, const QModelIndex&
 
     QStringList contentEntries;
     QList<Config::DdlHistoryEntryPtr> entries = CFG->getDdlHistoryFor(dbName, dbFile, date);
-    for (Config::DdlHistoryEntryPtr entry : entries)
-    {
-        contentEntries << templ.arg(entry->dbName).arg(entry->dbFile)
-                          .arg(entry->timestamp.toString("yyyy-MM-dd HH:mm:ss"))
-                          .arg(entry->queries);
-    }
+    for (Config::DdlHistoryEntryPtr& entry : entries)
+        contentEntries << templ.arg(entry->dbName, entry->dbFile, entry->timestamp.toString("yyyy-MM-dd HH:mm:ss"), entry->queries);
 
     ui->ddlEdit->setPlainText(contentEntries.join("\n\n"));
 }
@@ -98,6 +93,17 @@ void DdlHistoryWindow::refreshDbList()
     dbListModel->setStringList(dbList);
 }
 
+void DdlHistoryWindow::clearHistory()
+{
+    QMessageBox::StandardButton result = QMessageBox::question(this, tr("Clear history"), tr("Are you sure you want to erase entire DDL history?"));
+    if (result != QMessageBox::Yes)
+        return;
+
+    CFG->clearDdlHistory();
+    dataModel->refresh();
+    ui->ddlEdit->setPlainText("");
+}
+
 bool DdlHistoryWindow::restoreSessionNextTime()
 {
     return false;