/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-03-23 09:49:44 UTC
  • mfrom: (723.1.1 isearch)
  • Revision ID: jelmer@samba.org-20110323094944-7n5h1vif3xpbze3p
Merge support for interactive substring search in bzr viz and annotate.

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
 
from gi.repository import GObject
18
 
from gi.repository import Gtk
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gobject
 
24
import gtk
19
25
 
20
26
from bzrlib.plugins.search import index as _mod_index
21
 
 
22
 
from bzrlib.plugins.gtk.i18n import _i18n
23
 
 
24
 
class SearchDialog(Gtk.Dialog):
 
27
from bzrlib.plugins.gtk import _i18n
 
28
 
 
29
class SearchDialog(gtk.Dialog):
25
30
    """Search dialog."""
26
31
    def __init__(self, index, parent=None):
27
 
        GObject.GObject.__init__(self, title="Search Revisions",
 
32
        gtk.Dialog.__init__(self, title="Search Revisions",
28
33
                                  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)
 
34
                                  flags=gtk.DIALOG_MODAL,
 
35
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
36
                                           gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
37
        pixbuf = self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
33
38
        self.set_icon(pixbuf)
34
39
        
35
40
        # Get arguments
36
41
        self.index = index
37
42
 
38
 
        self.searchbar = Gtk.HBox()
39
 
        searchbar_label = Gtk.Label(label=_i18n("Search for:"))
 
43
        self.searchbar = gtk.HBox()
 
44
        searchbar_label = gtk.Label(_i18n("Search for:"))
40
45
        self.searchbar.pack_start(searchbar_label, False, False, 0)
41
 
        self.searchentry = Gtk.Entry()
 
46
        self.searchentry = gtk.Entry()
42
47
        self.searchentry.connect('activate', self._searchentry_activate)
43
48
        # TODO: Completion using the bzr-search suggests functionality
44
49
        self.searchbar.add(self.searchentry)
45
50
        self.vbox.pack_start(self.searchbar, expand=False, fill=False)
46
51
 
47
 
        self.results_model = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT)
48
 
        self.results_treeview = Gtk.TreeView(self.results_model)
 
52
        self.results_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
 
53
        self.results_treeview = gtk.TreeView(self.results_model)
49
54
        self.results_treeview.connect("row-activated", self._searchresult_row_activated)
50
55
 
51
 
        documentname_column = Gtk.TreeViewColumn(_i18n("Document"), Gtk.CellRendererText(), text=0)
 
56
        documentname_column = gtk.TreeViewColumn(_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(_i18n("Summary"), gtk.CellRendererText(), text=1)
55
60
        self.results_treeview.append_column(summary_column)
56
61
 
57
 
        results_scrolledwindow = Gtk.ScrolledWindow()
58
 
        results_scrolledwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
62
        results_scrolledwindow = gtk.ScrolledWindow()
 
63
        results_scrolledwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
59
64
        results_scrolledwindow.add(self.results_treeview)
60
65
 
61
66
        self.vbox.pack_start(results_scrolledwindow, expand=True, fill=True)
88
93
            self.index._branch.unlock()
89
94
    
90
95
    def _searchresult_row_activated(self, treeview, path, view_column):
91
 
        self.response(Gtk.ResponseType.OK)
 
96
        self.response(gtk.RESPONSE_OK)