Diff
Differences From Artifact [31aa4c2365]:
- Executable file
st2.py
— part of check-in
[ac8632bc29]
at
2014-06-03 00:29:43
on branch trunk
— Search dialog offers (x) all channels or (x) just current for server+cache scan
again. Removed search="" parameter from channels that don't implement it.
(To remove extraneous .has_search channel attribute again somewhen..)
External: Xiph IO cache ?search= should be changed to work on station titles instead of genres. (user: mario, size: 44946) [annotate] [blame] [check-ins using]
To Artifact [5dbf6dbb13]:
- Executable file st2.py — part of check-in [a7ee09dc9a] at 2014-06-16 15:06:23 on branch trunk — Keep last searched channel for search dialog (but avoid bookmarks) (user: mario, size: 45183) [annotate] [blame] [check-ins using]
579 580 581 582 583 584 585 586 587 588 589 | # aux win: search dialog (keeps search text in self.q) # and also: quick search textbox (uses main.q instead) class search (auxiliary_window): # show search dialog def menu_search(self, w): self.search_dialog.show(); | > > > > | | | 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 | # aux win: search dialog (keeps search text in self.q) # and also: quick search textbox (uses main.q instead) class search (auxiliary_window): # either current channel, or last channel (avoid searching in bookmarks) current = None # show search dialog def menu_search(self, w): self.search_dialog.show(); if not self.current or main.current_channel != "bookmarks": self.current = main.current_channel self.search_dialog_current.set_label("just %s" % main.channels[self.current].title) # hide dialog box again def cancel(self, *args): self.search_dialog.hide() return True # stop any other gtk handlers # prepare variables def prepare_search(self): main.status("Searching... Stand back.") self.cancel() self.q = self.search_full.get_text().lower() if self.search_dialog_all.get_active(): self.targets = main.channels.keys() else: self.targets = [self.current] main.bookmarks.streams["search"] = [] # perform search def cache_search(self, *w): self.prepare_search() entries = [] # which fields? |