Tabbing added

Author: jimtendo

BrowseWidget.cpp

@@ -16,6 +16,7 @@
 BrowseWidget::BrowseWidget(QWidget *parent) :
     QWidget(parent),
     m_model(NULL),
+    m_schemaWidget(NULL),
     ui(new Ui::BrowseWidget)
 {
     ui->setupUi(this);
@@ -30,13 +31,25 @@ BrowseWidget::~BrowseWidget()
     delete ui;
 }
 
-void BrowseWidget::setDatabase(QSqlDatabase *database)
+void BrowseWidget::init(QSqlDatabase *database, Extension *extension)
 {
-    // Set the database
+    // Set the database and extension
     m_database = database;
+    m_extension = extension;
 
     // Setup the model
     m_model = new QSqlTableModel(this, (*m_database));
+
+    // 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(currentChanged(QModelIndex,QModelIndex)));
+
+    // Setup schema widget (if supported by extension)
+    if (m_extension && m_extension->hasCapability(VIEW_SCHEMA)) {
+        m_schemaWidget = new SchemaWidget(this, m_database, m_extension);
+        m_schemaWidget->init();
+        ui->tabWidget->addTab(m_schemaWidget, QIcon::fromTheme("document-edit"), "Schema");
+        //connect(m_schemaWidget, SIGNAL(refreshNeeded()), this, SLOT(refresh())); // @TODO make this refresh
+    }
 }
 
 bool BrowseWidget::setTable(QString table)
@@ -74,6 +87,11 @@ bool BrowseWidget::setTable(QString table)
     ui->tableView->sortByColumn(0, Qt::AscendingOrder);
     ui->tableView->setAlternatingRowColors(true);
 
+    // If there is a schema-editor, then set the table
+    if (m_schemaWidget) {
+        m_schemaWidget->setTable(table);
+    }
+
     return true;
 }
 
@@ -113,9 +131,6 @@ void BrowseWidget::on_addButton_clicked()
 
     // Select the newly inserted row
     ui->tableView->selectRow(m_model->rowCount()-1);
-
-    // 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(currentChanged(QModelIndex,QModelIndex)));
 }
 
 void BrowseWidget::on_clearButton_clicked()
@@ -140,6 +155,9 @@ void BrowseWidget::commitChanges()
         // Check if there was an error and display it if there was
         if (m_model->lastError().type() != QSqlError::NoError) {
             QMessageBox::critical(this, "Operation failed", m_model->lastError().text());
+
+            // Revert changes and set back to onFieldChange
+            m_model->revertAll();
         }
     }
 }
@@ -152,9 +170,6 @@ void BrowseWidget::currentChanged(QModelIndex previous, QModelIndex current)
         // Commit changes
         commitChanges();
 
-        // There's no reason to call this anymore, we don't need to know if the row has changed
-        disconnect(ui->tableView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(currentChanged(QModelIndex,QModelIndex)));
-
         // Revert back to OnFieldChange
         m_model->setEditStrategy(QSqlTableModel::OnFieldChange);
     }
@@ -171,3 +186,12 @@ void BrowseWidget::on_saveAsButton_clicked()
     // Execute the dialog
     exportSelectionDialog.exec();
 }
+
+void BrowseWidget::refresh()
+{
+    // If there is a schema widget (extension supports it), refresh it
+    /*if (m_schemaWidget) {
+        m_schemaWidget->setTable(m_table);
+    }*/
+    // @TODO this can cause errors if the table no longer exists
+}

BrowseWidget.h

@@ -5,6 +5,8 @@
 #include <QSqlDatabase>
 #include <QSqlTableModel>
 
+#include "SchemaWidget.h"
+
 namespace Ui {
 class BrowseWidget;
 }
@@ -17,7 +19,7 @@ class BrowseWidget : public QWidget
     explicit BrowseWidget(QWidget *parent = 0);
     ~BrowseWidget();
 
-    void setDatabase(QSqlDatabase *database);
+    void init(QSqlDatabase *database, Extension *extension = NULL);
 
     bool setTable(QString table);
 
@@ -36,17 +38,25 @@ private slots:
 
     void on_saveAsButton_clicked();
 
+    void refresh();
+
 private:
     Ui::BrowseWidget *ui;
 
     // Database
     QSqlDatabase *m_database;
 
+    // Extension
+    Extension *m_extension;
+
     // Model for table
     QSqlTableModel *m_model;
 
     // Current Table
     QString m_table;
+
+    // Schema Widget
+    SchemaWidget *m_schemaWidget;
 };
 
 #endif // BROWSEWIDGET_H