Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 3 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
index 60b8dd5..2f5583e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
@@ -84,6 +84,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
             REFRESH_SCHEMA,
             CREATE_SIMILAR_TABLE,
             RESET_AUTOINCREMENT,
+            ERASE_TABLE_DATA,
             _separator // Never use it directly, it's just for menu setup
         };
 
@@ -116,6 +117,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
     protected:
         void createActions();
         void setupDefShortcuts();
+        void closeEvent(QCloseEvent* e);
 
     private:
         void setActionEnabled(int action, bool enabled);
@@ -187,6 +189,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void integrityCheck();
         void createSimilarTable();
         void resetAutoincrement();
+        void eraseTableData();
         void addColumn(DbTreeItem* item);
         void editColumn(DbTreeItem* item);
         void delColumn(DbTreeItem* item);