[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeaddons/konq-plugins/searchbar
From:       Arend van Beelen jr. <arend () auton ! nl>
Date:       2004-02-17 16:12:45
Message-ID: 20040217161245.273609961 () office ! kde ! org
[Download RAW message or body]

CVS commit by arendjr: 

Made the icon working again.
mlaurent: I encourage a better solution for this, but please leave it in a
working state ;)  


  M +9 -2      searchbar.cpp   1.5
  M +1 -0      searchbar.h   1.4


--- kdeaddons/konq-plugins/searchbar/searchbar.cpp  #1.4:1.5
@@ -53,7 +53,14 @@ SearchBarPlugin::SearchBarPlugin(QObject
         m_part = static_cast<KHTMLPart *>(parent);
 
+        KConfig *config = new KConfig("kuriikwsfilterrc");
+        config->setGroup("General");
+        QString engine = config->readEntry("DefaultSearchEngine", "google");
+        m_searchIcon = SmallIcon(engine);
+        delete config;
+         
         m_searchCombo = new KHistoryCombo(0L, "search combo");
         m_searchCombo->setDuplicatesEnabled(false);
         m_searchCombo->setMinimumWidth(180);
+        m_searchCombo->insertItem(m_searchIcon, 0);
 
         KWidgetAction *searchComboAction = new KWidgetAction(m_searchCombo, i18n("Search Bar"), 0,
@@ -89,9 +96,9 @@ void SearchBarPlugin::startSearch(const 
                 if(m_searchCombo->text(0).isEmpty())
                 {
-                        m_searchCombo->changeItem(data.iconName(), search, 0);
+                        m_searchCombo->changeItem(m_searchIcon, search, 0);
                 }
                 else
                 {
-                        m_searchCombo->insertItem(data.iconName(), search);
+                        m_searchCombo->insertItem(m_searchIcon, search);
                 }
                 emit m_part->browserExtension()->openURLRequest( data.uri() );

--- kdeaddons/konq-plugins/searchbar/searchbar.h  #1.3:1.4
@@ -50,4 +50,5 @@ class SearchBarPlugin : public KParts::P
                 KHTMLPart *m_part;
                 QGuardedPtr<KHistoryCombo> m_searchCombo;
+                QPixmap m_searchIcon;
                 bool m_bURLEnterLock;
 };


[prev in list] [next in list] [prev in thread] [next in thread]