bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
1  | 
# -*- coding: UTF-8 -*-
 | 
2  | 
"""Branch window.
 | 
|
3  | 
||
4  | 
This module contains the code to manage the branch information window,
 | 
|
5  | 
which contains both the revision graph and details panes.
 | 
|
6  | 
"""
 | 
|
7  | 
||
8  | 
__copyright__ = "Copyright © 2005 Canonical Ltd."  | 
|
9  | 
__author__ = "Scott James Remnant <scott@ubuntu.com>"  | 
|
10  | 
||
11  | 
||
12  | 
import gtk  | 
|
13  | 
import gobject  | 
|
14  | 
import pango  | 
|
15  | 
||
| 
298.2.1
by Daniel Schierbeck
 Refactored the GTK window code, creating a single base window class that handles keyboard events.  | 
16  | 
from bzrlib.plugins.gtk.window import Window  | 
| 
365
by Daniel Schierbeck
 Fixed locks and made tagging work.  | 
17  | 
from bzrlib.plugins.gtk.tags import AddTagDialog  | 
| 
338
by Daniel Schierbeck
 Added Preferences menu item.  | 
18  | 
from bzrlib.plugins.gtk.preferences import PreferencesWindow  | 
| 
423.2.1
by Daniel Schierbeck
 Moved branch view to its own package.  | 
19  | 
from bzrlib.plugins.gtk.branchview import TreeView  | 
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
20  | 
from bzrlib.revision import Revision  | 
| 
361
by Daniel Schierbeck
 Added branch settings menu item.  | 
21  | 
from bzrlib.config import BranchConfig  | 
| 
330.2.5
by Daniel Schierbeck
 Support persistence of compact view option.  | 
22  | 
from bzrlib.config import GlobalConfig  | 
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
23  | 
|
| 
298.2.1
by Daniel Schierbeck
 Refactored the GTK window code, creating a single base window class that handles keyboard events.  | 
24  | 
class BranchWindow(Window):  | 
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
25  | 
"""Branch window.  | 
26  | 
||
27  | 
    This object represents and manages a single window containing information
 | 
|
28  | 
    for a particular branch.
 | 
|
29  | 
    """
 | 
|
30  | 
||
| 
315
by Daniel Schierbeck
 Removed BranchWindow.set_branch(), used constructor instead.  | 
31  | 
def __init__(self, branch, start, maxnum, parent=None):  | 
| 
322
by Jelmer Vernooij
 Add docstrings.  | 
32  | 
"""Create a new BranchWindow.  | 
33  | 
||
34  | 
        :param branch: Branch object for branch to show.
 | 
|
35  | 
        :param start: Revision id of top revision.
 | 
|
36  | 
        :param maxnum: Maximum number of revisions to display, 
 | 
|
37  | 
                       None for no limit.
 | 
|
38  | 
        """
 | 
|
39  | 
||
| 
298.2.1
by Daniel Schierbeck
 Refactored the GTK window code, creating a single base window class that handles keyboard events.  | 
40  | 
Window.__init__(self, parent=parent)  | 
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
41  | 
self.set_border_width(0)  | 
| 
315
by Daniel Schierbeck
 Removed BranchWindow.set_branch(), used constructor instead.  | 
42  | 
|
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
43  | 
self.branch = branch  | 
44  | 
self.start = start  | 
|
45  | 
self.maxnum = maxnum  | 
|
| 
330.2.5
by Daniel Schierbeck
 Support persistence of compact view option.  | 
46  | 
self.config = GlobalConfig()  | 
47  | 
||
48  | 
if self.config.get_user_option('viz-compact-view') == 'yes':  | 
|
49  | 
self.compact_view = True  | 
|
50  | 
else:  | 
|
51  | 
self.compact_view = False  | 
|
| 
315
by Daniel Schierbeck
 Removed BranchWindow.set_branch(), used constructor instead.  | 
52  | 
|
53  | 
self.set_title(branch.nick + " - revision history")  | 
|
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
54  | 
|
55  | 
        # Use three-quarters of the screen by default
 | 
|
56  | 
screen = self.get_screen()  | 
|
| 
4
by Scott James Remnant
 Use the size of the first monitor rather than the entire screen  | 
57  | 
monitor = screen.get_monitor_geometry(0)  | 
58  | 
width = int(monitor.width * 0.75)  | 
|
59  | 
height = int(monitor.height * 0.75)  | 
|
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
60  | 
self.set_default_size(width, height)  | 
61  | 
||
62  | 
        # FIXME AndyFitz!
 | 
|
63  | 
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)  | 
|
64  | 
self.set_icon(icon)  | 
|
65  | 
||
| 
384
by Daniel Schierbeck
 Added accelerator for Next Revision action.  | 
66  | 
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)  | 
| 
383
by Daniel Schierbeck
 Switched to using symbolic names for keyvals.  | 
67  | 
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)  | 
| 
382
by Daniel Schierbeck
 Made accelerator for Previous Revision work.  | 
68  | 
|
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
69  | 
self.accel_group = gtk.AccelGroup()  | 
70  | 
self.add_accel_group(self.accel_group)  | 
|
71  | 
||
| 
388
by Daniel Schierbeck
 Switched to using the Previous/Next Revision actions to create tool buttons.  | 
72  | 
gtk.Action.set_tool_item_type(gtk.MenuToolButton)  | 
73  | 
||
| 
385
by Daniel Schierbeck
 Created a single action for Previous Revision.  | 
74  | 
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)  | 
75  | 
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")  | 
|
76  | 
self.prev_rev_action.set_accel_group(self.accel_group)  | 
|
77  | 
self.prev_rev_action.connect("activate", self._back_clicked_cb)  | 
|
78  | 
self.prev_rev_action.connect_accelerator()  | 
|
79  | 
||
| 
386
by Daniel Schierbeck
 Created a single action for Next Revision.  | 
80  | 
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)  | 
81  | 
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")  | 
|
82  | 
self.next_rev_action.set_accel_group(self.accel_group)  | 
|
83  | 
self.next_rev_action.connect("activate", self._fwd_clicked_cb)  | 
|
84  | 
self.next_rev_action.connect_accelerator()  | 
|
85  | 
||
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
86  | 
self.construct()  | 
87  | 
||
| 
369
by Daniel Schierbeck
 Fixed bug with compact view toggling.  | 
88  | 
def set_revision(self, revid):  | 
89  | 
self.treeview.set_revision_id(revid)  | 
|
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
90  | 
|
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
91  | 
def construct(self):  | 
92  | 
"""Construct the window contents."""  | 
|
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
93  | 
vbox = gtk.VBox(spacing=0)  | 
| 
44
by David Allouche
 reorganise branch window  | 
94  | 
self.add(vbox)  | 
95  | 
||
| 
375
by Daniel Schierbeck
 Fixed crash when toggling compact view.  | 
96  | 
self.paned = gtk.VPaned()  | 
97  | 
self.paned.pack1(self.construct_top(), resize=True, shrink=False)  | 
|
98  | 
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)  | 
|
99  | 
self.paned.show()  | 
|
| 
358
by Daniel Schierbeck
 Generalized the hiding/showing code.  | 
100  | 
|
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
101  | 
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)  | 
| 
44
by David Allouche
 reorganise branch window  | 
102  | 
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)  | 
| 
280.2.1
by Gary van der Merwe
 Add a message to the viz window to indicate that graph is still loading.  | 
103  | 
vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)  | 
104  | 
||
| 
369
by Daniel Schierbeck
 Fixed bug with compact view toggling.  | 
105  | 
vbox.pack_start(self.paned, expand=True, fill=True)  | 
106  | 
vbox.set_focus_child(self.paned)  | 
|
| 
44
by David Allouche
 reorganise branch window  | 
107  | 
|
108  | 
vbox.show()  | 
|
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
109  | 
|
110  | 
def construct_menubar(self):  | 
|
111  | 
menubar = gtk.MenuBar()  | 
|
112  | 
||
113  | 
file_menu = gtk.Menu()  | 
|
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
114  | 
file_menuitem = gtk.MenuItem("_File")  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
115  | 
file_menuitem.set_submenu(file_menu)  | 
116  | 
||
| 
362
by Daniel Schierbeck
 Added accel group to File -> Close menu item.  | 
117  | 
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
118  | 
file_menu_close.connect('activate', lambda x: self.destroy())  | 
119  | 
||
| 
363
by Daniel Schierbeck
 Added File -> Quit menu item.  | 
120  | 
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)  | 
121  | 
file_menu_quit.connect('activate', lambda x: gtk.main_quit())  | 
|
122  | 
||
| 
408
by Daniel Schierbeck
 Made the close menu item actually appear when the viz is opened from another window.  | 
123  | 
if self._parent is not None:  | 
| 
406
by Daniel Schierbeck
 Made the viz show the close menu item only if opened from another window.  | 
124  | 
file_menu.add(file_menu_close)  | 
| 
363
by Daniel Schierbeck
 Added File -> Quit menu item.  | 
125  | 
file_menu.add(file_menu_quit)  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
126  | 
|
| 
338
by Daniel Schierbeck
 Added Preferences menu item.  | 
127  | 
edit_menu = gtk.Menu()  | 
128  | 
edit_menuitem = gtk.MenuItem("_Edit")  | 
|
129  | 
edit_menuitem.set_submenu(edit_menu)  | 
|
130  | 
||
| 
340
by Daniel Schierbeck
 Added edit->find menu item stub.  | 
131  | 
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)  | 
132  | 
||
| 
361
by Daniel Schierbeck
 Added branch settings menu item.  | 
133  | 
edit_menu_branchopts = gtk.MenuItem("Branch Settings")  | 
134  | 
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())  | 
|
135  | 
||
| 
407
by Daniel Schierbeck
 Renamed Preferences menu item into Global Settings.  | 
136  | 
edit_menu_globopts = gtk.MenuItem("Global Settings")  | 
137  | 
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())  | 
|
| 
338
by Daniel Schierbeck
 Added Preferences menu item.  | 
138  | 
|
| 
340
by Daniel Schierbeck
 Added edit->find menu item stub.  | 
139  | 
edit_menu.add(edit_menu_find)  | 
| 
361
by Daniel Schierbeck
 Added branch settings menu item.  | 
140  | 
edit_menu.add(edit_menu_branchopts)  | 
| 
407
by Daniel Schierbeck
 Renamed Preferences menu item into Global Settings.  | 
141  | 
edit_menu.add(edit_menu_globopts)  | 
| 
338
by Daniel Schierbeck
 Added Preferences menu item.  | 
142  | 
|
| 
348
by Daniel Schierbeck
 Added toggle item for revision number column.  | 
143  | 
view_menu = gtk.Menu()  | 
144  | 
view_menuitem = gtk.MenuItem("_View")  | 
|
145  | 
view_menuitem.set_submenu(view_menu)  | 
|
146  | 
||
| 
351
by Daniel Schierbeck
 Added option to hide the toolbar.  | 
147  | 
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")  | 
148  | 
view_menu_toolbar.set_active(True)  | 
|
149  | 
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)  | 
|
150  | 
||
| 
370
by Daniel Schierbeck
 Moved compact graph toggle to the menubar.  | 
151  | 
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")  | 
152  | 
view_menu_compact.set_active(self.compact_view)  | 
|
153  | 
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)  | 
|
154  | 
||
| 
351
by Daniel Schierbeck
 Added option to hide the toolbar.  | 
155  | 
view_menu.add(view_menu_toolbar)  | 
| 
370
by Daniel Schierbeck
 Moved compact graph toggle to the menubar.  | 
156  | 
view_menu.add(view_menu_compact)  | 
| 
351
by Daniel Schierbeck
 Added option to hide the toolbar.  | 
157  | 
view_menu.add(gtk.SeparatorMenuItem())  | 
| 
358
by Daniel Schierbeck
 Generalized the hiding/showing code.  | 
158  | 
|
159  | 
for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:  | 
|
160  | 
col = gtk.CheckMenuItem("Show " + label + " Column")  | 
|
161  | 
col.set_active(self.treeview.get_property(name + "-column-visible"))  | 
|
162  | 
col.connect('toggled', self._col_visibility_changed, name)  | 
|
163  | 
view_menu.add(col)  | 
|
| 
348
by Daniel Schierbeck
 Added toggle item for revision number column.  | 
164  | 
|
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
165  | 
go_menu = gtk.Menu()  | 
| 
382
by Daniel Schierbeck
 Made accelerator for Previous Revision work.  | 
166  | 
go_menu.set_accel_group(self.accel_group)  | 
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
167  | 
go_menuitem = gtk.MenuItem("_Go")  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
168  | 
go_menuitem.set_submenu(go_menu)  | 
169  | 
||
| 
390
by Daniel Schierbeck
 Made the Previous/Next Revision menu items local variables.  | 
170  | 
go_menu_next = self.next_rev_action.create_menu_item()  | 
171  | 
go_menu_prev = self.prev_rev_action.create_menu_item()  | 
|
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
172  | 
|
| 
332
by Daniel Schierbeck
 Made tag selection work.  | 
173  | 
tags_menu = gtk.Menu()  | 
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
174  | 
go_menu_tags = gtk.MenuItem("_Tags")  | 
175  | 
go_menu_tags.set_submenu(tags_menu)  | 
|
| 
332
by Daniel Schierbeck
 Made tag selection work.  | 
176  | 
|
| 
367
by Daniel Schierbeck
 Fixed crash when branch didn't support tags.  | 
177  | 
if self.branch.supports_tags():  | 
| 
397
by Daniel Schierbeck
 Made the tag list appear sorted in the viz.  | 
178  | 
tags = self.branch.tags.get_tag_dict().items()  | 
179  | 
tags.sort()  | 
|
| 
398
by Daniel Schierbeck
 Reversed the tag list.  | 
180  | 
tags.reverse()  | 
| 
397
by Daniel Schierbeck
 Made the tag list appear sorted in the viz.  | 
181  | 
for tag, revid in tags:  | 
| 
367
by Daniel Schierbeck
 Fixed crash when branch didn't support tags.  | 
182  | 
tag_item = gtk.MenuItem(tag)  | 
183  | 
tag_item.connect('activate', self._tag_selected_cb, revid)  | 
|
184  | 
tags_menu.add(tag_item)  | 
|
| 
332
by Daniel Schierbeck
 Made tag selection work.  | 
185  | 
|
| 
399
by Daniel Schierbeck
 Made tags menu insensitive when there are no tags to display.  | 
186  | 
go_menu_tags.set_sensitive(len(tags) != 0)  | 
187  | 
else:  | 
|
188  | 
go_menu_tags.set_sensitive(False)  | 
|
189  | 
||
| 
390
by Daniel Schierbeck
 Made the Previous/Next Revision menu items local variables.  | 
190  | 
go_menu.add(go_menu_next)  | 
191  | 
go_menu.add(go_menu_prev)  | 
|
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
192  | 
go_menu.add(gtk.SeparatorMenuItem())  | 
193  | 
go_menu.add(go_menu_tags)  | 
|
194  | 
||
| 
335
by Daniel Schierbeck
 Added Revision menu.  | 
195  | 
revision_menu = gtk.Menu()  | 
196  | 
revision_menuitem = gtk.MenuItem("_Revision")  | 
|
197  | 
revision_menuitem.set_submenu(revision_menu)  | 
|
198  | 
||
| 
364
by Daniel Schierbeck
 Simplified TreeView.show_diff() and made the Revision -> View Changes menu item work.  | 
199  | 
revision_menu_diff = gtk.MenuItem("View Changes")  | 
200  | 
revision_menu_diff.connect('activate',  | 
|
201  | 
lambda w: self.treeview.show_diff())  | 
|
202  | 
||
| 
365
by Daniel Schierbeck
 Fixed locks and made tagging work.  | 
203  | 
revision_menu_tag = gtk.MenuItem("Tag Revision")  | 
204  | 
revision_menu_tag.connect('activate', self._tag_revision_cb)  | 
|
205  | 
||
206  | 
revision_menu.add(revision_menu_tag)  | 
|
| 
364
by Daniel Schierbeck
 Simplified TreeView.show_diff() and made the Revision -> View Changes menu item work.  | 
207  | 
revision_menu.add(revision_menu_diff)  | 
| 
335
by Daniel Schierbeck
 Added Revision menu.  | 
208  | 
|
| 
334
by Daniel Schierbeck
 Added icons to menus.  | 
209  | 
branch_menu = gtk.Menu()  | 
210  | 
branch_menuitem = gtk.MenuItem("_Branch")  | 
|
211  | 
branch_menuitem.set_submenu(branch_menu)  | 
|
212  | 
||
| 
336
by Daniel Schierbeck
 Changed wording to comply with HIG guidelines.  | 
213  | 
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))  | 
214  | 
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))  | 
|
| 
371.1.1
by Daniel Schierbeck
 Added About dialog to the viz.  | 
215  | 
|
| 
423.9.1
by Daniel Schierbeck
 Added Help->About menu item to the viz.  | 
216  | 
help_menu = gtk.Menu()  | 
217  | 
help_menuitem = gtk.MenuItem("_Help")  | 
|
218  | 
help_menuitem.set_submenu(help_menu)  | 
|
219  | 
||
220  | 
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)  | 
|
221  | 
help_about_menuitem.connect('activate', self._about_dialog_cb)  | 
|
222  | 
||
223  | 
help_menu.add(help_about_menuitem)  | 
|
224  | 
||
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
225  | 
menubar.add(file_menuitem)  | 
| 
338
by Daniel Schierbeck
 Added Preferences menu item.  | 
226  | 
menubar.add(edit_menuitem)  | 
| 
348
by Daniel Schierbeck
 Added toggle item for revision number column.  | 
227  | 
menubar.add(view_menuitem)  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
228  | 
menubar.add(go_menuitem)  | 
| 
335
by Daniel Schierbeck
 Added Revision menu.  | 
229  | 
menubar.add(revision_menuitem)  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
230  | 
menubar.add(branch_menuitem)  | 
| 
423.9.1
by Daniel Schierbeck
 Added Help->About menu item to the viz.  | 
231  | 
menubar.add(help_menuitem)  | 
| 
331
by Daniel Schierbeck
 Added basic menu bar.  | 
232  | 
menubar.show_all()  | 
233  | 
||
234  | 
return menubar  | 
|
| 
280.2.1
by Gary van der Merwe
 Add a message to the viz window to indicate that graph is still loading.  | 
235  | 
|
236  | 
def construct_loading_msg(self):  | 
|
237  | 
image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,  | 
|
238  | 
gtk.ICON_SIZE_BUTTON)  | 
|
239  | 
image_loading.show()  | 
|
240  | 
||
241  | 
label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))  | 
|
| 
368
by Daniel Schierbeck
 Merged with mainline.  | 
242  | 
label_loading.set_alignment(0.0, 0.5)  | 
| 
280.2.1
by Gary van der Merwe
 Add a message to the viz window to indicate that graph is still loading.  | 
243  | 
label_loading.show()  | 
244  | 
||
245  | 
self.loading_msg_box = gtk.HBox()  | 
|
246  | 
self.loading_msg_box.set_spacing(5)  | 
|
247  | 
self.loading_msg_box.set_border_width(5)  | 
|
248  | 
self.loading_msg_box.pack_start(image_loading, False, False)  | 
|
249  | 
self.loading_msg_box.pack_start(label_loading, True, True)  | 
|
250  | 
self.loading_msg_box.show()  | 
|
251  | 
||
252  | 
return self.loading_msg_box  | 
|
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
253  | 
|
254  | 
def construct_top(self):  | 
|
255  | 
"""Construct the top-half of the window."""  | 
|
| 
329
by Jelmer Vernooij
 Make broken_line_length setting from higher up.  | 
256  | 
        # FIXME: Make broken_line_length configurable
 | 
| 
330.2.5
by Daniel Schierbeck
 Support persistence of compact view option.  | 
257  | 
|
| 
401.1.3
by Daniel Schierbeck
 Made the compact view toggling cleaner.  | 
258  | 
self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)  | 
| 
315
by Daniel Schierbeck
 Removed BranchWindow.set_branch(), used constructor instead.  | 
259  | 
|
| 
373
by Daniel Schierbeck
 Made column display options persisted.  | 
260  | 
self.treeview.connect('revision-selected',  | 
| 
303
by Daniel Schierbeck
 Made basic signaling work.  | 
261  | 
self._treeselection_changed_cb)  | 
262  | 
||
| 
307
by Daniel Schierbeck
 Made load notification work again.  | 
263  | 
self.treeview.connect('revisions-loaded',  | 
264  | 
lambda x: self.loading_msg_box.hide())  | 
|
265  | 
||
| 
373
by Daniel Schierbeck
 Made column display options persisted.  | 
266  | 
for col in ["revno", "date"]:  | 
267  | 
option = self.config.get_user_option(col + '-column-visible')  | 
|
268  | 
if option is not None:  | 
|
269  | 
self.treeview.set_property(col + '-column-visible', option == 'True')  | 
|
270  | 
||
| 
1
by Scott James Remnant
 Commit the first version of bzrk.  | 
271  | 
self.treeview.show()  | 
272  | 
||
| 
375
by Daniel Schierbeck
 Fixed crash when toggling compact view.  | 
273  | 
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)  | 
274  | 
align.set_padding(5, 0, 0, 0)  | 
|
275  | 
align.add(self.treeview)  | 
|
276  | 
align.show()  | 
|
277  | 
||
278  | 
return align  | 
|
| 
44
by David Allouche
 reorganise branch window  | 
279  | 
|
280  | 
def construct_navigation(self):  | 
|
281  | 
"""Construct the navigation buttons."""  | 
|
| 
325
by Daniel Schierbeck
 Switched to using a real toolbar for the viz navigation.  | 
282  | 
self.toolbar = gtk.Toolbar()  | 
283  | 
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)  | 
|
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
284  | 
|
| 
388
by Daniel Schierbeck
 Switched to using the Previous/Next Revision actions to create tool buttons.  | 
285  | 
self.prev_button = self.prev_rev_action.create_tool_item()  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
286  | 
self.toolbar.insert(self.prev_button, -1)  | 
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
287  | 
|
| 
388
by Daniel Schierbeck
 Switched to using the Previous/Next Revision actions to create tool buttons.  | 
288  | 
self.next_button = self.next_rev_action.create_tool_item()  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
289  | 
self.toolbar.insert(self.next_button, -1)  | 
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
290  | 
|
| 
401.1.2
by Daniel Schierbeck
 Allowed the treeview to be refreshed.  | 
291  | 
self.toolbar.insert(gtk.SeparatorToolItem(), -1)  | 
292  | 
||
293  | 
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)  | 
|
| 
404
by Daniel Schierbeck
 Made the refresh use proper locking.  | 
294  | 
refresh_button.connect('clicked', self._refresh_clicked)  | 
| 
401.1.2
by Daniel Schierbeck
 Allowed the treeview to be refreshed.  | 
295  | 
self.toolbar.insert(refresh_button, -1)  | 
296  | 
||
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
297  | 
self.toolbar.show_all()  | 
| 
325
by Daniel Schierbeck
 Switched to using a real toolbar for the viz navigation.  | 
298  | 
|
299  | 
return self.toolbar  | 
|
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
300  | 
|
301  | 
def construct_bottom(self):  | 
|
302  | 
"""Construct the bottom half of the window."""  | 
|
| 
330.3.1
by Daniel Schierbeck
 Renamed logview 'revisionview'.  | 
303  | 
from bzrlib.plugins.gtk.revisionview import RevisionView  | 
| 
412.1.2
by Daniel Schierbeck
 Moved retrieval of tags into the revisionview itself.  | 
304  | 
self.revisionview = RevisionView(branch=self.branch)  | 
| 
44
by David Allouche
 reorganise branch window  | 
305  | 
(width, height) = self.get_size()  | 
| 
330.3.1
by Daniel Schierbeck
 Renamed logview 'revisionview'.  | 
306  | 
self.revisionview.set_size_request(width, int(height / 2.5))  | 
307  | 
self.revisionview.show()  | 
|
308  | 
self.revisionview.set_show_callback(self._show_clicked_cb)  | 
|
| 
412.1.9
by Daniel Schierbeck
 Removed the use of RevisionView.set_go_callback().  | 
309  | 
self.revisionview.connect('notify::revision', self._go_clicked_cb)  | 
| 
330.3.1
by Daniel Schierbeck
 Renamed logview 'revisionview'.  | 
310  | 
return self.revisionview  | 
| 
332
by Daniel Schierbeck
 Made tag selection work.  | 
311  | 
|
312  | 
def _tag_selected_cb(self, menuitem, revid):  | 
|
| 
356
by Daniel Schierbeck
 Made revision a property on TreeView.  | 
313  | 
self.treeview.set_revision_id(revid)  | 
| 
341
by Daniel Schierbeck
 Merged with trunk.  | 
314  | 
|
| 
280.1.2
by Daniel Schierbeck
 Switched to handle the 'changed' signal from the treeview's treeselection instead of the 'cursor-changed' signal from the treeview itself, allowing more flexibility (particularly the ability to handle programmatic selections)  | 
315  | 
def _treeselection_changed_cb(self, selection, *args):  | 
| 
303
by Daniel Schierbeck
 Made basic signaling work.  | 
316  | 
"""callback for when the treeview changes."""  | 
317  | 
revision = self.treeview.get_revision()  | 
|
318  | 
parents = self.treeview.get_parents()  | 
|
319  | 
children = self.treeview.get_children()  | 
|
320  | 
||
321  | 
if revision is not None:  | 
|
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
322  | 
prev_menu = gtk.Menu()  | 
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
323  | 
if len(parents) > 0:  | 
| 
385
by Daniel Schierbeck
 Created a single action for Previous Revision.  | 
324  | 
self.prev_rev_action.set_sensitive(True)  | 
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
325  | 
for parent_id in parents:  | 
326  | 
parent = self.branch.repository.get_revision(parent_id)  | 
|
| 
355
by Daniel Schierbeck
 Appended branch nick to parent and child popup menus.  | 
327  | 
try:  | 
328  | 
str = ' (' + parent.properties['branch-nick'] + ')'  | 
|
329  | 
except KeyError:  | 
|
330  | 
str = ""  | 
|
331  | 
||
332  | 
item = gtk.MenuItem(parent.message.split("\n")[0] + str)  | 
|
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
333  | 
item.connect('activate', self._set_revision_cb, parent_id)  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
334  | 
prev_menu.add(item)  | 
335  | 
prev_menu.show_all()  | 
|
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
336  | 
else:  | 
| 
385
by Daniel Schierbeck
 Created a single action for Previous Revision.  | 
337  | 
self.prev_rev_action.set_sensitive(False)  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
338  | 
prev_menu.hide()  | 
339  | 
||
340  | 
self.prev_button.set_menu(prev_menu)  | 
|
341  | 
||
342  | 
next_menu = gtk.Menu()  | 
|
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
343  | 
if len(children) > 0:  | 
| 
386
by Daniel Schierbeck
 Created a single action for Next Revision.  | 
344  | 
self.next_rev_action.set_sensitive(True)  | 
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
345  | 
for child_id in children:  | 
346  | 
child = self.branch.repository.get_revision(child_id)  | 
|
| 
355
by Daniel Schierbeck
 Appended branch nick to parent and child popup menus.  | 
347  | 
try:  | 
348  | 
str = ' (' + child.properties['branch-nick'] + ')'  | 
|
349  | 
except KeyError:  | 
|
350  | 
str = ""  | 
|
351  | 
||
352  | 
item = gtk.MenuItem(child.message.split("\n")[0] + str)  | 
|
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
353  | 
item.connect('activate', self._set_revision_cb, child_id)  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
354  | 
next_menu.add(item)  | 
355  | 
next_menu.show_all()  | 
|
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
356  | 
else:  | 
| 
386
by Daniel Schierbeck
 Created a single action for Next Revision.  | 
357  | 
self.next_rev_action.set_sensitive(False)  | 
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
358  | 
next_menu.hide()  | 
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
359  | 
|
| 
376
by Daniel Schierbeck
 Changed 'back' into 'prev' and 'fwd' into 'next'.  | 
360  | 
self.next_button.set_menu(next_menu)  | 
| 
352.1.2
by Daniel Schierbeck
 Added dropdown menu to Forward button.  | 
361  | 
|
| 
412.1.13
by Daniel Schierbeck
 Re-added support for displaying the children of a revision.  | 
362  | 
self.revisionview.set_revision(revision)  | 
363  | 
self.revisionview.set_children(children)  | 
|
| 
7
by Scott James Remnant
 Put some information about the highlighted revision in the bottom pane,  | 
364  | 
|
| 
3
by Scott James Remnant
 Split the display in two with a pane, we'll use the bottom half to show  | 
365  | 
def _back_clicked_cb(self, *args):  | 
366  | 
"""Callback for when the back button is clicked."""  | 
|
| 
304
by Daniel Schierbeck
 Made forward/back buttons work again.  | 
367  | 
self.treeview.back()  | 
368  | 
||
| 
5
by Scott James Remnant
 Reverse the meaning of the Back and Forward buttons so Back actually  | 
369  | 
def _fwd_clicked_cb(self, *args):  | 
370  | 
"""Callback for when the forward button is clicked."""  | 
|
| 
304
by Daniel Schierbeck
 Made forward/back buttons work again.  | 
371  | 
self.treeview.forward()  | 
| 
7
by Scott James Remnant
 Put some information about the highlighted revision in the bottom pane,  | 
372  | 
|
| 
412.1.9
by Daniel Schierbeck
 Removed the use of RevisionView.set_go_callback().  | 
373  | 
def _go_clicked_cb(self, w, p):  | 
| 
7
by Scott James Remnant
 Put some information about the highlighted revision in the bottom pane,  | 
374  | 
"""Callback for when the go button for a parent is clicked."""  | 
| 
412.1.9
by Daniel Schierbeck
 Removed the use of RevisionView.set_go_callback().  | 
375  | 
if self.revisionview.get_revision() is not None:  | 
376  | 
self.treeview.set_revision(self.revisionview.get_revision())  | 
|
| 
152
by Jelmer Vernooij
 Cleanup some more code.  | 
377  | 
|
| 
147
by Jelmer Vernooij
 Remove a bunch of duplicate functionality.  | 
378  | 
def _show_clicked_cb(self, revid, parentid):  | 
| 
7
by Scott James Remnant
 Put some information about the highlighted revision in the bottom pane,  | 
379  | 
"""Callback for when the show button for a parent is clicked."""  | 
| 
364
by Daniel Schierbeck
 Simplified TreeView.show_diff() and made the Revision -> View Changes menu item work.  | 
380  | 
self.treeview.show_diff(revid, parentid)  | 
| 
13
by Scott James Remnant
 Keep the focus on the treeview  | 
381  | 
self.treeview.grab_focus()  | 
| 
46
by Wouter van Heyst
 show diff on row activation, LP# 44591  | 
382  | 
|
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
383  | 
def _set_revision_cb(self, w, revision_id):  | 
| 
356
by Daniel Schierbeck
 Made revision a property on TreeView.  | 
384  | 
self.treeview.set_revision_id(revision_id)  | 
| 
352.1.1
by Daniel Schierbeck
 Added dropdown menu to Back button.  | 
385  | 
|
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
386  | 
def _brokenlines_toggled_cb(self, button):  | 
| 
330.2.5
by Daniel Schierbeck
 Support persistence of compact view option.  | 
387  | 
self.compact_view = button.get_active()  | 
388  | 
||
389  | 
if self.compact_view:  | 
|
390  | 
option = 'yes'  | 
|
| 
330.2.4
by Daniel Schierbeck
 Made use of compact view optional.  | 
391  | 
else:  | 
| 
330.2.5
by Daniel Schierbeck
 Support persistence of compact view option.  | 
392  | 
option = 'no'  | 
393  | 
||
394  | 
self.config.set_user_option('viz-compact-view', option)  | 
|
| 
401.1.3
by Daniel Schierbeck
 Made the compact view toggling cleaner.  | 
395  | 
self.treeview.set_property('compact', self.compact_view)  | 
396  | 
self.treeview.refresh()  | 
|
| 
368
by Daniel Schierbeck
 Merged with mainline.  | 
397  | 
|
| 
365
by Daniel Schierbeck
 Fixed locks and made tagging work.  | 
398  | 
def _tag_revision_cb(self, w):  | 
| 
392.1.1
by Daniel Schierbeck
 Made it possible to tag revisions again.  | 
399  | 
try:  | 
400  | 
self.treeview.set_sensitive(False)  | 
|
401  | 
self.branch.unlock()  | 
|
402  | 
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)  | 
|
403  | 
response = dialog.run()  | 
|
404  | 
if response != gtk.RESPONSE_NONE:  | 
|
405  | 
dialog.hide()  | 
|
| 
365
by Daniel Schierbeck
 Fixed locks and made tagging work.  | 
406  | 
|
| 
392.1.1
by Daniel Schierbeck
 Made it possible to tag revisions again.  | 
407  | 
if response == gtk.RESPONSE_OK:  | 
408  | 
try:  | 
|
409  | 
self.branch.lock_write()  | 
|
410  | 
self.branch.tags.set_tag(dialog.tagname, dialog._revid)  | 
|
411  | 
finally:  | 
|
412  | 
self.branch.unlock()  | 
|
413  | 
||
414  | 
dialog.destroy()  | 
|
415  | 
||
416  | 
finally:  | 
|
417  | 
self.branch.lock_read()  | 
|
| 
394
by Daniel Schierbeck
 Made the revisionview update when a revision is tagged.  | 
418  | 
self.treeview.emit("revision-selected")  | 
| 
392.1.1
by Daniel Schierbeck
 Made it possible to tag revisions again.  | 
419  | 
self.treeview.set_sensitive(True)  | 
| 
365
by Daniel Schierbeck
 Fixed locks and made tagging work.  | 
420  | 
|
| 
423.9.1
by Daniel Schierbeck
 Added Help->About menu item to the viz.  | 
421  | 
def _about_dialog_cb(self, w):  | 
422  | 
from bzrlib.plugins.gtk.about import AboutDialog  | 
|
423  | 
||
424  | 
AboutDialog().run()  | 
|
425  | 
||
| 
348
by Daniel Schierbeck
 Added toggle item for revision number column.  | 
426  | 
def _col_visibility_changed(self, col, property):  | 
| 
373
by Daniel Schierbeck
 Made column display options persisted.  | 
427  | 
self.config.set_user_option(property + '-column-visible', col.get_active())  | 
| 
348
by Daniel Schierbeck
 Added toggle item for revision number column.  | 
428  | 
self.treeview.set_property(property + '-column-visible', col.get_active())  | 
| 
351
by Daniel Schierbeck
 Added option to hide the toolbar.  | 
429  | 
|
430  | 
def _toolbar_visibility_changed(self, col):  | 
|
431  | 
if col.get_active():  | 
|
432  | 
self.toolbar.show()  | 
|
433  | 
else:  | 
|
434  | 
self.toolbar.hide()  | 
|
| 
371.1.1
by Daniel Schierbeck
 Added About dialog to the viz.  | 
435  | 
|
436  | 
def _show_about_cb(self, w):  | 
|
437  | 
dialog = AboutDialog()  | 
|
438  | 
dialog.connect('response', lambda d,r: d.destroy())  | 
|
439  | 
dialog.run()  | 
|
| 
404
by Daniel Schierbeck
 Made the refresh use proper locking.  | 
440  | 
|
441  | 
def _refresh_clicked(self, w):  | 
|
442  | 
self.treeview.update()  |