← Back to branch summary

~ubuntu-core-dev/synaptic/ubuntu

« back to all changes in this revision

Viewing changes to gtk/rgmainwindow.cc

  • Committer: Michael Vogt
  • Date: 2008-05-29 16:46:44 UTC
  • mfrom: (1529.16.2 ept)
  • mto: (1643.1.2 ubuntu-ept)
  • mto: This revision was merged to the branch mainline in revision 1648.
  • Revision ID: michael.vogt@ubuntu.com-20080529164644-agq4a5yeq8eb6l0p
common/rpackagelister.{h,cc}:
- add limitBySearch() and xapianSearch() methods
common/rpackageview.{cc,h}:
- add RPackageView::hasPackage() for the limitBySearch() code
- move the xapian code out and into RPackageLister so that it
  acts as a dynamic filter

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/rgmainwindow.cc
1109
1109
   glade_xml_signal_connect_data(_gladeXML,
1110
1110
                                 "on_button_details_clicked",
1111
1111
                                 G_CALLBACK(cbDetailsWindow), this);
 
1112
   glade_xml_signal_connect_data(_gladeXML,
 
1113
                                 "on_entry_fast_search_changed",
 
1114
                                 G_CALLBACK(cbSearchEntryChanged), this);
1112
1115
 
1113
1116
   _propertiesB = glade_xml_get_widget(_gladeXML, "button_details");
1114
1117
   assert(_propertiesB);
2327
2330
 
2328
2331
      int type = me->_findWin->getSearchType();
2329
2332
      int found;
2330
 
#ifdef WITH_EPT
2331
 
      if (me->_lister->textsearch().hasData())
2332
 
      {
2333
 
         found = me->_lister->eptSearchView()->setSearch(str, locale_str);
2334
 
         me->changeView(PACKAGE_VIEW_EPTSEARCH, str);
2335
 
      } else {
2336
 
#endif
2337
 
         found = me->_lister->searchView()->setSearch(str, type, locale_str);
2338
 
         me->changeView(PACKAGE_VIEW_SEARCH, str);
2339
 
#ifdef WITH_EPT
2340
 
      }
2341
 
#endif
 
2333
      found = me->_lister->searchView()->setSearch(str, type, locale_str);
 
2334
      me->changeView(PACKAGE_VIEW_SEARCH, str);
2342
2335
 
2343
2336
      me->setBusyCursor(false);
2344
2337
      gchar *statusstr = g_strdup_printf(_("Found %i packages"), found);
2802
2795
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb)));
2803
2796
}
2804
2797
 
 
2798
void RGMainWindow::cbSearchEntryChanged(GtkWidget *edit, void *data)
 
2799
{
 
2800
   const int qualityCutoff = 50;
 
2801
 
 
2802
   //cerr << "RGMainWindow::cbSearchEntryChanged()" << endl;
 
2803
   RGMainWindow *me = (RGMainWindow *) data;
 
2804
 
 
2805
   const gchar *str = gtk_entry_get_text(GTK_ENTRY(edit));
 
2806
   if(str == NULL || strlen(str) < 2) {
 
2807
      me->_lister->reapplyFilter();
 
2808
      me->refreshTable();
 
2809
      return;
 
2810
   }
 
2811
   me->_lister->limitBySearch(str);
 
2812
   me->refreshTable();
 
2813
}
2805
2814
 
2806
2815
void RGMainWindow::cbUpdateClicked(GtkWidget *self, void *data)
2807
2816
{