Browse updates (remove now works)

Author: Jim Hamill

BrowseWidget.cpp

@@ -1,7 +1,14 @@
 #include "BrowseWidget.h"
 #include "ui_BrowseWidget.h"
 
+#include <QDebug>
+
 #include <QSqlTableModel>
+#include <QSqlRecord>
+#include <QSqlField>
+#include <QSqlError>
+
+#include "InsertRowDialog.h"
 
 BrowseWidget::BrowseWidget(QWidget *parent) :
     QWidget(parent),
@@ -33,6 +40,11 @@ void BrowseWidget::setDatabase(QSqlDatabase *database)
 
 bool BrowseWidget::setTable(QString table)
 {
+    // Call commit changes to save our new row if we have one
+    if (m_model->isDirty()) {
+        commitChanges();
+    }
+
     // Create model
     m_model->setTable(table);
     m_model->setEditStrategy(QSqlTableModel::OnFieldChange);
@@ -47,10 +59,59 @@ bool BrowseWidget::setTable(QString table)
     ui->filterEdit->setEnabled(true);
     ui->filterButton->setEnabled(true);
 
+    // Make sure we save changes when moving to a new row (this is necessary so "Add" works)
+    connect(ui->tableView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(commitChanges()));
+
     return true;
 }
 
 void BrowseWidget::on_filterButton_clicked()
 {
     m_model->setFilter(ui->filterEdit->text());
 }
+
+void BrowseWidget::on_removeButton_clicked()
+{
+    // Get list of selected indexes
+    QModelIndexList indexes = ui->tableView->selectionModel()->selectedIndexes();
+
+    // Delete each index
+    Q_FOREACH(QModelIndex index, indexes) {
+        m_model->removeRow(index.row());
+    }
+
+    // Refresh browse widget
+    m_model->select();
+}
+
+void BrowseWidget::on_addButton_clicked()
+{
+    // Set the edit model to not save
+    m_model->setEditStrategy(QSqlTableModel::OnManualSubmit);
+
+    // Create a new record
+    QSqlRecord newRecord;
+
+    // Insert the row
+    m_model->insertRecord(-1, newRecord);
+}
+
+void BrowseWidget::on_clearButton_clicked()
+{
+    // Remove all rows
+    m_model->removeRows(1, m_model->rowCount()-1);
+
+    // Refresh browse widget
+    m_model->select();
+}
+
+void BrowseWidget::commitChanges()
+{
+    // Submit all previous changes
+    if (m_model->isDirty()) {
+        m_model->submitAll();
+    }
+
+    // Revert back to OnFieldChange
+    //m_model->setEditStrategy(QSqlTableModel::OnFieldChange);
+}

BrowseWidget.h

@@ -24,6 +24,14 @@ class BrowseWidget : public QWidget
 private slots:
     void on_filterButton_clicked();
 
+    void on_removeButton_clicked();
+
+    void on_addButton_clicked();
+
+    void on_clearButton_clicked();
+
+    void commitChanges();
+
 private:
     Ui::BrowseWidget *ui;
 

BrowseWidget.ui

@@ -14,7 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
+   <item row="0" column="0" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
@@ -57,20 +57,32 @@
         <string>Go!</string>
        </property>
        <property name="icon">
-        <iconset theme="dialog-ok-apply"/>
+        <iconset theme="dialog-ok-apply">
+         <normaloff/>
+        </iconset>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item row="1" column="0" colspan="4">
     <widget class="QTableView" name="tableView">
      <property name="enabled">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
+    <widget class="QPushButton" name="clearButton">
+     <property name="text">
+      <string>Clear</string>
+     </property>
+     <property name="icon">
+      <iconset theme="edit-clear"/>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -83,8 +95,8 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="pushButton">
+   <item row="2" column="2">
+    <widget class="QPushButton" name="addButton">
      <property name="text">
       <string>Add</string>
      </property>
@@ -95,8 +107,8 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="pushButton_2">
+   <item row="2" column="3">
+    <widget class="QPushButton" name="removeButton">
      <property name="text">
       <string>Remove</string>
      </property>

DatabaseConnectionWidget.cpp

@@ -54,9 +54,14 @@ bool DatabaseConnectionWidget::createSshTunnel(QString hostname, int remotePort,
     arguments << "-fNg" << "-L" << QString(QString::number(localPort) + ":" + "127.0.0.1" + ":" + QString::number(remotePort)) << QString(hostname);
 
     // Execute SSH Command
-    m_sshTunnel.start("ssh", arguments);
+    //m_sshTunnel.start("ssh", arguments);
+    QProcess::startDetached("ssh", arguments);
 
-    // Wait until finished
+    for (int i = 0; i < 500000; i++) {
+        qDebug() << i;
+    }
+
+    /*// Wait until finished
     if (!m_sshTunnel.waitForStarted(5000)) {
         return false;
     }
@@ -69,7 +74,7 @@ bool DatabaseConnectionWidget::createSshTunnel(QString hostname, int remotePort,
 
     //  Print useful information
     qDebug() << m_sshTunnel.exitCode() << m_sshTunnel.readAllStandardError();
-    qDebug() << QString("SSH tunnel binded to 127.0.0.1:" + QString::number(localPort));
+    qDebug() << QString("SSH tunnel binded to 127.0.0.1:" + QString::number(localPort));*/
 
     return true;
 }