/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: 2006-10-09 21:21:47 UTC
  • Revision ID: Szilveszter.Farkas@gmail.com-20061009212147-8893be90e5b46f3e
Began to implement Merge dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
90
90
        self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
91
91
        self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
92
92
        self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
 
93
        self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
93
94
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
94
95
        self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
95
96
        self.menuitem_branch_missing = self.toplevel.get_widget('menuitem_branch_missing_revisions')
125
126
                "on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
126
127
                "on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
127
128
                "on_menuitem_branch_checkout_activate": self.on_menuitem_branch_checkout_activate,
 
129
                "on_menuitem_branch_merge_activate": self.on_menuitem_branch_merge_activate,
128
130
                "on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
129
131
                "on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
130
132
                "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
220
222
        commit = CommitDialog(self.wt, self.wtpath)
221
223
        commit.display()
222
224
    
 
225
    def on_menuitem_branch_merge_activate(self, widget):
 
226
        """ Branch/Merge... menu handler. """
 
227
        from merge import MergeDialog
 
228
        merge = MergeDialog(self.wt, self.wtpath)
 
229
        merge.display()
 
230
 
223
231
    def on_menuitem_branch_missing_revisions_activate(self, widget):
224
232
        """ Branch/Missing revisions menu handler. """
225
233
        local_branch = self.wt.branch
614
622
        self.menuitem_branch_checkout.set_sensitive(self.notbranch)
615
623
        self.menuitem_branch_pull.set_sensitive(not self.notbranch)
616
624
        self.menuitem_branch_push.set_sensitive(not self.notbranch)
 
625
        self.menuitem_branch_merge.set_sensitive(not self.notbranch)
617
626
        self.menuitem_branch_commit.set_sensitive(not self.notbranch)
618
627
        self.menuitem_branch_status.set_sensitive(not self.notbranch)
619
628
        self.menuitem_branch_missing.set_sensitive(not self.notbranch)