From 708c9043f079d37568cb49fde45c8270ce467d25 Mon Sep 17 00:00:00 2001
From: Peinthor Rene <peinthor@gmail.com>
Date: Tue, 14 Feb 2012 17:38:45 +0100
Subject: [PATCH] cleanup field activation and disable execute sql button if no
 db is opened

---
 src/mainwindow.cpp | 36 +++++++++++++++---------------------
 src/mainwindow.h   |  1 +
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 86192b75..110b4b28 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -909,13 +909,6 @@ void MainWindow::fileOpen(const QString & fileName)
         if (db.open(wFile))
         {
             this->setWindowTitle(QApplication::applicationName() +" - "+wFile);
-            fileCloseAction->setEnabled(true);
-            fileCompactAction->setEnabled(true);
-            editCreateTableAction->setEnabled(true);
-            editDeleteTableAction->setEnabled(true);
-            editModifyTableAction->setEnabled(true);
-            editCreateIndexAction->setEnabled(true);
-            editDeleteIndexAction->setEnabled(true);
             setCurrentFile(wFile);
         } else {
             QString err = "An error occurred:  ";
@@ -956,13 +949,6 @@ void MainWindow::fileNew()
         populateStructure();
         resetBrowser();
         createTable();
-        fileCloseAction->setEnabled(true);
-        fileCompactAction->setEnabled(true);
-        editCreateTableAction->setEnabled(true);
-        editDeleteTableAction->setEnabled(true);
-        editModifyTableAction->setEnabled(true);
-        editCreateIndexAction->setEnabled(true);
-        editDeleteIndexAction->setEnabled(true);
         setCurrentFile(fileName);
     }
 }
@@ -1073,13 +1059,7 @@ void MainWindow::fileClose()
     this->setWindowTitle(QApplication::applicationName());
     resetBrowser();
     populateStructure();
-    fileCloseAction->setEnabled(false);
-    fileCompactAction->setEnabled(false);
-    editCreateTableAction->setEnabled(false);
-    editDeleteTableAction->setEnabled(false);
-    editModifyTableAction->setEnabled(false);
-    editCreateIndexAction->setEnabled(false);
-    editDeleteIndexAction->setEnabled(false);
+    activateFields(false);
 }
 
 
@@ -2117,6 +2097,7 @@ void MainWindow::updateRecentFileActions()
 void MainWindow::setCurrentFile(const QString &fileName)
 {
     setWindowFilePath(fileName);
+    activateFields(true);
 
     QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
     QStringList files = settings.value("recentFileList").toStringList();
@@ -2152,3 +2133,16 @@ void MainWindow::dropEvent(QDropEvent *event)
     if( !fileName.isEmpty() && fileName.endsWith("db") )
             fileOpen(fileName);
 }
+
+void MainWindow::activateFields(bool enable)
+{
+    fileCloseAction->setEnabled(enable);
+    fileCompactAction->setEnabled(enable);
+    editCreateTableAction->setEnabled(enable);
+    editDeleteTableAction->setEnabled(enable);
+    editModifyTableAction->setEnabled(enable);
+    editCreateIndexAction->setEnabled(enable);
+    editDeleteIndexAction->setEnabled(enable);
+
+    executeQueryButton->setEnabled(enable);
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 79ef8239..2fb4d14d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -150,6 +150,7 @@ private:
 
     void updateRecentFileActions();
     void setCurrentFile(const QString& fileName);
+    void activateFields(bool enable = true);
 
 public slots:
     virtual void on_tree_context_menu(const QPoint & qPoint);