Updated some things

Author: Jim Hamill

Extension/MySQLExtension.cpp

@@ -1,6 +1,5 @@
 #include "MySQLExtension.h"
 #include "MySQLTools.h"
-#include "MySQLSchemaWidget.h"
 
 #include <QApplication>
 #include <QAction>

Extension/MySQLSchemaWidget.cpp

@@ -227,24 +227,28 @@ void OpenConnectionDialog::reloadConnections()
     for (int i = 0; i < size; i++) {
         settings.setArrayIndex(i);
 
-        // Add connection from settings to list
-        Connection *connection = new Connection;
-        connection->name = settings.value("name").toString();
-        connection->database = settings.value("database").toString();
-        connection->driver = settings.value("driver").toString();
-        connection->hostname = settings.value("hostname").toString();
-        connection->username = settings.value("username").toString();
-        connection->password = settings.value("password").toString();
-        connection->port = settings.value("port").toInt();
-        connection->sshTunnel = settings.value("sshTunnel").toBool();
-        connection->sshHostname = settings.value("sshHostname").toString();
-        connection->sshPort = settings.value("sshPort").toInt();
-
-        // Append to saved connections
-        savedConnections.append(connection);
+        // If filter is empty or the value in the filter matches the name, add it
+        if (ui->filterEdit->text().isEmpty() || settings.value("name").toString().contains(ui->filterEdit->text())) {
 
-        // Add item to combo box
-        ui->connectionsListWidget->addItem(connection->name);
+            // Add connection from settings to list
+            Connection *connection = new Connection;
+            connection->name = settings.value("name").toString();
+            connection->database = settings.value("database").toString();
+            connection->driver = settings.value("driver").toString();
+            connection->hostname = settings.value("hostname").toString();
+            connection->username = settings.value("username").toString();
+            connection->password = settings.value("password").toString();
+            connection->port = settings.value("port").toInt();
+            connection->sshTunnel = settings.value("sshTunnel").toBool();
+            connection->sshHostname = settings.value("sshHostname").toString();
+            connection->sshPort = settings.value("sshPort").toInt();
+
+            // Append to saved connections
+            savedConnections.append(connection);
+
+            // Add item to combo box
+            ui->connectionsListWidget->addItem(connection->name);
+        }
     }
     settings.endArray();
 
@@ -322,3 +326,8 @@ void OpenConnectionDialog::on_sshTunnelCheckBox_toggled(bool checked)
         ui->hostnameEdit->setText("127.0.0.1");
     }
 }
+
+void OpenConnectionDialog::on_filterEdit_textChanged(const QString &arg1)
+{
+    reloadConnections();
+}

Extension/MySQLSchemaWidget.h

@@ -65,6 +65,8 @@ private slots:
 
     void on_sshTunnelCheckBox_toggled(bool checked);
 
+    void on_filterEdit_textChanged(const QString &arg1);
+
 private:
     void reloadConnections();
 

OpenConnectionDialog.cpp

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>453</width>
-    <height>282</height>
+    <width>451</width>
+    <height>324</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,7 +32,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2" rowspan="2">
+   <item row="0" column="2" rowspan="3">
     <widget class="QGroupBox" name="connGroupBox">
      <property name="title">
       <string>Connection settings</string>
@@ -41,7 +41,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="textLabel2">
         <property name="text">
-         <string>D&amp;river</string>
+         <string>Dri&amp;ver</string>
         </property>
         <property name="buddy">
          <cstring>driverCombo</cstring>
@@ -122,7 +122,7 @@
       <item row="4" column="0">
        <widget class="QLabel" name="textLabel5">
         <property name="text">
-         <string>&amp;Hostname:</string>
+         <string>Hostna&amp;me:</string>
         </property>
         <property name="buddy">
          <cstring>hostnameEdit</cstring>
@@ -240,7 +240,14 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="2" column="0" colspan="2">
+    <widget class="QLineEdit" name="filterEdit">
+     <property name="placeholderText">
+      <string>Filter...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
     <widget class="QPushButton" name="addButton">
      <property name="text">
       <string>Add</string>
@@ -252,7 +259,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QPushButton" name="removeButton">
      <property name="text">
       <string>Remove</string>
@@ -264,7 +271,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="3" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>