Some fixes and efficiency improvements

Author: Jim Hamill

BrowseWidget.cpp

@@ -7,6 +7,7 @@
 #include <QSqlRecord>
 #include <QSqlField>
 #include <QSqlError>
+#include <QSqlQuery>
 
 #include <QMessageBox>
 
@@ -45,6 +46,9 @@ bool BrowseWidget::setTable(QString table)
         commitChanges();
     }
 
+    // Set new table
+    m_table = table;
+
     // Create model
     m_model->setTable(table);
     m_model->setEditStrategy(QSqlTableModel::OnFieldChange);
@@ -119,10 +123,8 @@ void BrowseWidget::on_clearButton_clicked()
     // Display messagebox for confirmation
     if (QMessageBox::Yes == QMessageBox::question(this, "Clear Table", "Are you sure you want to clear this table?")) {
 
-        // Remove all rows TODO make more efficient
-        for (int i = 0; i < m_model->rowCount(); i++) {
-            m_model->removeRow(i);
-        }
+        // Remove all rows (TODO Will this work across all SQL implementations?)
+        m_database->exec("DELETE FROM " + m_table);
 
         // Refresh browse widget
         m_model->select();

BrowseWidget.h

@@ -44,6 +44,9 @@ private slots:
 
     // Model for table
     QSqlTableModel *m_model;
+
+    // Current Table
+    QString m_table;
 };
 
 #endif // BROWSEWIDGET_H

DatabaseConnectionWidget.cpp

@@ -157,6 +157,10 @@ bool DatabaseConnectionWidget::importDatabase()
             qDebug() << "Error: " << statement;
         }
 
+        // If the cancel button was clicked, abort
+        if (progress.wasCanceled())
+            return false;
+
         // Increment progress bar value
         progress.setValue(splitter.getPosition());
     }

MainWindow.ui

@@ -131,7 +131,7 @@
     <bool>true</bool>
    </property>
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>Main Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -188,7 +188,7 @@
   </action>
   <action name="actionAbout_QuteSql">
    <property name="icon">
-    <iconset theme="database">
+    <iconset theme="help-about">
      <normaloff/>
     </iconset>
    </property>
@@ -198,7 +198,7 @@
   </action>
   <action name="actionAbout_Qt">
    <property name="icon">
-    <iconset theme="qt">
+    <iconset theme="help-about">
      <normaloff/>
     </iconset>
    </property>

README.md

@@ -3,7 +3,7 @@
 ## Todo
 
 - Create wrapper QSqlDatabase class (with functions like executeQuery(), getName(), etc)
-- Create log tab that shows history of all SQL commands executed. (Should do as list view or something)
+- Create log tab that shows history of all SQL commands executed. (Should do as list view or something... maybe a table with DATE and COMMAND)
 - Store settings in SQLite Database (Storing using QSettings is inconvenient with arrays.)
 - Export selected