Refresh connections combo box bug fix.

kandalf · Jan 26, 2009 · 0f3c5da · 0f3c5da
1 parent 694751e
commit 0f3c5da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/connectionlistitem.cpp b/src/connectionlistitem.cpp
@@ -7,7 +7,7 @@ ConnectionListItem::ConnectionListItem(QString text, QListWidget *parent)
 }
 
 ConnectionListItem::ConnectionListItem(ConnectionSettings *settings, QListWidget *parent):
-	QListWidgetItem(settings->name + ": " + settings->driver, parent, QListWidgetItem::UserType)
+        QListWidgetItem(settings->name, parent, QListWidgetItem::UserType)
 {
 	_settings = settings;
 }
@@ -20,7 +20,10 @@ ConnectionListItem::~ConnectionListItem()
 
 QString ConnectionListItem::text()
 {
+    if (this->name().isEmpty() || this->name().isNull())
 	return _settings->host + "-" + _settings->name + "-" + _settings->driver;
+    else
+        return this->name();
 }
 
 QString ConnectionListItem::host()
@@ -96,4 +99,4 @@ void ConnectionListItem::setDatabase(const QString &database)
 void ConnectionListItem::setPort(qint16 port)
 {
 	_settings->port = port;
-}
+}
diff --git a/src/migrainemainwindow.cpp b/src/migrainemainwindow.cpp
@@ -92,11 +92,9 @@ void MigraineMainWindow::setupObjectConnections()
 
 void MigraineMainWindow::refreshConnections()
 {
-    for (int i = 0; i < dbSrcConnCombo->count(); i++)
-    {
-        dbSrcConnCombo->removeItem(i);
-        dbTgtConnCombo->removeItem(i);
-    }
+    dbSrcConnCombo->clear();
+    dbTgtConnCombo->clear();
+
     QString emptyOption(tr("Select a connection"));
     dbSrcConnCombo->addItem(emptyOption);
     dbTgtConnCombo->addItem(emptyOption);
@@ -107,8 +105,6 @@ void MigraineMainWindow::refreshConnections()
     if (dbSrcConnCombo->count() > 1)
             dbSrcConnCombo->showPopup();
 
-    if (dbTgtConnCombo->count() > 1)
-            dbTgtConnCombo->showPopup();
 }
 
 void MigraineMainWindow::srcConnectionSelected(const QString &name)