/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 viz/branchwin.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 21:15:13 UTC
  • mfrom: (326 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030211513-l8ukdfa81g1y74mi
Merge the latest trunk 326

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
12
12
import gtk
13
13
import gobject
14
14
import pango
 
15
import treemodel
15
16
 
 
17
from bzrlib.plugins.gtk.window import Window
16
18
from bzrlib.osutils import format_date
17
19
 
18
 
from graph import distances, graph, same_branch
 
20
from linegraph import linegraph, same_branch
19
21
from graphcell import CellRendererGraph
20
 
 
21
 
 
22
 
class BranchWindow(gtk.Window):
 
22
from treemodel import TreeModel
 
23
from treeview  import TreeView
 
24
 
 
25
class BranchWindow(Window):
23
26
    """Branch window.
24
27
 
25
28
    This object represents and manages a single window containing information
26
29
    for a particular branch.
27
30
    """
28
31
 
29
 
    def __init__(self):
30
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
32
    def __init__(self, branch, start, maxnum, parent=None):
 
33
        """Create a new BranchWindow.
 
34
 
 
35
        :param branch: Branch object for branch to show.
 
36
        :param start: Revision id of top revision.
 
37
        :param maxnum: Maximum number of revisions to display, 
 
38
                       None for no limit.
 
39
        """
 
40
 
 
41
        Window.__init__(self, parent=parent)
31
42
        self.set_border_width(0)
32
 
        self.set_title("bzrk")
 
43
 
 
44
        self.branch = branch
 
45
        self.start  = start
 
46
        self.maxnum = maxnum
 
47
 
 
48
        self.set_title(branch.nick + " - revision history")
33
49
 
34
50
        # Use three-quarters of the screen by default
35
51
        screen = self.get_screen()
53
69
        self.add(vbox)
54
70
 
55
71
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
56
 
 
 
72
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
73
        
57
74
        paned = gtk.VPaned()
58
75
        paned.pack1(self.construct_top(), resize=True, shrink=False)
59
76
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
62
79
        vbox.set_focus_child(paned)
63
80
 
64
81
        vbox.show()
 
82
    
 
83
    def construct_loading_msg(self):
 
84
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
85
                                                 gtk.ICON_SIZE_BUTTON)
 
86
        image_loading.show()
 
87
        
 
88
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
89
        label_loading.set_alignment(0.0, 0.5)        
 
90
        label_loading.show()
 
91
        
 
92
        self.loading_msg_box = gtk.HBox()
 
93
        self.loading_msg_box.set_spacing(5)
 
94
        self.loading_msg_box.set_border_width(5)        
 
95
        self.loading_msg_box.pack_start(image_loading, False, False)
 
96
        self.loading_msg_box.pack_start(label_loading, True, True)
 
97
        self.loading_msg_box.show()
 
98
        
 
99
        return self.loading_msg_box
65
100
 
66
101
    def construct_top(self):
67
102
        """Construct the top-half of the window."""
68
 
        scrollwin = gtk.ScrolledWindow()
69
 
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
 
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
71
 
        scrollwin.show()
72
 
 
73
 
        self.treeview = gtk.TreeView()
74
 
        self.treeview.set_rules_hint(True)
75
 
        self.treeview.set_search_column(4)
76
 
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
 
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
 
        scrollwin.add(self.treeview)
 
103
        self.treeview = TreeView(self.branch, self.start, self.maxnum)
 
104
 
 
105
        self.treeview.connect("revision-selected",
 
106
                self._treeselection_changed_cb)
 
107
 
 
108
        self.treeview.connect('revisions-loaded', 
 
109
                lambda x: self.loading_msg_box.hide())
 
110
 
79
111
        self.treeview.show()
80
112
 
81
 
        cell = CellRendererGraph()
82
 
        column = gtk.TreeViewColumn()
83
 
        column.set_resizable(True)
84
 
        column.pack_start(cell, expand=False)
85
 
        column.add_attribute(cell, "node", 1)
86
 
        column.add_attribute(cell, "in-lines", 2)
87
 
        column.add_attribute(cell, "out-lines", 3)
88
 
        self.treeview.append_column(column)
89
 
 
90
 
        cell = gtk.CellRendererText()
91
 
        cell.set_property("width-chars", 40)
92
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
93
 
        column = gtk.TreeViewColumn("Message")
94
 
        column.set_resizable(True)
95
 
        column.pack_start(cell, expand=True)
96
 
        column.add_attribute(cell, "text", 4)
97
 
        self.treeview.append_column(column)
98
 
 
99
 
        cell = gtk.CellRendererText()
100
 
        cell.set_property("width-chars", 40)
101
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
102
 
        column = gtk.TreeViewColumn("Committer")
103
 
        column.set_resizable(True)
104
 
        column.pack_start(cell, expand=True)
105
 
        column.add_attribute(cell, "text", 5)
106
 
        self.treeview.append_column(column)
107
 
 
108
 
        cell = gtk.CellRendererText()
109
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
110
 
        column = gtk.TreeViewColumn("Date")
111
 
        column.set_resizable(True)
112
 
        column.pack_start(cell, expand=True)
113
 
        column.add_attribute(cell, "text", 6)
114
 
        self.treeview.append_column(column)
115
 
 
116
 
        return scrollwin
 
113
        return self.treeview
117
114
 
118
115
    def construct_navigation(self):
119
116
        """Construct the navigation buttons."""
120
 
        frame = gtk.Frame()
121
 
        frame.set_shadow_type(gtk.SHADOW_OUT)
122
 
        frame.show()
123
 
        
124
 
        hbox = gtk.HBox(spacing=12)
125
 
        frame.add(hbox)
126
 
        hbox.show()
 
117
        self.toolbar = gtk.Toolbar()
 
118
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
127
119
 
128
 
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
129
 
        self.back_button.set_relief(gtk.RELIEF_NONE)
 
120
        self.back_button = gtk.ToolButton(stock_id=gtk.STOCK_GO_BACK)
 
121
        self.back_button.set_is_important(True)
130
122
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
131
123
                                         0, 0)
132
124
        self.back_button.connect("clicked", self._back_clicked_cb)
133
 
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
125
        self.toolbar.insert(self.back_button, -1)
134
126
        self.back_button.show()
135
127
 
136
 
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
137
 
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
 
128
        self.fwd_button = gtk.ToolButton(stock_id=gtk.STOCK_GO_FORWARD)
 
129
        self.fwd_button.set_is_important(True)
138
130
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
139
131
                                        0, 0)
140
132
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
141
 
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
 
133
        self.toolbar.insert(self.fwd_button, -1)
142
134
        self.fwd_button.show()
143
135
 
144
 
        return frame
 
136
        self.toolbar.show()
 
137
 
 
138
        return self.toolbar
145
139
 
146
140
    def construct_bottom(self):
147
141
        """Construct the bottom half of the window."""
148
142
        from bzrlib.plugins.gtk.logview import LogView
149
 
        self.logview = LogView()
 
143
        self.logview = LogView(None, True, [], True)
150
144
        (width, height) = self.get_size()
151
145
        self.logview.set_size_request(width, int(height / 2.5))
152
146
        self.logview.show()
153
147
        self.logview.set_show_callback(self._show_clicked_cb)
154
148
        self.logview.set_go_callback(self._go_clicked_cb)
155
149
        return self.logview
156
 
 
157
 
    def set_branch(self, branch, start, maxnum):
158
 
        """Set the branch and start position for this window.
159
 
 
160
 
        Creates a new TreeModel and populates it with information about
161
 
        the new branch before updating the window title and model of the
162
 
        treeview itself.
163
 
        """
164
 
        self.branch = branch
165
 
 
166
 
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
167
 
        self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
168
 
                                   gobject.TYPE_PYOBJECT,
169
 
                                   gobject.TYPE_PYOBJECT,
170
 
                                   gobject.TYPE_PYOBJECT,
171
 
                                   str, str, str)
172
 
        self.index = {}
173
 
        index = 0
174
 
 
175
 
        last_lines = []
176
 
        (self.revisions, colours, self.children, self.parent_ids,
177
 
         merge_sorted) = distances(branch, start)
178
 
        for (index, (revision, node, lines)) in enumerate(graph(
179
 
                self.revisions, colours, merge_sorted)):
180
 
            # FIXME: at this point we should be able to show the graph order
181
 
            # and lines with no message or commit data - and then incrementally
182
 
            # fill the timestamp, committer etc data as desired.
183
 
            message = revision.message.split("\n")[0]
184
 
            if revision.committer is not None:
185
 
                timestamp = format_date(revision.timestamp, revision.timezone)
186
 
            else:
187
 
                timestamp = None
188
 
            self.model.append([revision, node, last_lines, lines,
189
 
                               message, revision.committer, timestamp])
190
 
            self.index[revision] = index
191
 
            last_lines = lines
192
 
            if maxnum is not None and index > maxnum:
193
 
                break
194
 
 
195
 
        self.set_title(branch.nick + " - bzrk")
196
 
        self.treeview.set_model(self.model)
197
 
 
198
 
    def _treeview_cursor_cb(self, *args):
199
 
        """Callback for when the treeview cursor changes."""
200
 
        (path, col) = self.treeview.get_cursor()
201
 
        revision = self.model[path][0]
202
 
 
203
 
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
204
 
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
205
 
        self.logview.set_revision(revision)
 
150
    
 
151
    def _treeselection_changed_cb(self, selection, *args):
 
152
        """callback for when the treeview changes."""
 
153
        revision = self.treeview.get_revision()
 
154
        parents  = self.treeview.get_parents()
 
155
        children = self.treeview.get_children()
 
156
 
 
157
        if revision is not None:
 
158
            self.back_button.set_sensitive(len(parents) > 0)
 
159
            self.fwd_button.set_sensitive(len(children) > 0)
 
160
            tags = []
 
161
            if self.branch.supports_tags():
 
162
                tagdict = self.branch.tags.get_reverse_tag_dict()
 
163
                if tagdict.has_key(revision.revision_id):
 
164
                    tags = tagdict[revision.revision_id]
 
165
            self.logview.set_revision(revision, tags, children)
206
166
 
207
167
    def _back_clicked_cb(self, *args):
208
168
        """Callback for when the back button is clicked."""
209
 
        (path, col) = self.treeview.get_cursor()
210
 
        revision = self.model[path][0]
211
 
        if not len(self.parent_ids[revision]):
212
 
            return
213
 
 
214
 
        for parent_id in self.parent_ids[revision]:
215
 
            parent = self.revisions[parent_id]
216
 
            if same_branch(revision, parent):
217
 
                self.treeview.set_cursor(self.index[parent])
218
 
                break
219
 
        else:
220
 
            next = self.revisions[self.parent_ids[revision][0]]
221
 
            self.treeview.set_cursor(self.index[next])
222
 
        self.treeview.grab_focus()
223
 
 
 
169
        self.treeview.back()
 
170
        
224
171
    def _fwd_clicked_cb(self, *args):
225
172
        """Callback for when the forward button is clicked."""
226
 
        (path, col) = self.treeview.get_cursor()
227
 
        revision = self.model[path][0]
228
 
        if not len(self.children[revision]):
229
 
            return
230
 
 
231
 
        for child in self.children[revision]:
232
 
            if same_branch(child, revision):
233
 
                self.treeview.set_cursor(self.index[child])
234
 
                break
235
 
        else:
236
 
            prev = list(self.children[revision])[0]
237
 
            self.treeview.set_cursor(self.index[prev])
238
 
        self.treeview.grab_focus()
 
173
        self.treeview.forward()
239
174
 
240
175
    def _go_clicked_cb(self, revid):
241
176
        """Callback for when the go button for a parent is clicked."""
242
 
        self.treeview.set_cursor(self.index[self.revisions[revid]])
243
 
        self.treeview.grab_focus()
244
 
 
245
 
    def show_diff(self, branch, revid, parentid):
246
 
        """Open a new window to show a diff between the given revisions."""
247
 
        from bzrlib.plugins.gtk.diff import DiffWindow
248
 
        window = DiffWindow()
249
 
        rev_tree = branch.repository.revision_tree(revid)
250
 
        parent_tree = branch.repository.revision_tree(parentid)
251
 
        description = revid + " - " + branch.nick
252
 
        window.set_diff(description, rev_tree, parent_tree)
253
 
        window.show()
 
177
        self.treeview.set_revision(revid)
254
178
 
255
179
    def _show_clicked_cb(self, revid, parentid):
256
180
        """Callback for when the show button for a parent is clicked."""
257
 
        self.show_diff(self.branch, revid, parentid)
 
181
        self.treeview.show_diff(self.branch, revid, parentid)
258
182
        self.treeview.grab_focus()
259
183
 
260
 
    def _treeview_row_activated_cb(self, widget, path, col):
261
 
        # TODO: more than one parent
262
 
        """Callback for when a treeview row gets activated."""
263
 
        revision = self.model[path][0]
264
 
        if len(self.parent_ids[revision]) == 0:
265
 
            # Ignore revisions without parent
266
 
            return
267
 
        parent_id = self.parent_ids[revision][0]
268
 
        self.show_diff(self.branch, revision.revision_id, parent_id)
269
 
        self.treeview.grab_focus()