/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to search.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
search.py
21
21
 
22
22
from bzrlib.plugins.gtk.i18n import _i18n
23
23
 
 
24
 
24
25
class SearchDialog(Gtk.Dialog):
25
26
    """Search dialog."""
 
27
 
26
28
    def __init__(self, index, parent=None):
27
 
        GObject.GObject.__init__(self, title="Search Revisions",
28
 
                                  parent=parent,
29
 
                                  flags=Gtk.DialogFlags.MODAL,
30
 
                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
31
 
                                           Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
32
 
        pixbuf = self.render_icon(Gtk.STOCK_FIND, Gtk.IconSize.MENU)
 
29
        super(SearchDialog, self).__init__(
 
30
            title="Search Revisions", parent=parent,
 
31
            flags=Gtk.DialogFlags.MODAL,
 
32
            buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
 
33
                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
34
        pixbuf = self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.MENU)
33
35
        self.set_icon(pixbuf)
34
36
        
35
37
        # Get arguments
42
44
        self.searchentry.connect('activate', self._searchentry_activate)
43
45
        # TODO: Completion using the bzr-search suggests functionality
44
46
        self.searchbar.add(self.searchentry)
45
 
        self.vbox.pack_start(self.searchbar, expand=False, fill=False)
 
47
        self.get_content_area().pack_start(self.searchbar, False, False, 0)
46
48
 
47
 
        self.results_model = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT)
 
49
        self.results_model = Gtk.ListStore(
 
50
            GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT)
48
51
        self.results_treeview = Gtk.TreeView(self.results_model)
49
 
        self.results_treeview.connect("row-activated", self._searchresult_row_activated)
 
52
        self.results_treeview.connect(
 
53
            "row-activated", self._searchresult_row_activated)
50
54
 
51
 
        documentname_column = Gtk.TreeViewColumn(_i18n("Document"), Gtk.CellRendererText(), text=0)
 
55
        documentname_column = Gtk.TreeViewColumn(
 
56
            _i18n("Document"), Gtk.CellRendererText(), text=0)
52
57
        self.results_treeview.append_column(documentname_column)
53
58
 
54
 
        summary_column = Gtk.TreeViewColumn(_i18n("Summary"), Gtk.CellRendererText(), text=1)
 
59
        summary_column = Gtk.TreeViewColumn(
 
60
            _i18n("Summary"), Gtk.CellRendererText(), text=1)
55
61
        self.results_treeview.append_column(summary_column)
56
62
 
57
63
        results_scrolledwindow = Gtk.ScrolledWindow()
58
 
        results_scrolledwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
64
        results_scrolledwindow.set_policy(
 
65
            Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
59
66
        results_scrolledwindow.add(self.results_treeview)
60
67
 
61
 
        self.vbox.pack_start(results_scrolledwindow, expand=True, fill=True)
 
68
        self.get_content_area().pack_start(
 
69
            results_scrolledwindow, True, True, 0)
62
70
 
63
71
        self.set_default_size(600, 400)
64
72
        # Show the dialog
75
83
        self.results_model.clear()
76
84
        self.index._branch.lock_read()
77
85
        try:
78
 
            query = [(query_item,) for query_item in self.searchentry.get_text().split(" ")]
 
86
            query = [
 
87
                (query_item,)
 
88
                for query_item in self.searchentry.get_text().split(" ")]
79
89
            for result in self.index.search(query):
80
90
                if isinstance(result, _mod_index.FileTextHit):
81
91
                    revid = result.text_key[-1]
83
93
                    revid = result.revision_key[0]
84
94
                else:
85
95
                    raise AssertionError()
86
 
                self.results_model.append([result.document_name(), result.summary(), revid])
 
96
                self.results_model.append(
 
97
                    [result.document_name(), result.summary(), revid])
87
98
        finally:
88
99
            self.index._branch.unlock()
89
100