/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
108
108
        self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
109
109
        self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
110
110
        self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
 
111
        self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
111
112
        self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
112
113
        self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
113
114
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
125
126
        self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
126
127
        self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
127
128
        self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
 
129
        self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
128
130
        # Get the drive selector
129
131
        self.combobox_drive = gtk.combo_box_new_text()
130
132
        self.combobox_drive.connect("changed", self._refresh_drives)
165
167
                "on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
166
168
                "on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
167
169
                "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
 
170
                "on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,                
168
171
                "on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
169
172
                "on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
170
173
                "on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
179
182
                "on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
180
183
                "on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
181
184
                "on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
 
185
                "on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
182
186
                "on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
183
187
                "on_treeview_right_row_activated": self.on_treeview_right_row_activated,
184
188
                "on_treeview_left_button_press_event": self.on_treeview_left_button_press_event,
563
567
        ret = branch_to.pull(branch_from)
564
568
        
565
569
        info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
 
570
        
 
571
    @show_bzr_error
 
572
    def on_menuitem_branch_update_activate(self, widget):
 
573
        """ Brranch/checkout update menu handler. """
 
574
        
 
575
        ret = self.wt.update()
 
576
        conflicts = self.wt.conflicts()
 
577
        if conflicts:
 
578
            info_dialog(_('Update successful but conflicts generated'), _('Number of conflicts generated: %d.') % (len(conflicts),) )
 
579
        else:
 
580
            info_dialog(_('Update successful'), _('No conflicts generated.') )
566
581
    
567
582
    def on_menuitem_branch_push_activate(self, widget):
568
583
        """ Branch/Push... menu handler. """
1060
1075
            self.menuitem_branch_checkout.set_sensitive(self.notbranch)
1061
1076
            self.menuitem_branch_pull.set_sensitive(not self.notbranch)
1062
1077
            self.menuitem_branch_push.set_sensitive(not self.notbranch)
 
1078
            self.menuitem_branch_update.set_sensitive(not self.notbranch)
1063
1079
            self.menuitem_branch_revert.set_sensitive(not self.notbranch)
1064
1080
            self.menuitem_branch_merge.set_sensitive(not self.notbranch)
1065
1081
            self.menuitem_branch_commit.set_sensitive(not self.notbranch)
1081
1097
            self.toolbutton_commit.set_sensitive(not self.notbranch)
1082
1098
            self.toolbutton_pull.set_sensitive(not self.notbranch)
1083
1099
            self.toolbutton_push.set_sensitive(not self.notbranch)
 
1100
            self.toolbutton_update.set_sensitive(not self.notbranch)
1084
1101
        else:
1085
1102
            # We're remote
1086
1103
            self.menuitem_branch_init.set_sensitive(False)
1088
1105
            self.menuitem_branch_checkout.set_sensitive(True)
1089
1106
            self.menuitem_branch_pull.set_sensitive(False)
1090
1107
            self.menuitem_branch_push.set_sensitive(False)
 
1108
            self.menuitem_branch_update.set_sensitive(False)
1091
1109
            self.menuitem_branch_revert.set_sensitive(False)
1092
1110
            self.menuitem_branch_merge.set_sensitive(False)
1093
1111
            self.menuitem_branch_commit.set_sensitive(False)
1109
1127
            self.toolbutton_commit.set_sensitive(False)
1110
1128
            self.toolbutton_pull.set_sensitive(False)
1111
1129
            self.toolbutton_push.set_sensitive(False)
 
1130
            self.toolbutton_update.set_sensitive(False)
1112
1131
    
1113
1132
    def refresh_left(self):
1114
1133
        """ Refresh the bookmark list. """