/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-04 12:05:45 UTC
  • mto: (157.1.3 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 160.
  • Revision ID: szilveszter.farkas@gmail.com-20070204120545-o7rxnkmhjctvkhnb
Added Conflicts entry to the Branch menu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
44
44
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
45
45
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
46
46
from bzrlib.plugins.gtk.commit import CommitDialog
 
47
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
47
48
from bzrlib.plugins.gtk.push import PushDialog
48
49
 
49
50
class OliveGtk:
86
87
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
87
88
        self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
88
89
        self.menuitem_branch_missing = self.toplevel.get_widget('menuitem_branch_missing_revisions')
 
90
        self.menuitem_branch_conflicts = self.toplevel.get_widget('menuitem_branch_conflicts')
89
91
        self.menuitem_stats = self.toplevel.get_widget('menuitem_stats')
90
92
        self.menuitem_stats_diff = self.toplevel.get_widget('menuitem_stats_diff')
91
93
        self.menuitem_stats_log = self.toplevel.get_widget('menuitem_stats_log')
126
128
                "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
127
129
                "on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
128
130
                "on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
 
131
                "on_menuitem_branch_conflicts_activate": self.on_menuitem_branch_conflicts_activate,
129
132
                "on_menuitem_stats_diff_activate": self.on_menuitem_stats_diff_activate,
130
133
                "on_menuitem_stats_log_activate": self.on_menuitem_stats_log_activate,
131
134
                "on_menuitem_stats_infos_activate": self.on_menuitem_stats_infos_activate,
244
247
            
245
248
            commit.destroy()
246
249
    
 
250
    def on_menuitem_branch_conflicts_activate(self, widget):
 
251
        """ Branch/Conflicts... menu handler. """
 
252
        conflicts = ConflictsDialog(self.wt, self.window)
 
253
        response = conflicts.run()
 
254
        if response != gtk.RESPONSE_NONE:
 
255
            conflicts.destroy()
 
256
    
247
257
    def on_menuitem_branch_merge_activate(self, widget):
248
258
        """ Branch/Merge... menu handler. """
249
259
        from bzrlib.plugins.gtk.merge import MergeDialog
725
735
        self.menuitem_branch_commit.set_sensitive(not self.notbranch)
726
736
        self.menuitem_branch_status.set_sensitive(not self.notbranch)
727
737
        self.menuitem_branch_missing.set_sensitive(not self.notbranch)
 
738
        self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
728
739
        self.menuitem_stats.set_sensitive(not self.notbranch)
729
740
        self.menuitem_add_files.set_sensitive(not self.notbranch)
730
741
        self.menuitem_remove_files.set_sensitive(not self.notbranch)