/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 __init__.py

  • Committer: Martin Albisetti
  • Date: 2008-03-30 20:20:03 UTC
  • mfrom: (450.1.10 trunk)
  • Revision ID: argentina@gmail.com-20080330202003-615j8hm6jinbnf36
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
109
109
    return os.path.dirname(__file__)
110
110
 
111
111
 
 
112
def icon_path(*args):
 
113
    return os.path.join(data_path(), *args)
 
114
 
 
115
 
112
116
class GTKCommand(Command):
113
117
    """Abstract class providing GTK specific run commands."""
114
118
 
215
219
            wt.unlock()
216
220
 
217
221
 
218
 
def start_viz_window(branch, revision, limit=None):
 
222
def start_viz_window(branch, revisions, limit=None):
219
223
    """Start viz on branch with revision revision.
220
224
    
221
225
    :return: The viz window object.
222
226
    """
223
227
    from viz import BranchWindow
224
 
    return BranchWindow(branch, revision, limit)
 
228
    return BranchWindow(branch, revisions, limit)
225
229
 
226
230
 
227
231
class cmd_visualise(Command):
237
241
        "revision",
238
242
        Option('limit', "Maximum number of revisions to display.",
239
243
               int, 'count')]
240
 
    takes_args = [ "location?" ]
 
244
    takes_args = [ "locations*" ]
241
245
    aliases = [ "visualize", "vis", "viz" ]
242
246
 
243
 
    def run(self, location=".", revision=None, limit=None):
 
247
    def run(self, locations_list, revision=None, limit=None):
244
248
        set_ui_factory()
245
 
        (br, path) = branch.Branch.open_containing(location)
246
 
        if revision is None:
247
 
            revid = br.last_revision()
248
 
            if revid is None:
249
 
                return
250
 
        else:
251
 
            (revno, revid) = revision[0].in_history(br)
252
 
 
 
249
        if locations_list is None:
 
250
            locations_list = ["."]
 
251
        revids = []
 
252
        for location in locations_list:
 
253
            (br, path) = branch.Branch.open_containing(location)
 
254
            if revision is None:
 
255
                revids.append(br.last_revision())
 
256
            else:
 
257
                (revno, revid) = revision[0].in_history(br)
 
258
                revids.append(revid)
253
259
        import gtk
254
 
        pp = start_viz_window(br, revid, limit)
 
260
        pp = start_viz_window(br, revids, limit)
255
261
        pp.connect("destroy", lambda w: gtk.main_quit())
256
262
        pp.show()
257
263
        gtk.main()
514
520
        from notify import NotifyPopupMenu
515
521
        gtk = self.open_display()
516
522
        menu = NotifyPopupMenu()
517
 
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
523
        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
518
524
        icon.connect('popup-menu', menu.display)
519
525
 
520
526
        import cgi