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

List:       kde-commits
Subject:    kdebase/konqueror/keditbookmarks
From:       Stephan Binner <binner () kde ! org>
Date:       2004-06-15 18:22:21
Message-ID: 20040615182221.7E46C907C () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Switched search to KListViewSearchLine


  M +1 -1      Makefile.am   1.39
  M +19 -12    toplevel.cpp   1.246
  M +0 -2      toplevel.h   1.97
  R            search.cpp   1.30
  R            search.h   1.11


--- kdebase/konqueror/keditbookmarks/Makefile.am  #1.38:1.39
@@ -9,5 +9,5 @@
 dcop_DCOPIDLNG = true
 keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp \
                commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp  \
-                            testlink.cpp favicons.cpp updater.cpp exporters.cpp \
search.cpp kbookmarknotifier.stub bookmarkinfo.cpp +                            \
testlink.cpp favicons.cpp updater.cpp exporters.cpp kbookmarknotifier.stub \
bookmarkinfo.cpp  kbookmarknotifier_DIR = $(includedir)
 keditbookmarks_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la

--- kdebase/konqueror/keditbookmarks/toplevel.cpp  #1.245:1.246
@@ -26,5 +26,4 @@
 #include "actionsimpl.h"
 #include "dcop.h"
-#include "search.h"
 #include "exporters.h"
 
@@ -49,4 +48,5 @@
 #include <klineedit.h>
 #include <kfiledialog.h>
+#include <klistviewsearchline.h>
 
 #include <kbookmarkdrag.h>
@@ -177,8 +177,20 @@ KEBApp::KEBApp(
 
     QSplitter *vsplitter = new QSplitter(this);
-    m_iSearchLineEdit = new MagicKLineEdit(i18n("Click here and type to search..."), \
                
-                                           vsplitter);
-    m_iSearchLineEdit->setMinimumHeight(h);
-    m_iSearchLineEdit->setMaximumHeight(h);
+
+    KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar");
+    
+    KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
+        QApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
+        0, actionCollection(), "reset_quicksearch" );
+    resetQuickSearch->setWhatsThis( i18n( "<b>Reset Quick Search<b><br>"
+        "Resets the quick search so that all bookmarks are shown again." ) );
+    resetQuickSearch->plug( quicksearch );
+
+    QLabel *lbl = new QLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget");
+    
+    KListViewSearchLine *searchLineEdit = new KListViewSearchLine(quicksearch, 0, \
"KListViewSearchLine");     +    quicksearch->setStretchableWidget(searchLineEdit);
+    lbl->setBuddy(searchLineEdit);
+    connect(resetQuickSearch, SIGNAL(activated()), searchLineEdit, SLOT(clear()));
 
     readConfig();
@@ -188,4 +200,5 @@ KEBApp::KEBApp(
     ListView::self()->initListViews();
     ListView::self()->setInitialAddress(address);
+    searchLineEdit->setListView(static_cast<KListView*>(ListView::self()->widget()));
  
     m_bkinfo = new BookmarkInfoWidget(vsplitter);
@@ -210,10 +223,4 @@ KEBApp::KEBApp(
                                SLOT( slotClipboardDataChanged() ));
 
-    connect(m_iSearchLineEdit, SIGNAL( textChanged(const QString &) ),
-            Searcher::self(),  SLOT( slotSearchTextChanged(const QString &) ));
-
-    connect(m_iSearchLineEdit, SIGNAL( returnPressed() ),
-            Searcher::self(),  SLOT( slotSearchNext() ));
-
     ListView::self()->connectSignals();
 

--- kdebase/konqueror/keditbookmarks/toplevel.h  #1.96:1.97
@@ -31,5 +31,4 @@ class KToggleAction;
 class KBookmarkEditorIface;
 class ImportCommand;
-class MagicKLineEdit;
 class BookmarkInfoWidget;
 
@@ -171,5 +170,4 @@ public: // only temporary
 
 private:
-    MagicKLineEdit *m_iSearchLineEdit;
     BookmarkInfoWidget *m_bkinfo;
 


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