[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-08-21 10:34:31
Message-ID: 20040821103431.C7C1C9985 () office ! kde ! org
[Download RAW message or body]

CVS commit by arendjr: 

Make the search bar not re-appear in filemanagement mode. This appears to
be either a Qt or Konqueror bug in fact so while I'm here I'll bug the
Trolltech guys about it. :)


  M +20 -4     searchbar.cpp   1.21
  M +13 -10    searchbar.h   1.11
  M +1 -1      searchbar.rc   1.2


--- kdeaddons/konq-plugins/searchbar/searchbar.cpp  #1.20:1.21
@@ -251,8 +251,16 @@ void SearchBarPlugin::partChanged(KParts
 void SearchBarPlugin::updateComboVisibility()
 {
+        kdDebug() << "void SearchBarPlugin::updateComboVisibility()" << endl;
+
         if (m_part.isNull() || !m_searchComboAction->isPlugged())
+        {
                 m_searchCombo->hide();
+                kdDebug() << "  hides the search bar" << endl;
+        }
         else
+        {
                 m_searchCombo->show();
+                kdDebug() << "  shows the search bar" << endl;
+        }
 }
 
@@ -319,3 +327,11 @@ void SearchBarCombo::historyCleared()
 }
 
+void SearchBarCombo::show()
+{
+        if(!isHidden())
+        {
+                KHistoryCombo::show();
+        }
+}
+
 #include "searchbar.moc"

--- kdeaddons/konq-plugins/searchbar/searchbar.h  #1.10:1.11
@@ -63,4 +63,7 @@ class SearchBarCombo : public KHistoryCo
                 int findHistoryItem(const QString &text);
 
+        public slots:
+                virtual void show();
+
         signals:
                 /**

--- kdeaddons/konq-plugins/searchbar/searchbar.rc  #1.1:1.2
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
 <kpartplugin name="searchbar" library="libsearchbarplugin" version="3">
-<ToolBar fullWidth="true" name="locationToolBar" newline="true"><text>Location Toolbar</text>
+<ToolBar fullWidth="true" name="locationToolBar" newline="true"><text>Search Toolbar</text>
   <Action name="toolbar_search_bar" />
 </ToolBar>


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