← Back to branch summary

~mmcg069/software-center/search-aid-improvments

« back to all changes in this revision

Viewing changes to softwarecenter/ui/gtk3/panes/availablepane.py

  • Committer: Matthew McGowan
  • Date: 2011-07-09 23:42:10 UTC
  • Revision ID: matthew.joseph.mcgowan@gmail.com-20110709234210-bwaj5abwat69u2e2
fixes and tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/ui/gtk3/panes/availablepane.py
360
360
        self.backend.install_multiple(pkgnames, appnames, iconnames)
361
361
 
362
362
    def get_app_items_limit(self):
363
 
        if self.apps_search_term:
 
363
        if self.state.search_term:
364
364
            return DEFAULT_SEARCH_LIMIT
365
365
        elif self.state.category and self.state.category.item_limit > 0:
366
366
            return self.state.category.item_limit
410
410
        LOG.debug("on_search_terms_changed: %s" % new_text)
411
411
 
412
412
        self.state.search_term = new_text
 
413
        vm = get_viewmanager()
413
414
 
414
 
        vm = get_viewmanager()
 
415
        # yeah for special cases - as discussed on irc, mpt
 
416
        # wants this to return to the category screen *if*
 
417
        # we are searching but we are not in any category
 
418
        if not self.state.category and not new_text:
 
419
            # category activate will clear search etc
 
420
            self.state.reset()
 
421
            vm.display_page(self,
 
422
                           AvailablePages.LOBBY,
 
423
                           self.state,
 
424
                           self.display_lobby_page)
 
425
            return False
 
426
        elif (self.state.category and 
 
427
                self.state.category.subcategories and not new_text):
 
428
            vm.display_page(self,
 
429
                           AvailablePages.SUBCATEGORY,
 
430
                           self.state,
 
431
                           self.display_subcategory_page)
 
432
            return False
415
433
        vm.display_page(self, AvailablePages.LIST, self.state, self.display_search_page)
416
434
 
417
435
    def on_db_reopen(self, db):
454
472
            #~ return
455
473
 
456
474
        new_text = view_state.search_term
457
 
        if new_text != self.searchentry.get_text():
458
 
            self.searchentry.set_text_with_no_signal(new_text)
459
 
 
460
 
        # yeah for special cases - as discussed on irc, mpt
461
 
        # wants this to return to the category screen *if*
462
 
        # we are searching but we are not in any category
463
 
        if not self.state.category and not new_text:
464
 
            # category activate will clear search etc
465
 
            vm = get_viewmanager()
466
 
            self.state.reset()
467
 
            vm.display_page(self,
468
 
                           AvailablePages.LOBBY,
469
 
                           self.state,
470
 
                           self.display_lobby_page)
471
 
            return False
472
 
        elif (self.state.category and 
473
 
                self.state.category.subcategories and not new_text):
474
 
            vm = get_viewmanager()
475
 
            vm.display_page(self,
476
 
                           AvailablePages.SUBCATEGORY,
477
 
                           self.state,
478
 
                           self.display_subcategory_page)
479
 
            return False
480
475
        # DTRT if the search is reseted
481
476
        if not new_text:
482
477
            self._clear_search()