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

List:       kde-commits
Subject:    kdebase/konqueror/sidebar/trees
From:       Stephan Binner <binner () kde ! org>
Date:       2004-12-24 0:26:39
Message-ID: 20041224002639.12A8C1BC3C () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Bug 92818: Ability to quick search on history and bookmarks sidebar
May require you to rollback your sidebar back to system default
FEATURE: 92818


  M +23 -2     konqsidebar_tree.cpp   1.16
  M +2 -0      konqsidebar_tree.h   1.11
  M +1 -0      init/bookmarks.desktop   1.112
  M +1 -0      init/bookmarks_module.desktop   1.111
  M +1 -0      init/history.desktop   1.118
  M +1 -0      init/history_module.desktop   1.117


--- kdebase/konqueror/sidebar/trees/konqsidebar_tree.cpp  #1.15:1.16
@@ -6,7 +6,11 @@
 #include <ksimpleconfig.h>
 #include <kinputdialog.h>
+#include <kiconloader.h>
+#include <klistviewsearchline.h>
 
 #include <qclipboard.h>
 #include <qdragobject.h>
+#include <qtoolbutton.h>
+#include <qvbox.h>
 
 KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget \
*widgetParent, QString &desktopName_, const char* name): @@ -17,5 +21,22 @@ \
                KonqSidebar_Tree::KonqSidebar_Tree(KInst
                 int virt= ( (ksc.readEntry("X-KDE-TreeModule","")=="Virtual") \
                ?VIRT_Folder:VIRT_Link);
                 if (virt==1) desktopName_=ksc.readEntry("X-KDE-RelURL","");
-                tree=new KonqSidebarTree(this,widgetParent,virt,desktopName_);
+                
+                widget = new QVBox(widgetParent);
+                
+                if (ksc.readBoolEntry("X-KDE-SearchableTreeModule",false)) {
+                        QHBox* searchline = new QHBox(widget);
+                        searchline->setSpacing(KDialog::spacingHint());
+                        tree=new KonqSidebarTree(this,widget,virt,desktopName_);
+                        QToolButton *clearSearch = new QToolButton(searchline);
+                        clearSearch->setTextLabel(i18n("Clear Search"), true);
+                        \
clearSearch->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : \
"locationbar_erase")); +                        QLabel* slbl = new \
QLabel(i18n("Se&arch:"), searchline); +                        KListViewSearchLine* \
listViewSearch = new KListViewSearchLine(searchline,tree); +                        \
slbl->setBuddy(listViewSearch); +                        connect(clearSearch, \
SIGNAL(pressed()), listViewSearch, SLOT(clear())); +                }
+                else
+                        tree=new KonqSidebarTree(this,widget,virt,desktopName_);
+
                 connect(tree, SIGNAL( openURLRequest( const KURL &, const \
                KParts::URLArgs &)),
                         this,SIGNAL( openURLRequest( const KURL &, const \
KParts::URLArgs &))); @@ -42,5 +63,5 @@ void* KonqSidebar_Tree::provides(const Q
 //void KonqSidebar_Tree::emitStatusBarText (const QString &) {;}
 
-QWidget *KonqSidebar_Tree::getWidget(){return tree;}
+QWidget *KonqSidebar_Tree::getWidget(){return widget;}
 
 void KonqSidebar_Tree::handleURL(const KURL &url)

--- kdebase/konqueror/sidebar/trees/konqsidebar_tree.h  #1.10:1.11
@@ -13,4 +13,5 @@
 #include <qlineedit.h>
 class KonqSidebarTree;
+class QVBox;
 
 class KonqSidebar_Tree: public KonqSidebarPlugin
@@ -24,4 +25,5 @@ class KonqSidebar_Tree: public KonqSideb
                 virtual QWidget *getWidget();
                 protected:
+                        class QVBox *widget;
                         class KonqSidebarTree *tree;
                         virtual void handleURL(const KURL &url);

--- kdebase/konqueror/sidebar/trees/init/bookmarks.desktop  #1.111:1.112
@@ -140,3 +140,4 @@
 Open=false
 X-KDE-TreeModule=Bookmarks
+X-KDE-SearchableTreeModule=true
 X-KDE-KonqSidebarModule=konqsidebar_tree    

--- kdebase/konqueror/sidebar/trees/init/bookmarks_module.desktop  #1.110:1.111
@@ -140,4 +140,5 @@
 Open=false
 X-KDE-TreeModule=Bookmarks
+X-KDE-SearchableTreeModule=true
 X-KDE-TreeModule-Lib=konq_sidebartree_bookmarks
 X-KDE-Default-URL=

--- kdebase/konqueror/sidebar/trees/init/history.desktop  #1.117:1.118
@@ -136,3 +136,4 @@
 Open=false
 X-KDE-TreeModule=History
+X-KDE-SearchableTreeModule=true
 X-KDE-KonqSidebarModule=konqsidebar_tree    

--- kdebase/konqueror/sidebar/trees/init/history_module.desktop  #1.116:1.117
@@ -136,4 +136,5 @@
 Open=false
 X-KDE-TreeModule=History
+X-KDE-SearchableTreeModule=true
 X-KDE-TreeModule-Lib=konq_sidebartree_history    
 X-KDE-Default-URL=   


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