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, 7 insertions, 1 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
index 1ba0d69..d7e719c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
@@ -15,7 +15,7 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog
         Q_OBJECT
 
     public:
-        explicit TriggerColumnsDialog(QWidget *parent = 0);
+        explicit TriggerColumnsDialog(QWidget *parent, int globalX, int globalY);
         ~TriggerColumnsDialog();
 
         void addColumn(const QString& name, bool checked);
@@ -27,7 +27,13 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog
 
     private:
         QList<QCheckBox*> checkBoxList;
+        int globalX;
+        int globalY;
         Ui::TriggerColumnsDialog *ui = nullptr;
+
+    private slots:
+        void selectAll();
+        void deselectAll();
 };
 
 #endif // TRIGGERCOLUMNSDIALOG_H