/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-08-25 12:52:25 UTC
  • mfrom: (267 trunk)
  • mto: This revision was merged to the branch mainline in revision 268.
  • Revision ID: szilveszter.farkas@gmail.com-20070825125225-qa6281uurldft7iw
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
101
101
        self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
102
102
        self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
103
103
        self.menuitem_view_show_hidden_files = self.toplevel.get_widget('menuitem_view_show_hidden_files')
 
104
        self.menuitem_view_show_ignored_files = self.toplevel.get_widget('menuitem_view_show_ignored_files')
104
105
        self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
105
106
        self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
106
107
        self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
107
108
        self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
108
109
        self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
109
110
        self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
 
111
        self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
110
112
        self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
111
113
        self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
112
114
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
124
126
        self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
125
127
        self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
126
128
        self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
 
129
        self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
127
130
        # Get the drive selector
128
131
        self.combobox_drive = gtk.combo_box_new_text()
129
132
        self.combobox_drive.connect("changed", self._refresh_drives)
154
157
                "on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
155
158
                "on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
156
159
                "on_menuitem_view_show_hidden_files_activate": self.on_menuitem_view_show_hidden_files_activate,
 
160
                "on_menuitem_view_show_ignored_files_activate": self.on_menuitem_view_show_ignored_files_activate,
157
161
                "on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
158
162
                "on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
159
163
                "on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
163
167
                "on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
164
168
                "on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
165
169
                "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
 
170
                "on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,                
166
171
                "on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
167
172
                "on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
168
173
                "on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
177
182
                "on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
178
183
                "on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
179
184
                "on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
 
185
                "on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
180
186
                "on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
181
187
                "on_treeview_right_row_activated": self.on_treeview_right_row_activated,
182
188
                "on_treeview_left_button_press_event": self.on_treeview_left_button_press_event,
223
229
 
224
230
        # Apply menu state
225
231
        self.menuitem_view_show_hidden_files.set_active(self.pref.get_preference('dotted_files', 'bool'))
 
232
        self.menuitem_view_show_ignored_files.set_active(self.pref.get_preference('ignored_files', 'bool'))
226
233
 
227
234
        # We're starting local
228
235
        self.remote = False
560
567
        ret = branch_to.pull(branch_from)
561
568
        
562
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.') )
563
581
    
564
582
    def on_menuitem_branch_push_activate(self, widget):
565
583
        """ Branch/Push... menu handler. """
566
 
        push = PushDialog(self.wt.branch, self.window)
 
584
        push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
567
585
        response = push.run()
568
586
        if response != gtk.RESPONSE_NONE:
569
587
            push.destroy()
702
720
        if self.path is not None:
703
721
            self.refresh_right()
704
722
 
 
723
    def on_menuitem_view_show_ignored_files_activate(self, widget):
 
724
        """ Hide/Show ignored files menu handler. """
 
725
        self.pref.set_preference('ignored_files', widget.get_active())
 
726
        if self.path is not None:
 
727
            self.refresh_right()
 
728
            
705
729
    def on_treeview_left_button_press_event(self, widget, event):
706
730
        """ Occurs when somebody right-clicks in the bookmark list. """
707
731
        if event.button == 3:
1051
1075
            self.menuitem_branch_checkout.set_sensitive(self.notbranch)
1052
1076
            self.menuitem_branch_pull.set_sensitive(not self.notbranch)
1053
1077
            self.menuitem_branch_push.set_sensitive(not self.notbranch)
 
1078
            self.menuitem_branch_update.set_sensitive(not self.notbranch)
1054
1079
            self.menuitem_branch_revert.set_sensitive(not self.notbranch)
1055
1080
            self.menuitem_branch_merge.set_sensitive(not self.notbranch)
1056
1081
            self.menuitem_branch_commit.set_sensitive(not self.notbranch)
1072
1097
            self.toolbutton_commit.set_sensitive(not self.notbranch)
1073
1098
            self.toolbutton_pull.set_sensitive(not self.notbranch)
1074
1099
            self.toolbutton_push.set_sensitive(not self.notbranch)
 
1100
            self.toolbutton_update.set_sensitive(not self.notbranch)
1075
1101
        else:
1076
1102
            # We're remote
1077
1103
            self.menuitem_branch_init.set_sensitive(False)
1079
1105
            self.menuitem_branch_checkout.set_sensitive(True)
1080
1106
            self.menuitem_branch_pull.set_sensitive(False)
1081
1107
            self.menuitem_branch_push.set_sensitive(False)
 
1108
            self.menuitem_branch_update.set_sensitive(False)
1082
1109
            self.menuitem_branch_revert.set_sensitive(False)
1083
1110
            self.menuitem_branch_merge.set_sensitive(False)
1084
1111
            self.menuitem_branch_commit.set_sensitive(False)
1100
1127
            self.toolbutton_commit.set_sensitive(False)
1101
1128
            self.toolbutton_pull.set_sensitive(False)
1102
1129
            self.toolbutton_push.set_sensitive(False)
 
1130
            self.toolbutton_update.set_sensitive(False)
1103
1131
    
1104
1132
    def refresh_left(self):
1105
1133
        """ Refresh the bookmark list. """
1151
1179
    
1152
1180
            # Fill the appropriate lists
1153
1181
            dotted_files = self.pref.get_preference('dotted_files', 'bool')
 
1182
            ignored_files = self.pref.get_preference('ignored_files', 'bool')
 
1183
 
1154
1184
            for item in os.listdir(path):
1155
1185
                if not dotted_files and item[0] == '.':
1156
1186
                    continue
1232
1262
                    st = _('unchanged')
1233
1263
                elif status == 'ignored':
1234
1264
                    st = _('ignored')
 
1265
                    if not ignored_files:
 
1266
                        continue
1235
1267
                else:
1236
1268
                    st = _('unknown')
1237
1269
                
1467
1499
        # Some default options
1468
1500
        self.defaults = { 'strict_commit' : False,
1469
1501
                          'dotted_files'  : False,
 
1502
                          'ignored_files' : True,
1470
1503
                          'window_width'  : 700,
1471
1504
                          'window_height' : 400,
1472
1505
                          'window_x'      : 40,