/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: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
search.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
 
import gobject
24
 
import gtk
 
17
from gi.repository import GObject
 
18
from gi.repository import Gtk
25
19
 
26
20
from bzrlib.plugins.search import index as _mod_index
27
21
 
28
22
from bzrlib.plugins.gtk.i18n import _i18n
29
23
 
30
 
class SearchDialog(gtk.Dialog):
 
24
 
 
25
class SearchDialog(Gtk.Dialog):
31
26
    """Search dialog."""
 
27
 
32
28
    def __init__(self, index, parent=None):
33
 
        gtk.Dialog.__init__(self, title="Search Revisions",
34
 
                                  parent=parent,
35
 
                                  flags=gtk.DIALOG_MODAL,
36
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
37
 
                                           gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
38
 
        pixbuf = self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_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)
39
35
        self.set_icon(pixbuf)
40
36
        
41
37
        # Get arguments
42
38
        self.index = index
43
39
 
44
 
        self.searchbar = gtk.HBox()
45
 
        searchbar_label = gtk.Label(_i18n("Search for:"))
 
40
        self.searchbar = Gtk.HBox()
 
41
        searchbar_label = Gtk.Label(label=_i18n("Search for:"))
46
42
        self.searchbar.pack_start(searchbar_label, False, False, 0)
47
 
        self.searchentry = gtk.Entry()
 
43
        self.searchentry = Gtk.Entry()
48
44
        self.searchentry.connect('activate', self._searchentry_activate)
49
45
        # TODO: Completion using the bzr-search suggests functionality
50
46
        self.searchbar.add(self.searchentry)
51
 
        self.vbox.pack_start(self.searchbar, expand=False, fill=False)
52
 
 
53
 
        self.results_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
54
 
        self.results_treeview = gtk.TreeView(self.results_model)
55
 
        self.results_treeview.connect("row-activated", self._searchresult_row_activated)
56
 
 
57
 
        documentname_column = gtk.TreeViewColumn(_i18n("Document"), gtk.CellRendererText(), text=0)
 
47
        self.get_content_area().pack_start(self.searchbar, False, False, 0)
 
48
 
 
49
        self.results_model = Gtk.ListStore(
 
50
            GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT)
 
51
        self.results_treeview = Gtk.TreeView(self.results_model)
 
52
        self.results_treeview.connect(
 
53
            "row-activated", self._searchresult_row_activated)
 
54
 
 
55
        documentname_column = Gtk.TreeViewColumn(
 
56
            _i18n("Document"), Gtk.CellRendererText(), text=0)
58
57
        self.results_treeview.append_column(documentname_column)
59
58
 
60
 
        summary_column = gtk.TreeViewColumn(_i18n("Summary"), gtk.CellRendererText(), text=1)
 
59
        summary_column = Gtk.TreeViewColumn(
 
60
            _i18n("Summary"), Gtk.CellRendererText(), text=1)
61
61
        self.results_treeview.append_column(summary_column)
62
62
 
63
 
        results_scrolledwindow = gtk.ScrolledWindow()
64
 
        results_scrolledwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
63
        results_scrolledwindow = Gtk.ScrolledWindow()
 
64
        results_scrolledwindow.set_policy(
 
65
            Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
65
66
        results_scrolledwindow.add(self.results_treeview)
66
67
 
67
 
        self.vbox.pack_start(results_scrolledwindow, expand=True, fill=True)
 
68
        self.get_content_area().pack_start(
 
69
            results_scrolledwindow, True, True, 0)
68
70
 
69
71
        self.set_default_size(600, 400)
70
72
        # Show the dialog
81
83
        self.results_model.clear()
82
84
        self.index._branch.lock_read()
83
85
        try:
84
 
            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(" ")]
85
89
            for result in self.index.search(query):
86
90
                if isinstance(result, _mod_index.FileTextHit):
87
91
                    revid = result.text_key[-1]
89
93
                    revid = result.revision_key[0]
90
94
                else:
91
95
                    raise AssertionError()
92
 
                self.results_model.append([result.document_name(), result.summary(), revid])
 
96
                self.results_model.append(
 
97
                    [result.document_name(), result.summary(), revid])
93
98
        finally:
94
99
            self.index._branch.unlock()
95
100
    
96
101
    def _searchresult_row_activated(self, treeview, path, view_column):
97
 
        self.response(gtk.RESPONSE_OK)
 
102
        self.response(Gtk.ResponseType.OK)