Latest

Author: Jim Hamill

Extension/Extension.cpp

@@ -49,6 +49,11 @@ int Extension::removeTable(QString table)
     return false;
 }
 
+void Extension::addRelations(QSqlRelationalTableModel *model)
+{
+
+}
+
 QList<ExtensionTab*> Extension::getTabs()
 {
     return m_tabs;

Extension/Extension.h

@@ -6,6 +6,7 @@
 #include <QWidget>
 #include <QIcon>
 #include <QToolBar>
+#include <QSqlRelationalTableModel>
 
 #include "SchemaWidget.h"
 
@@ -36,6 +37,8 @@ Q_OBJECT
     virtual int createTable(QString table);
     virtual int removeTable(QString table);
 
+    virtual void addRelations(QSqlRelationalTableModel *model);
+
     virtual QList<ExtensionTab*> getTabs();
     virtual QList<QToolBar*> getToolBars();
 

MainWindow.cpp

@@ -39,6 +39,9 @@ void MainWindow::on_actionNew_Connection_triggered()
         // Create a new database connection widget
         DatabaseConnectionWidget *databaseConnectionWidget = new DatabaseConnectionWidget(this);
 
+        // Seed random number generator
+        qsrand(QTime::currentTime().msec());
+
         // Get SSH Tunnel information from dialog
         QString sshHostname = connectionDialog.getSshHostname();
         int sshPort = connectionDialog.getSshPort();

OpenConnectionDialog.cpp

@@ -31,6 +31,12 @@ OpenConnectionDialog::~OpenConnectionDialog()
     delete ui;
 }
 
+Connection * OpenConnectionDialog::getConnection()
+{
+    Connection *connection = new Connection;
+    connection->driver = ui->driverCombo->currentText();
+}
+
 QString OpenConnectionDialog::getName()
 {
     if (getDriver() == "QMYSQL" || getDriver() == "QMYSQL3") {
@@ -130,7 +136,7 @@ void OpenConnectionDialog::on_addButton_clicked()
     // Only add connection if there's actually text there
     if (getName().length()) {
         // Add connection from settings to list
-        SavedConnection *newConnection = new SavedConnection;
+        Connection *newConnection = new Connection;
         newConnection->name = getName();
         newConnection->database = getDatabase();
         newConnection->driver = getDriver();
@@ -150,7 +156,7 @@ void OpenConnectionDialog::on_addButton_clicked()
         settings.beginWriteArray("connections");
 
         int i = 0;
-        foreach(SavedConnection* connection, savedConnections)
+        foreach(Connection* connection, savedConnections)
         {
             settings.setArrayIndex(i);
 
@@ -176,9 +182,9 @@ void OpenConnectionDialog::on_addButton_clicked()
 
 void OpenConnectionDialog::on_connectionsListWidget_itemActivated(QListWidgetItem *item)
 {
-    SavedConnection *connection;
+    Connection *connection;
 
-    QList<SavedConnection*>::iterator i;
+    QList<Connection*>::iterator i;
     for (i = savedConnections.begin(); i != savedConnections.end(); ++i) {
 
         if ((*i)->name == item->text()) {
@@ -215,7 +221,7 @@ void OpenConnectionDialog::reloadConnections()
         settings.setArrayIndex(i);
 
         // Add connection from settings to list
-        SavedConnection *connection = new SavedConnection;
+        Connection *connection = new Connection;
         connection->name = settings.value("name").toString();
         connection->database = settings.value("database").toString();
         connection->driver = settings.value("driver").toString();
@@ -242,7 +248,7 @@ void OpenConnectionDialog::on_removeButton_clicked()
     QListWidgetItem *item = ui->connectionsListWidget->currentItem();
 
     if (item) {
-        QList<SavedConnection*>::iterator i;
+        QList<Connection*>::iterator i;
         for (i = savedConnections.begin(); i != savedConnections.end(); ++i) {
             if (item->text() == "-- New Connection --") {
                 break;
@@ -259,7 +265,7 @@ void OpenConnectionDialog::on_removeButton_clicked()
         settings.beginWriteArray("connections");
 
         int j = 0;
-        foreach(SavedConnection* connection, savedConnections)
+        foreach(Connection* connection, savedConnections)
         {
             settings.setArrayIndex(j);
 
@@ -286,7 +292,7 @@ void OpenConnectionDialog::on_removeButton_clicked()
 
 void OpenConnectionDialog::on_newConnectionButton_clicked()
 {
-    SavedConnection *connection = new SavedConnection;
+    Connection *connection = new Connection;
     int driver = ui->driverCombo->findText(connection->driver);
     ui->driverCombo->setCurrentIndex(driver);
     ui->databaseEdit->setText(connection->database);

OpenConnectionDialog.h

@@ -9,7 +9,7 @@ namespace Ui {
 class OpenConnectionDialog;
 }
 
-struct SavedConnection
+struct Connection
 {
     // Database settings
     QString name;
@@ -34,6 +34,8 @@ class OpenConnectionDialog : public QDialog
     explicit OpenConnectionDialog(QWidget *parent = 0);
     ~OpenConnectionDialog();
 
+    Connection *getConnection();
+
     QString getName();
     QString getDriver();
     QString getDatabase();
@@ -71,7 +73,7 @@ private slots:
 private:
     Ui::OpenConnectionDialog *ui;
 
-    QList<SavedConnection*> savedConnections;
+    QList<Connection*> savedConnections;
 };
 
 #endif // OPENCONNECTIONDIALOG_H

QueryHistoryWidget.cpp

@@ -17,3 +17,13 @@ void QueryHistoryWidget::addQuery(QString query)
 {
     ui->commandListWidget->addItem(query);
 }
+
+void QueryHistoryWidget::on_commandListWidget_itemActivated(QListWidgetItem *item)
+{
+    emit querySelected(item->text());
+}
+
+void QueryHistoryWidget::on_clearButton_clicked()
+{
+    ui->commandListWidget->clear();
+}

QueryHistoryWidget.h

@@ -2,6 +2,7 @@
 #define QUERYHISTORYWIDGET_H
 
 #include <QWidget>
+#include <QListWidgetItem>
 
 namespace Ui {
 class QueryHistoryWidget;
@@ -17,6 +18,14 @@ class QueryHistoryWidget : public QWidget
 
     void addQuery(QString query);
 
+signals:
+    void querySelected(const QString&);
+
+private slots:
+    void on_commandListWidget_itemActivated(QListWidgetItem *item);
+
+    void on_clearButton_clicked();
+
 private:
     Ui::QueryHistoryWidget *ui;
 };

QueryHistoryWidget.ui

@@ -14,9 +14,34 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="0" column="0" colspan="2">
     <widget class="QListWidget" name="commandListWidget"/>
    </item>
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>158</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1">
+    <widget class="QToolButton" name="clearButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+     <property name="icon">
+      <iconset theme="edit-clear">
+       <normaloff/>
+      </iconset>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

QueryWidget.cpp

@@ -18,7 +18,7 @@ QueryWidget::QueryWidget(QWidget *parent) :
     m_highlighter = new SQLHighlighter(ui->queryEdit->document());
 
     // Connect history's click with fill function
-    //connect(ui->queryHistoryWidget, SIGNAL())
+    connect(ui->queryHistoryWidget, SIGNAL(querySelected(QString)), this, SLOT(setQuery(QString)));
     connect(ui->savedQueryWidget, SIGNAL(addButtonClicked()), this, SLOT(saveQuery()));
 }
 
@@ -86,3 +86,8 @@ void QueryWidget::saveQuery()
 {
     ui->savedQueryWidget->addQuery(ui->queryEdit->toPlainText());
 }
+
+void QueryWidget::setQuery(QString query)
+{
+    ui->queryEdit->setText(query);
+}

QueryWidget.h

@@ -30,6 +30,8 @@ private slots:
 
     void saveQuery();
 
+    void setQuery(QString query);
+
 signals:
     void refreshNeeded();