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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-02-01 16:42:48 UTC
  • mfrom: (126.1.22 bzr-gtk)
  • Revision ID: szilveszter.farkas@gmail.com-20070201164248-u11v85zglb00rohf
Merge from integration branch (refactoring, some new features)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
55
55
    from annotate.gannotate import GAnnotateWindow
56
56
    from annotate.config import GAnnotateConfig
57
57
 
 
58
# History delimiter used in config files
 
59
delimiter = ' '
58
60
 
59
61
class OliveGtk:
60
62
    """ The main Olive GTK frontend class. This is called when launching the
221
223
    def on_menuitem_branch_get_activate(self, widget):
222
224
        """ Branch/Get... menu handler. """
223
225
        from branch import BranchDialog
224
 
        branch = BranchDialog(self.get_path())
225
 
        branch.display()
 
226
        branch = BranchDialog(self.get_path(), self.window)
 
227
        response = branch.run()
 
228
        if response != gtk.RESPONSE_NONE:
 
229
            branch.hide()
 
230
        
 
231
            if response == gtk.RESPONSE_OK:
 
232
                self.refresh_right()
 
233
            
 
234
            branch.destroy()
226
235
    
227
236
    def on_menuitem_branch_checkout_activate(self, widget):
228
237
        """ Branch/Checkout... menu handler. """
229
 
        from checkout import OliveCheckout
230
 
        checkout = OliveCheckout(self.get_path())
231
 
        checkout.display()
 
238
        from checkout import CheckoutDialog
 
239
        checkout = CheckoutDialog(self.get_path(), self.window)
 
240
        response = checkout.run()
 
241
        if response != gtk.RESPONSE_NONE:
 
242
            checkout.hide()
 
243
        
 
244
            if response == gtk.RESPONSE_OK:
 
245
                self.refresh_right()
 
246
            
 
247
            checkout.destroy()
232
248
    
233
249
    def on_menuitem_branch_commit_activate(self, widget):
234
250
        """ Branch/Commit... menu handler. """
305
321
    
306
322
    def on_menuitem_branch_push_activate(self, widget):
307
323
        """ Branch/Push... menu handler. """
308
 
        from push import OlivePush
309
 
        push = OlivePush(self.wt.branch)
310
 
        push.display()
 
324
        from push import PushDialog
 
325
        push = PushDialog(self.wt.branch, self.window)
 
326
        response = push.run()
 
327
        if response != gtk.RESPONSE_NONE:
 
328
            push.destroy()
311
329
    
312
330
    @show_bzr_error
313
331
    def on_menuitem_branch_revert_activate(self, widget):