Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 21 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
index 462e57f..7890b3c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
@@ -1,13 +1,18 @@
 #include "triggercolumnsdialog.h"
 #include "ui_triggercolumnsdialog.h"
-
+#include "uiutils.h"
 #include <QCheckBox>
 
-TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent) :
+TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent, int globalX, int globalY) :
     QDialog(parent, Qt::Popup),
+    globalX(globalX),
+    globalY(globalY),
     ui(new Ui::TriggerColumnsDialog)
 {
     ui->setupUi(this);
+
+    connect(ui->selectAllBtn, SIGNAL(clicked(bool)), this, SLOT(selectAll()));
+    connect(ui->deselectAllBtn, SIGNAL(clicked(bool)), this, SLOT(deselectAll()));
 }
 
 TriggerColumnsDialog::~TriggerColumnsDialog()
@@ -26,7 +31,7 @@ void TriggerColumnsDialog::addColumn(const QString& name, bool checked)
 QStringList TriggerColumnsDialog::getCheckedColumns() const
 {
     QStringList columns;
-    foreach (QCheckBox* cb, checkBoxList)
+    for (QCheckBox* cb : checkBoxList)
     {
         if (cb->isChecked())
             columns << cb->text();
@@ -49,4 +54,17 @@ void TriggerColumnsDialog::changeEvent(QEvent *e)
 void TriggerColumnsDialog::showEvent(QShowEvent*)
 {
     adjustSize();
+    move(globalX, globalY);
+}
+
+void TriggerColumnsDialog::selectAll()
+{
+    for (QCheckBox* cb : checkBoxList)
+        cb->setChecked(true);
+}
+
+void TriggerColumnsDialog::deselectAll()
+{
+    for (QCheckBox* cb : checkBoxList)
+        cb->setChecked(false);
 }