/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 annotate/gannotate.py

  • Committer: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
import time
18
18
 
19
 
from gi.repository import GObject
20
 
from gi.repository import Gdk
21
 
from gi.repository import Gtk
22
 
from gi.repository import Pango
 
19
import pygtk
 
20
pygtk.require("2.0")
 
21
import gobject
 
22
import gtk
 
23
import pango
23
24
import re
24
25
 
25
 
from bzrlib import patiencediff
 
26
from bzrlib import patiencediff, tsort
26
27
from bzrlib.errors import NoSuchRevision
27
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
28
29
 
29
 
from bzrlib.plugins.gtk.annotate.colormap import AnnotateColorSaturation
30
 
from bzrlib.plugins.gtk.revisionview import RevisionView
31
 
from bzrlib.plugins.gtk.window import Window
 
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
 
31
from bzrlib.plugins.gtk.logview import LogView
32
32
 
33
33
 
34
34
(
41
41
) = range(6)
42
42
 
43
43
 
44
 
class GAnnotateWindow(Window):
 
44
class GAnnotateWindow(gtk.Window):
45
45
    """Annotate window."""
46
46
 
47
 
    def __init__(self, all=False, plain=False, parent=None, branch=None):
 
47
    def __init__(self, all=False, plain=False):
48
48
        self.all = all
49
49
        self.plain = plain
50
 
        self._branch = branch
51
 
 
52
 
        super(GAnnotateWindow, self).__init__(parent=parent)
53
 
 
54
 
        self.set_icon(
55
 
            self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON))
 
50
        
 
51
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
52
        
 
53
        self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
56
54
        self.annotate_colormap = AnnotateColorSaturation()
57
55
 
58
56
        self._create()
65
63
        self.branch = branch
66
64
        self.tree = tree
67
65
        self.file_id = file_id
68
 
        self.revisionview.set_file_id(file_id)
69
66
        self.revision_id = getattr(tree, 'get_revision_id', 
70
67
                                   lambda: CURRENT_REVISION)()
71
 
 
 
68
        
72
69
        # [revision id, line number, author, revno, highlight color, line]
73
 
        self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
74
 
                                       GObject.TYPE_INT,
75
 
                                       GObject.TYPE_STRING,
76
 
                                       GObject.TYPE_STRING,
77
 
                                       GObject.TYPE_STRING,
78
 
                                       GObject.TYPE_STRING)
79
 
 
 
70
        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
 
71
                                       gobject.TYPE_STRING,
 
72
                                       gobject.TYPE_STRING,
 
73
                                       gobject.TYPE_STRING,
 
74
                                       gobject.TYPE_STRING,
 
75
                                       gobject.TYPE_STRING)
 
76
        
80
77
        last_seen = None
81
78
        try:
82
79
            branch.lock_read()
83
80
            branch.repository.lock_read()
84
 
            self.dotted = {}
85
 
            revno_map = self.branch.get_revision_id_to_revno_map()
86
 
            for revision_id, revno in revno_map.iteritems():
87
 
                self.dotted[revision_id] = '.'.join(str(num) for num in revno)
88
81
            for line_no, (revision, revno, line)\
89
 
                in enumerate(self._annotate(tree, file_id)):
 
82
                    in enumerate(self._annotate(tree, file_id)):
90
83
                if revision.revision_id == last_seen and not self.all:
91
 
                    revno = author = ""
 
84
                    revno = committer = ""
92
85
                else:
93
86
                    last_seen = revision.revision_id
94
 
                    author = ", ".join(revision.get_apparent_authors())
 
87
                    committer = revision.properties.get('author',
 
88
                        revision.committer)
95
89
 
96
90
                if revision.revision_id not in self.revisions:
97
91
                    self.revisions[revision.revision_id] = revision
98
92
 
99
93
                self.annomodel.append([revision.revision_id,
100
94
                                       line_no + 1,
101
 
                                       author,
 
95
                                       committer,
102
96
                                       revno,
103
97
                                       None,
104
98
                                       line.rstrip("\r\n")
105
 
                                       ])
 
99
                                      ])
106
100
                self.annotations.append(revision)
107
101
 
108
102
            if not self.plain:
114
108
 
115
109
        self.annoview.set_model(self.annomodel)
116
110
        self.annoview.grab_focus()
117
 
        my_revno = self.dotted.get(self.revision_id, 'current')
118
 
        title = '%s (%s) - gannotate' % (self.tree.id2path(file_id), my_revno)
119
 
        self.set_title(title)
120
111
 
121
112
    def jump_to_line(self, lineno):
122
113
        if lineno > len(self.annomodel) or lineno < 1:
125
116
            # bar?
126
117
            print("gannotate: Line number %d does't exist. Defaulting to "
127
118
                  "line 1." % lineno)
128
 
            return
 
119
            return
129
120
        else:
130
121
            row = lineno - 1
131
122
 
132
 
        tree_path = Gtk.TreePath(path=row)
133
 
        self.annoview.set_cursor(tree_path, None, False)
134
 
        self.annoview.scroll_to_cell(tree_path, use_align=True)
 
123
        self.annoview.set_cursor(row)
 
124
        self.annoview.scroll_to_cell(row, use_align=True)
 
125
 
 
126
    def _dotted_revnos(self, repository, revision_id):
 
127
        """Return a dict of revision_id -> dotted revno
 
128
        
 
129
        :param repository: The repository to get the graph from
 
130
        :param revision_id: The last revision for which this info is needed
 
131
        """
 
132
        graph = repository.get_revision_graph(revision_id)
 
133
        dotted = {}
 
134
        for n, revision_id, d, revno, e in tsort.merge_sort(graph, 
 
135
            revision_id, generate_revno=True):
 
136
            dotted[revision_id] = '.'.join(str(num) for num in revno)
 
137
        return dotted
135
138
 
136
139
    def _annotate(self, tree, file_id):
137
140
        current_revision = FakeRevision(CURRENT_REVISION)
139
142
        current_revision.timestamp = time.time()
140
143
        current_revision.message = '[Not yet committed]'
141
144
        current_revision.parent_ids = tree.get_parent_ids()
142
 
        current_revision.properties['branch-nick'] = self.branch._get_nick(local=True)
 
145
        current_revision.properties['branch-nick'] = self.branch.nick
143
146
        current_revno = '%d?' % (self.branch.revno() + 1)
144
147
        repository = self.branch.repository
145
148
        if self.revision_id == CURRENT_REVISION:
146
149
            revision_id = self.branch.last_revision()
147
150
        else:
148
151
            revision_id = self.revision_id
 
152
        dotted = self._dotted_revnos(repository, revision_id)
149
153
        revision_cache = RevisionCache(repository, self.revisions)
150
154
        for origin, text in tree.annotate_iter(file_id):
151
155
            rev_id = origin
155
159
            else:
156
160
                try:
157
161
                    revision = revision_cache.get_revision(rev_id)
158
 
                    revno = self.dotted.get(rev_id, 'merge')
 
162
                    revno = dotted.get(rev_id, 'merge')
159
163
                    if len(revno) > 15:
160
164
                        revno = 'merge'
161
165
                except NoSuchRevision:
167
171
    def _highlight_annotation(self, model, path, iter, now):
168
172
        revision_id, = model.get(iter, REVISION_ID_COL)
169
173
        revision = self.revisions[revision_id]
170
 
        # XXX sinzui 2011-08-12: What does get_color return?
171
 
        color = self.annotate_colormap.get_color(revision, now)
172
 
        model.set_value(iter, HIGHLIGHT_COLOR_COL, color)
 
174
        model.set(iter, HIGHLIGHT_COLOR_COL,
 
175
                  self.annotate_colormap.get_color(revision, now))
173
176
 
174
177
    def _selected_revision(self):
175
178
        (path, col) = self.annoview.get_cursor()
179
182
 
180
183
    def _activate_selected_revision(self, w):
181
184
        rev_id = self._selected_revision()
182
 
        if not rev_id or rev_id == NULL_REVISION:
 
185
        if rev_id is None:
183
186
            return
184
187
        selected = self.revisions[rev_id]
185
 
        self.revisionview.set_revision(selected)
 
188
        self.logview.set_revision(selected)
186
189
        if (len(selected.parent_ids) != 0 and selected.parent_ids[0] not in
187
190
            self._no_back):
188
191
            enable_back = True
191
194
        self.back_button.set_sensitive(enable_back)
192
195
 
193
196
    def _create(self):
194
 
        self.revisionview = self._create_log_view()
 
197
        self.logview = self._create_log_view()
195
198
        self.annoview = self._create_annotate_view()
196
199
 
197
 
        vbox = Gtk.VBox(homogeneous=False, spacing=0)
 
200
        vbox = gtk.VBox(False)
198
201
        vbox.show()
199
202
 
200
 
        sw = Gtk.ScrolledWindow()
201
 
        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
202
 
        sw.set_shadow_type(Gtk.ShadowType.IN)
 
203
        sw = gtk.ScrolledWindow()
 
204
        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
205
        sw.set_shadow_type(gtk.SHADOW_IN)
203
206
        sw.add(self.annoview)
204
207
        self.annoview.gwindow = self
205
208
        sw.show()
206
209
 
207
 
        swbox = Gtk.VBox()
208
 
        swbox.pack_start(sw, True, True, 0)
 
210
        swbox = gtk.VBox()
 
211
        swbox.pack_start(sw)
209
212
        swbox.show()
210
213
 
211
 
        hbox = Gtk.HBox(homogeneous=False, spacing=6)
 
214
        hbox = gtk.HBox(False, 6)
212
215
        self.back_button = self._create_back_button()
213
 
        hbox.pack_start(self.back_button, False, True, 0)
 
216
        hbox.pack_start(self.back_button, expand=False, fill=True)
214
217
        self.forward_button = self._create_forward_button()
215
 
        hbox.pack_start(self.forward_button, False, True, 0)
216
 
        self.find_button = self._create_find_button()
217
 
        hbox.pack_start(self.find_button, False, True, 0)
218
 
        self.goto_button = self._create_goto_button()
219
 
        hbox.pack_start(self.goto_button, False, True, 0)
 
218
        hbox.pack_start(self.forward_button, expand=False, fill=True)
220
219
        hbox.show()
221
 
        vbox.pack_start(hbox, False, True, 0)
222
 
 
223
 
        self.pane = pane = Gtk.VPaned()
 
220
        vbox.pack_start(hbox, expand=False, fill=True)
 
221
        
 
222
        self.pane = pane = gtk.VPaned()
224
223
        pane.add1(swbox)
225
 
        pane.add2(self.revisionview)
 
224
        pane.add2(self.logview)
226
225
        pane.show()
227
 
        vbox.pack_start(pane, True, True, 0)
 
226
        vbox.pack_start(pane, expand=True, fill=True)
228
227
 
229
228
        self._search = SearchBox()
230
 
        swbox.pack_start(self._search, False, True, 0)
231
 
        accels = Gtk.AccelGroup()
232
 
        accels.connect(Gdk.KEY_f, Gdk.ModifierType.CONTROL_MASK,
233
 
                             Gtk.AccelFlags.LOCKED,
 
229
        swbox.pack_start(self._search, expand=False, fill=True)
 
230
        accels = gtk.AccelGroup()
 
231
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
 
232
                             gtk.ACCEL_LOCKED,
234
233
                             self._search_by_text)
235
 
        accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
236
 
                             Gtk.AccelFlags.LOCKED,
 
234
        accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
 
235
                             gtk.ACCEL_LOCKED,
237
236
                             self._search_by_line)
238
237
        self.add_accel_group(accels)
239
238
 
240
239
        self.add(vbox)
241
240
 
242
 
    def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
 
241
    def _search_by_text(self, accel_group, window, key, modifiers):
243
242
        self._search.show_for('text')
244
243
        self._search.set_target(self.annoview, TEXT_LINE_COL)
245
244
 
246
 
    def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
 
245
    def _search_by_line(self, accel_group, window, key, modifiers):
247
246
        self._search.show_for('line')
248
247
        self._search.set_target(self.annoview, LINE_NUM_COL)
249
248
 
250
 
    def line_diff(self, tv, path, tvc):
251
 
        row = path.get_indices()[0]
 
249
    def row_diff(self, tv, path, tvc):
 
250
        row = path[0]
252
251
        revision = self.annotations[row]
253
252
        repository = self.branch.repository
254
253
        if revision.revision_id == CURRENT_REVISION:
261
260
            else:
262
261
                tree2 = repository.revision_tree(NULL_REVISION)
263
262
        from bzrlib.plugins.gtk.diff import DiffWindow
264
 
        window = DiffWindow(self)
265
 
        window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
 
263
        window = DiffWindow()
 
264
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
266
265
        window.set_file(tree1.id2path(self.file_id))
267
266
        window.show()
268
267
 
269
268
 
270
269
    def _create_annotate_view(self):
271
 
        tv = Gtk.TreeView()
 
270
        tv = gtk.TreeView()
272
271
        tv.set_rules_hint(False)
273
272
        tv.connect("cursor-changed", self._activate_selected_revision)
274
273
        tv.show()
275
 
        tv.connect("row-activated", self.line_diff)
 
274
        tv.connect("row-activated", self.row_diff)
276
275
 
277
 
        cell = Gtk.CellRendererText()
 
276
        cell = gtk.CellRendererText()
278
277
        cell.set_property("xalign", 1.0)
279
278
        cell.set_property("ypad", 0)
280
279
        cell.set_property("family", "Monospace")
281
280
        cell.set_property("cell-background-gdk",
282
 
                          tv.get_style().bg[Gtk.StateType.NORMAL])
283
 
        col = Gtk.TreeViewColumn()
 
281
                          tv.get_style().bg[gtk.STATE_NORMAL])
 
282
        col = gtk.TreeViewColumn()
284
283
        col.set_resizable(False)
285
 
        col.pack_start(cell, True)
 
284
        col.pack_start(cell, expand=True)
286
285
        col.add_attribute(cell, "text", LINE_NUM_COL)
287
286
        tv.append_column(col)
288
287
 
289
 
        cell = Gtk.CellRendererText()
 
288
        cell = gtk.CellRendererText()
290
289
        cell.set_property("ypad", 0)
291
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
 
290
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
292
291
        cell.set_property("cell-background-gdk",
293
 
                          self.get_style().bg[Gtk.StateType.NORMAL])
294
 
        col = Gtk.TreeViewColumn("Committer")
 
292
                          self.get_style().bg[gtk.STATE_NORMAL])
 
293
        col = gtk.TreeViewColumn("Committer")
295
294
        col.set_resizable(True)
296
 
        col.pack_start(cell, True)
 
295
        col.pack_start(cell, expand=True)
297
296
        col.add_attribute(cell, "text", COMMITTER_COL)
298
297
        tv.append_column(col)
299
298
 
300
 
        cell = Gtk.CellRendererText()
 
299
        cell = gtk.CellRendererText()
301
300
        cell.set_property("xalign", 1.0)
302
301
        cell.set_property("ypad", 0)
303
302
        cell.set_property("cell-background-gdk",
304
 
                          self.get_style().bg[Gtk.StateType.NORMAL])
305
 
        col = Gtk.TreeViewColumn("Revno")
 
303
                          self.get_style().bg[gtk.STATE_NORMAL])
 
304
        col = gtk.TreeViewColumn("Revno")
306
305
        col.set_resizable(False)
307
 
        col.pack_start(cell, True)
 
306
        col.pack_start(cell, expand=True)
308
307
        col.add_attribute(cell, "markup", REVNO_COL)
309
308
        tv.append_column(col)
310
309
 
311
 
        cell = Gtk.CellRendererText()
 
310
        cell = gtk.CellRendererText()
312
311
        cell.set_property("ypad", 0)
313
312
        cell.set_property("family", "Monospace")
314
 
        col = Gtk.TreeViewColumn()
 
313
        col = gtk.TreeViewColumn()
315
314
        col.set_resizable(False)
316
 
        col.pack_start(cell, True)
 
315
        col.pack_start(cell, expand=True)
317
316
#        col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
318
317
        col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
319
318
        col.add_attribute(cell, "text", TEXT_LINE_COL)
320
319
        tv.append_column(col)
321
320
 
322
 
        # interactive substring search
323
 
        def search_equal_func(model, column, key, iter):
324
 
            return model.get_value(iter, TEXT_LINE_COL).lower().find(key.lower()) == -1
325
 
 
326
 
        tv.set_enable_search(True)
327
 
        tv.set_search_equal_func(search_equal_func, None)
 
321
        # FIXME: Now that C-f is now used for search by text we
 
322
        # may as well disable the auto search.
 
323
        tv.set_search_column(LINE_NUM_COL)
328
324
 
329
325
        return tv
330
326
 
331
327
    def _create_log_view(self):
332
 
        lv = RevisionView(self._branch)
 
328
        lv = LogView()
333
329
        lv.show()
334
330
        return lv
335
331
 
336
332
    def _create_back_button(self):
337
 
        button = Gtk.Button()
 
333
        button = gtk.Button()
338
334
        button.set_use_stock(True)
339
335
        button.set_label("gtk-go-back")
340
336
        button.connect("clicked", lambda w: self.go_back())
341
 
        button.set_relief(Gtk.ReliefStyle.NONE)
 
337
        button.set_relief(gtk.RELIEF_NONE)
342
338
        button.show()
343
339
        return button
344
340
 
345
341
    def _create_forward_button(self):
346
 
        button = Gtk.Button()
 
342
        button = gtk.Button()
347
343
        button.set_use_stock(True)
348
344
        button.set_label("gtk-go-forward")
349
345
        button.connect("clicked", lambda w: self.go_forward())
350
 
        button.set_relief(Gtk.ReliefStyle.NONE)
 
346
        button.set_relief(gtk.RELIEF_NONE)
351
347
        button.show()
352
348
        button.set_sensitive(False)
353
349
        return button
354
350
 
355
 
    def _create_find_button(self):
356
 
        button = Gtk.Button()
357
 
        button.set_use_stock(True)
358
 
        button.set_label("gtk-find")
359
 
        button.set_tooltip_text("Search for text (Ctrl+F)")
360
 
        button.connect("clicked", self._search_by_text)
361
 
        button.set_relief(Gtk.ReliefStyle.NONE)
362
 
        button.show()
363
 
        button.set_sensitive(True)
364
 
        return button
365
 
 
366
 
    def _create_goto_button(self):
367
 
        button = Gtk.Button()
368
 
        button.set_label("Goto Line")
369
 
        button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
370
 
        button.connect("clicked", self._search_by_line)
371
 
        button.set_relief(Gtk.ReliefStyle.NONE)
372
 
        button.show()
373
 
        button.set_sensitive(True)
374
 
        return button
375
 
 
376
351
    def go_back(self):
377
352
        last_tree = self.tree
378
353
        rev_id = self._selected_revision()
397
372
        rev_id = self._selected_revision()
398
373
        if self.file_id in target_tree:
399
374
            offset = self.get_scroll_offset(target_tree)
400
 
            path, col = self.annoview.get_cursor()
401
 
            (row,) = path.get_indices()
 
375
            (row,), col = self.annoview.get_cursor()
402
376
            self.annotate(target_tree, self.branch, self.file_id)
403
377
            new_row = row+offset
404
378
            if new_row < 0:
405
379
                new_row = 0
406
 
            new_path = Gtk.TreePath(path=new_row)
407
 
            self.annoview.set_cursor(new_path, None, False)
 
380
            self.annoview.set_cursor(new_row)
408
381
            return True
409
382
        else:
410
383
            return False
412
385
    def get_scroll_offset(self, tree):
413
386
        old = self.tree.get_file(self.file_id)
414
387
        new = tree.get_file(self.file_id)
415
 
        path, col = self.annoview.get_cursor()
416
 
        (row,) = path.get_indices()
 
388
        (row,), col = self.annoview.get_cursor()
417
389
        matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
418
390
                                                       new.readlines())
419
391
        for i, j, n in matcher.get_matching_blocks():
421
393
                return j - i
422
394
 
423
395
 
424
 
class FakeRevision(object):
 
396
 
 
397
class FakeRevision:
425
398
    """ A fake revision.
426
399
 
427
400
    For when a revision is referenced but not present.
436
409
        self.timezone = 0
437
410
        self.properties = {}
438
411
 
439
 
    def get_apparent_authors(self):
440
 
        return [self.committer]
441
 
 
442
412
 
443
413
class RevisionCache(object):
444
414
    """A caching revision source"""
445
 
 
446
415
    def __init__(self, real_source, seed_cache=None):
447
416
        self.__real_source = real_source
448
417
        if seed_cache is None:
456
425
            self.__cache[revision_id] = revision
457
426
        return self.__cache[revision_id]
458
427
 
459
 
 
460
 
class SearchBox(Gtk.HBox):
 
428
class SearchBox(gtk.HBox):
461
429
    """A button box for searching in text or lines of annotations"""
462
430
    def __init__(self):
463
 
        super(SearchBox, self).__init__(homogeneous=False, spacing=6)
 
431
        gtk.HBox.__init__(self, False, 6)
464
432
 
465
433
        # Close button
466
 
        button = Gtk.Button()
467
 
        image = Gtk.Image()
468
 
        image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
 
434
        button = gtk.Button()
 
435
        image = gtk.Image()
 
436
        image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
469
437
        button.set_image(image)
470
 
        button.set_relief(Gtk.ReliefStyle.NONE)
471
 
        button.connect("clicked", lambda w: self.hide())
472
 
        self.pack_start(button, False, False, 0)
 
438
        button.set_relief(gtk.RELIEF_NONE)
 
439
        button.connect("clicked", lambda w: self.hide_all())
 
440
        self.pack_start(button, expand=False, fill=False)
473
441
 
474
442
        # Search entry
475
 
        label = Gtk.Label()
 
443
        label = gtk.Label()
476
444
        self._label = label
477
 
        self.pack_start(label, False, False, 0)
 
445
        self.pack_start(label, expand=False, fill=False)
478
446
 
479
 
        entry = Gtk.Entry()
 
447
        entry = gtk.Entry()
480
448
        self._entry = entry
481
449
        entry.connect("activate", lambda w, d: self._do_search(d),
482
450
                      'forward')
483
 
        self.pack_start(entry, False, False, 0)
 
451
        self.pack_start(entry, expand=False, fill=False)
484
452
 
485
453
        # Next/previous buttons
486
 
        button = Gtk.Button('_Next')
487
 
        image = Gtk.Image()
488
 
        image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
 
454
        button = gtk.Button('_Next')
 
455
        image = gtk.Image()
 
456
        image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
489
457
        button.set_image(image)
490
458
        button.connect("clicked", lambda w, d: self._do_search(d),
491
459
                       'forward')
492
 
        self.pack_start(button, False, False, 0)
 
460
        self.pack_start(button, expand=False, fill=False)
493
461
 
494
 
        button = Gtk.Button('_Previous')
495
 
        image = Gtk.Image()
496
 
        image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
 
462
        button = gtk.Button('_Previous')
 
463
        image = gtk.Image()
 
464
        image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
497
465
        button.set_image(image)
498
466
        button.connect("clicked", lambda w, d: self._do_search(d),
499
467
                       'backward')
500
 
        self.pack_start(button, False, False, 0)
 
468
        self.pack_start(button, expand=False, fill=False)
501
469
 
502
470
        # Search options
503
 
        check = Gtk.CheckButton('Match case')
 
471
        check = gtk.CheckButton('Match case')
504
472
        self._match_case = check
505
 
        self.pack_start(check, False, False, 0)
 
473
        self.pack_start(check, expand=False, fill=False)
506
474
 
507
 
        check = Gtk.CheckButton('Regexp')
 
475
        check = gtk.CheckButton('Regexp')
508
476
        check.connect("toggled", lambda w: self._set_label())
509
477
        self._regexp = check
510
 
        self.pack_start(check, False, False, 0)
 
478
        self.pack_start(check, expand=False, fill=False)
511
479
 
512
480
        self._view = None
513
481
        self._column = None
540
508
 
541
509
    def _match(self, model, iterator, column):
542
510
        matching_case = self._match_case.get_active()
543
 
        cell_value, = model.get(iterator, column)
 
511
        string, = model.get(iterator, column)
544
512
        key = self._entry.get_text()
545
 
        if column == LINE_NUM_COL:
546
 
            # FIXME: For goto-line there are faster algorithms than searching 
547
 
            # every line til we find the right one! -- mbp 2011-01-27
548
 
            return key.strip() == str(cell_value)
549
 
        elif self._regexp.get_active():
 
513
        if self._regexp.get_active():
550
514
            if matching_case:
551
 
                match = re.compile(key).search(cell_value, 1)
 
515
                match = re.compile(key).search(string, 1)
552
516
            else:
553
 
                match = re.compile(key, re.I).search(cell_value, 1)
 
517
                match = re.compile(key, re.I).search(string, 1)
554
518
        else:
555
519
            if not matching_case:
556
 
                cell_value = cell_value.lower()
 
520
                string = string.lower()
557
521
                key = key.lower()
558
 
            match = cell_value.find(key) != -1
 
522
            match = string.find(key) != -1
559
523
 
560
524
        return match
561
525
 
593
557
        for row in iterate(model, start):
594
558
            if self._match(model, row, self._column):
595
559
                path = model.get_path(row)
596
 
                self._view.set_cursor(path, None, False)
 
560
                self._view.set_cursor(path)
597
561
                self._view.scroll_to_cell(path, use_align=True)
598
562
                break