[GNUnet-SVN] r3015 - gnunet-qt/src/plugins/fs

[durner]

Author: durner
Date: 2006-06-16 10:12:30 -0700 (Fri, 16 Jun 2006)
New Revision: 3015

Modified:
   gnunet-qt/src/plugins/fs/fs.cc
Log:
use search combo

Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc      2006-06-16 13:12:00 UTC (rev 3014)
+++ gnunet-qt/src/plugins/fs/fs.cc      2006-06-16 17:12:30 UTC (rev 3015)
@@ -25,6 +25,7 @@
  */
 
 #include <QLineEdit>
+#include <QMessageBox>
 
 #include "fs.h"
 #include "fs-search.h"
@@ -42,7 +43,10 @@
 
 GFSSearch *GFSPlugin::addSearchWnd(QString strLabel)
 {
-  GFSSearch *ret = new GFSSearch();
+  GFSSearch *ret;
+  
+  ret = new GFSSearch();
+  
   connect(ret, SIGNAL(closeSearchWnd(GFSSearch *)), this,
     SLOT(closeSearchClicked(GFSSearch *)));
   ret->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -55,7 +59,19 @@
 {
   GFSSearch *searchWnd;
   int tab;
+  QString strSearch;
+  
+  strSearch = cmbSearchFor->lineEdit()->text();
+  if (strSearch == "")
+  {
+    QMessageBox::critical(this, tr("Error"), tr("No keyword specified"),
+      QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+    return;
+  }
 
+  if (cmbSearchFor->findText(strSearch) == -1)
+    cmbSearchFor->addItem(strSearch);
+
   tabResults->setUpdatesEnabled(false);
 
   /* Try to the use the first tab if it isn't disabled */
@@ -63,7 +79,7 @@
   if (searchWnd->isEnabled())
   {
     /* first tab is already used. Create a new one. */
-    searchWnd = addSearchWnd(cmbSearchFor->lineEdit()->text());
+    searchWnd = addSearchWnd(strSearch);
     tab = tabResults->count() - 1;
   }
   else
@@ -72,7 +88,7 @@
     tab = 0;
   }
 
-  tabResults->setTabText(tab, cmbSearchFor->lineEdit()->text());
+  tabResults->setTabText(tab, strSearch);
   tabResults->setCurrentIndex(tab);
 
   tabResults->setUpdatesEnabled(true);