/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: Aaron Bentley
  • Author(s): Aaron Bentley
  • Date: 2007-08-16 14:27:37 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070816142737-qejb84j26411tlu4
Add author support to gannotate and log viewer

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
1
 
 #!/usr/bin/python
2
 
 
3
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
4
2
#
5
3
# This program is free software; you can redistribute it and/or modify
41
39
from bzrlib.ui import ui_factory
42
40
from bzrlib.workingtree import WorkingTree
43
41
 
44
 
from bzrlib.plugins.gtk import _i18n
45
42
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
46
43
from bzrlib.plugins.gtk.errors import show_bzr_error
47
44
from guifiles import GLADEFILENAME
69
66
 
70
67
    # Set version
71
68
    dialog.set_version(__version__)
72
 
    dialog.set_authors([ _i18n("Lead Developer:"),
73
 
                         "Szilveszter Farkas <szilveszter.farkas@gmail.com>",
74
 
                         _i18n("Contributors:"),
75
 
                         "Jelmer Vernooij <jelmer@samba.org>",
76
 
                         "Mateusz Korniak <mateusz.korniak@ant.gliwice.pl>",
77
 
                         "Gary van der Merwe <garyvdm@gmail.com>" ])
78
 
    dialog.set_artists([ "Simon Pascal Klein <klepas@klepas.org>",
79
 
                         "Jakub Steiner <jimmac@novell.com>" ])
 
69
    dialog.set_artists(["Simon Pascal Klein"])
80
70
 
81
71
    dialog.run()
82
72
    # Destroy the dialog
106
96
        # Get some important menu items
107
97
        self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
98
        self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
 
        self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
99
        self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
100
        self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
101
        self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
113
102
        self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
114
103
        self.menuitem_view_show_hidden_files = self.toplevel.get_widget('menuitem_view_show_hidden_files')
115
 
        self.menuitem_view_show_ignored_files = self.toplevel.get_widget('menuitem_view_show_ignored_files')
116
104
        self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
117
105
        self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
118
106
        self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
119
107
        self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
120
108
        self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
121
109
        self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
122
 
        self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
123
110
        self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
124
111
        self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
125
112
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
137
124
        self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
138
125
        self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
139
126
        self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
140
 
        self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
141
127
        # Get the drive selector
142
128
        self.combobox_drive = gtk.combo_box_new_text()
143
129
        self.combobox_drive.connect("changed", self._refresh_drives)
163
149
                "on_about_activate": self.on_about_activate,
164
150
                "on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
151
                "on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
 
                "on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
152
                "on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
153
                "on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
154
                "on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
170
155
                "on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
171
156
                "on_menuitem_view_show_hidden_files_activate": self.on_menuitem_view_show_hidden_files_activate,
172
 
                "on_menuitem_view_show_ignored_files_activate": self.on_menuitem_view_show_ignored_files_activate,
173
157
                "on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
174
158
                "on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
175
159
                "on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
179
163
                "on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
180
164
                "on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
181
165
                "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
182
 
                "on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,                
183
166
                "on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
184
167
                "on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
185
168
                "on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
194
177
                "on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
195
178
                "on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
196
179
                "on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
197
 
                "on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
198
180
                "on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
181
                "on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
182
                "on_treeview_left_button_press_event": self.on_treeview_left_button_press_event,
201
 
                "on_treeview_left_button_release_event": self.on_treeview_left_button_release_event,
202
183
                "on_treeview_left_row_activated": self.on_treeview_left_row_activated,
203
184
                "on_button_location_up_clicked": self.on_button_location_up_clicked,
204
185
                "on_button_location_jump_clicked": self.on_button_location_jump_clicked,
242
223
 
243
224
        # Apply menu state
244
225
        self.menuitem_view_show_hidden_files.set_active(self.pref.get_preference('dotted_files', 'bool'))
245
 
        self.menuitem_view_show_ignored_files.set_active(self.pref.get_preference('ignored_files', 'bool'))
246
226
 
247
227
        # We're starting local
248
228
        self.remote = False
446
426
    @show_bzr_error
447
427
    def on_entry_history_revno_key_press_event(self, widget, event):
448
428
        """ Key pressed handler for the history entry. """
449
 
        if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'):
 
429
        if event.keyval == 65293:
450
430
            # Return was hit, so we have to load that specific revision
451
431
            # Emulate being remote, so inventory should be used
452
432
            path = self.get_path()
461
441
    
462
442
    def on_entry_location_key_press_event(self, widget, event):
463
443
        """ Key pressed handler for the location entry. """
464
 
        if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'):
 
444
        if event.keyval == 65293:
465
445
            # Return was hit, so we have to jump
466
446
            self.on_button_location_jump_clicked(widget)
467
447
    
508
488
    @show_bzr_error
509
489
    def on_menuitem_branch_commit_activate(self, widget):
510
490
        """ Branch/Commit... menu handler. """
511
 
#     def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
512
 
        selected = self.get_selected_right()
513
 
        if selected:
514
 
            selected = os.path.join(self.wtpath, selected)
515
 
        commit = CommitDialog(wt=self.wt,
516
 
                              parent=self.window,
517
 
                              selected=selected,
518
 
                             )
 
491
        commit = CommitDialog(self.wt, self.wtpath, self.notbranch, self.get_selected_right(), self.window)
519
492
        response = commit.run()
520
493
        if response != gtk.RESPONSE_NONE:
521
494
            commit.hide()
537
510
        from bzrlib.plugins.gtk.merge import MergeDialog
538
511
        
539
512
        if self.check_for_changes():
540
 
            error_dialog(_i18n('There are local changes in the branch'),
541
 
                         _i18n('Please commit or revert the changes before merging.'))
 
513
            error_dialog(_('There are local changes in the branch'),
 
514
                         _('Please commit or revert the changes before merging.'))
542
515
        else:
543
 
            parent_branch_path = self.wt.branch.get_parent()
544
 
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
 
516
            merge = MergeDialog(self.wt, self.wtpath)
545
517
            merge.display()
546
518
 
547
519
    @show_bzr_error
548
520
    def on_menuitem_branch_missing_revisions_activate(self, widget):
549
521
        """ Branch/Missing revisions menu handler. """
550
 
        
551
 
        from bzrlib.missing import find_unmerged, iter_log_revisions
552
 
        
553
522
        local_branch = self.wt.branch
554
 
        parent_branch_path = local_branch.get_parent()
555
 
        if parent_branch_path is None:
556
 
            error_dialog(_i18n('Parent location is unknown'),
557
 
                         _i18n('Cannot determine missing revisions if no parent location is known.'))
 
523
        
 
524
        other_branch = local_branch.get_parent()
 
525
        if other_branch is None:
 
526
            error_dialog(_('Parent location is unknown'),
 
527
                         _('Cannot determine missing revisions if no parent location is known.'))
558
528
            return
559
529
        
560
 
        parent_branch = Branch.open(parent_branch_path)
561
 
        
562
 
        if parent_branch.base == local_branch.base:
563
 
            parent_branch = local_branch
564
 
        
565
 
        local_extra, remote_extra = find_unmerged(local_branch,parent_branch)
566
 
 
567
 
        if local_extra or remote_extra:
568
 
            
569
 
            ## def log_revision_one_line_text(log_revision):
570
 
            ##    """ Generates one line description of log_revison ended with end of line."""
571
 
            ##    revision = log_revision.rev
572
 
            ##    txt =  "- %s (%s)\n" % (revision.get_summary(), revision.committer, )
573
 
            ##    txt = txt.replace("<"," ") # Seems < > chars are expected to be xml tags ...
574
 
            ##    txt = txt.replace(">"," ")
575
 
            ##    return txt
576
 
            
577
 
            dlg_txt = ""
578
 
            if local_extra:
579
 
                dlg_txt += _i18n('%d local extra revision(s). \n') % (len(local_extra),) 
580
 
                ## NOTE: We do not want such ugly info about missing revisions
581
 
                ##       Revision Browser should be used there
582
 
                ## max_revisions = 10
583
 
                ## for log_revision in iter_log_revisions(local_extra, local_branch.repository, verbose=1):
584
 
                ##    dlg_txt += log_revision_one_line_text(log_revision)
585
 
                ##    if max_revisions <= 0:
586
 
                ##        dlg_txt += _i18n("more ... \n")
587
 
                ##        break
588
 
                ## max_revisions -= 1
589
 
            ## dlg_txt += "\n"
590
 
            if remote_extra:
591
 
                dlg_txt += _i18n('%d local missing revision(s).\n') % (len(remote_extra),) 
592
 
                ## max_revisions = 10
593
 
                ## for log_revision in iter_log_revisions(remote_extra, parent_branch.repository, verbose=1):
594
 
                ##    dlg_txt += log_revision_one_line_text(log_revision)
595
 
                ##    if max_revisions <= 0:
596
 
                ##        dlg_txt += _i18n("more ... \n")
597
 
                ##        break
598
 
                ##    max_revisions -= 1
599
 
                
600
 
            info_dialog(_i18n('There are missing revisions'),
601
 
                        dlg_txt)
 
530
        remote_branch = Branch.open(other_branch)
 
531
        
 
532
        if remote_branch.base == local_branch.base:
 
533
            remote_branch = local_branch
 
534
 
 
535
        ret = len(local_branch.missing_revisions(remote_branch))
 
536
 
 
537
        if ret > 0:
 
538
            info_dialog(_('There are missing revisions'),
 
539
                        _('%d revision(s) missing.') % ret)
602
540
        else:
603
 
            info_dialog(_i18n('Local branch up to date'),
604
 
                        _i18n('There are no missing revisions.'))
 
541
            info_dialog(_('Local branch up to date'),
 
542
                        _('There are no missing revisions.'))
605
543
 
606
544
    @show_bzr_error
607
545
    def on_menuitem_branch_pull_activate(self, widget):
610
548
 
611
549
        location = branch_to.get_parent()
612
550
        if location is None:
613
 
            error_dialog(_i18n('Parent location is unknown'),
614
 
                                     _i18n('Pulling is not possible until there is a parent location.'))
 
551
            error_dialog(_('Parent location is unknown'),
 
552
                                     _('Pulling is not possible until there is a parent location.'))
615
553
            return
616
554
 
617
555
        branch_from = Branch.open(location)
621
559
 
622
560
        ret = branch_to.pull(branch_from)
623
561
        
624
 
        info_dialog(_i18n('Pull successful'), _i18n('%d revision(s) pulled.') % ret)
625
 
        
626
 
    @show_bzr_error
627
 
    def on_menuitem_branch_update_activate(self, widget):
628
 
        """ Brranch/checkout update menu handler. """
629
 
        
630
 
        ret = self.wt.update()
631
 
        conflicts = self.wt.conflicts()
632
 
        if conflicts:
633
 
            info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) )
634
 
        else:
635
 
            info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') )
 
562
        info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
636
563
    
637
564
    def on_menuitem_branch_push_activate(self, widget):
638
565
        """ Branch/Push... menu handler. """
639
 
        push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
 
566
        push = PushDialog(self.wt.branch, self.window)
640
567
        response = push.run()
641
568
        if response != gtk.RESPONSE_NONE:
642
569
            push.destroy()
646
573
        """ Branch/Revert all changes menu handler. """
647
574
        ret = self.wt.revert([])
648
575
        if ret:
649
 
            warning_dialog(_i18n('Conflicts detected'),
650
 
                           _i18n('Please have a look at the working tree before continuing.'))
 
576
            warning_dialog(_('Conflicts detected'),
 
577
                           _('Please have a look at the working tree before continuing.'))
651
578
        else:
652
 
            info_dialog(_i18n('Revert successful'),
653
 
                        _i18n('All files reverted to last revision.'))
 
579
            info_dialog(_('Revert successful'),
 
580
                        _('All files reverted to last revision.'))
654
581
        self.refresh_right()
655
582
    
656
583
    def on_menuitem_branch_status_activate(self, widget):
685
612
    def on_menuitem_file_annotate_activate(self, widget):
686
613
        """ File/Annotate... menu handler. """
687
614
        if self.get_selected_right() is None:
688
 
            error_dialog(_i18n('No file was selected'),
689
 
                         _i18n('Please select a file from the list.'))
 
615
            error_dialog(_('No file was selected'),
 
616
                         _('Please select a file from the list.'))
690
617
            return
691
618
        
692
619
        branch = self.wt.branch
693
620
        file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
694
621
        
695
 
        window = GAnnotateWindow(all=False, plain=False, parent=self.window)
 
622
        window = GAnnotateWindow(all=False, plain=False)
696
623
        window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
697
624
        config = GAnnotateConfig(window)
698
625
        window.show()
702
629
        finally:
703
630
            branch.unlock()
704
631
    
705
 
    def on_menuitem_file_bookmark_activate(self, widget):
706
 
        """ File/Bookmark current directory menu handler. """
707
 
        if self.pref.add_bookmark(self.path):
708
 
            info_dialog(_i18n('Bookmark successfully added'),
709
 
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
710
 
            self.pref.write()
711
 
        else:
712
 
            warning_dialog(_i18n('Location already bookmarked'),
713
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
714
 
        
715
 
        self.refresh_left()
716
 
    
717
632
    def on_menuitem_file_make_directory_activate(self, widget):
718
633
        """ File/Make directory... menu handler. """
719
634
        from mkdir import OliveMkdir
751
666
    
752
667
    def on_menuitem_stats_diff_activate(self, widget):
753
668
        """ Statistics/Differences... menu handler. """
754
 
        window = DiffWindow(parent=self.window)
 
669
        window = DiffWindow()
755
670
        parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
756
671
        window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
757
672
        window.show()
767
682
    
768
683
    def on_menuitem_stats_log_activate(self, widget):
769
684
        """ Statistics/Log... menu handler. """
770
 
 
 
685
        window = branchwin.BranchWindow()
771
686
        if not self.remote:
772
 
            branch = self.wt.branch
 
687
            window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
773
688
        else:
774
 
            branch = self.remote_branch
775
 
 
776
 
        window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
 
689
            window.set_branch(self.remote_branch, self.remote_branch.last_revision(), None)
777
690
        window.show()
778
691
    
779
692
    def on_menuitem_view_refresh_activate(self, widget):
789
702
        if self.path is not None:
790
703
            self.refresh_right()
791
704
 
792
 
    def on_menuitem_view_show_ignored_files_activate(self, widget):
793
 
        """ Hide/Show ignored files menu handler. """
794
 
        self.pref.set_preference('ignored_files', widget.get_active())
795
 
        if self.path is not None:
796
 
            self.refresh_right()
797
 
            
798
705
    def on_treeview_left_button_press_event(self, widget, event):
799
706
        """ Occurs when somebody right-clicks in the bookmark list. """
800
707
        if event.button == 3:
811
718
            menu.left_context_menu().popup(None, None, None, 0,
812
719
                                           event.time)
813
720
 
814
 
    def on_treeview_left_button_release_event(self, widget, event):
815
 
        """ Occurs when somebody just clicks a bookmark. """
816
 
        if event.button != 3:
817
 
            # Allow one-click bookmark opening
818
 
            if self.get_selected_left() == None:
819
 
                return
820
 
            
821
 
            newdir = self.get_selected_left()
822
 
            if newdir == None:
823
 
                return
824
 
 
825
 
            if self.set_path(newdir):
826
 
                self.refresh_right()
827
 
 
828
721
    def on_treeview_left_row_activated(self, treeview, path, view_column):
829
722
        """ Occurs when somebody double-clicks or enters an item in the
830
723
        bookmark list. """
940
833
        bookmarks = self.pref.get_bookmarks()
941
834
        
942
835
        # Add them to the TreeStore
943
 
        titer = treestore.append(None, [_i18n('Bookmarks'), None])
 
836
        titer = treestore.append(None, [_('Bookmarks'), None])
944
837
        for item in bookmarks:
945
838
            title = self.pref.get_bookmark_title(item)
946
839
            treestore.append(titer, [title, item])
947
840
        
948
841
        # Create the column and add it to the TreeView
949
842
        self.treeview_left.set_model(treestore)
950
 
        tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
 
843
        tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
844
        self.treeview_left.append_column(tvcolumn_bookmark)
952
845
        
953
846
        # Set up the cells
994
887
        
995
888
        # Add'em to the ListStore
996
889
        for item in dirs:
997
 
            try:
998
 
                statinfo = os.stat(self.path + os.sep + item)
999
 
            except OSError, e:
1000
 
                if e.errno == 40:
1001
 
                    continue
1002
 
                else:
1003
 
                    raise
 
890
            statinfo = os.stat(self.path + os.sep + item)
1004
891
            liststore.append([ gtk.STOCK_DIRECTORY,
1005
892
                               True,
1006
893
                               item,
1047
934
                    self.wt.unlock()
1048
935
            
1049
936
            if status == 'renamed':
1050
 
                st = _i18n('renamed')
 
937
                st = _('renamed')
1051
938
            elif status == 'removed':
1052
 
                st = _i18n('removed')
 
939
                st = _('removed')
1053
940
            elif status == 'added':
1054
 
                st = _i18n('added')
 
941
                st = _('added')
1055
942
            elif status == 'modified':
1056
 
                st = _i18n('modified')
 
943
                st = _('modified')
1057
944
            elif status == 'unchanged':
1058
 
                st = _i18n('unchanged')
 
945
                st = _('unchanged')
1059
946
            elif status == 'ignored':
1060
 
                st = _i18n('ignored')
 
947
                st = _('ignored')
1061
948
            else:
1062
 
                st = _i18n('unknown')
 
949
                st = _('unknown')
1063
950
            
1064
 
            try:
1065
 
                statinfo = os.stat(self.path + os.sep + item)
1066
 
            except OSError, e:
1067
 
                if e.errno == 40:
1068
 
                    continue
1069
 
                else:
1070
 
                    raise
 
951
            statinfo = os.stat(self.path + os.sep + item)
1071
952
            liststore.append([gtk.STOCK_FILE,
1072
953
                              False,
1073
954
                              item,
1081
962
        
1082
963
        # Create the columns and add them to the TreeView
1083
964
        self.treeview_right.set_model(liststore)
1084
 
        self._tvcolumn_filename = gtk.TreeViewColumn(_i18n('Filename'))
1085
 
        self._tvcolumn_status = gtk.TreeViewColumn(_i18n('Status'))
1086
 
        self._tvcolumn_size = gtk.TreeViewColumn(_i18n('Size'))
1087
 
        self._tvcolumn_mtime = gtk.TreeViewColumn(_i18n('Last modified'))
 
965
        self._tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
 
966
        self._tvcolumn_status = gtk.TreeViewColumn(_('Status'))
 
967
        self._tvcolumn_size = gtk.TreeViewColumn(_('Size'))
 
968
        self._tvcolumn_mtime = gtk.TreeViewColumn(_('Last modified'))
1088
969
        self.treeview_right.append_column(self._tvcolumn_filename)
1089
970
        self.treeview_right.append_column(self._tvcolumn_status)
1090
971
        self.treeview_right.append_column(self._tvcolumn_size)
1170
1051
            self.menuitem_branch_checkout.set_sensitive(self.notbranch)
1171
1052
            self.menuitem_branch_pull.set_sensitive(not self.notbranch)
1172
1053
            self.menuitem_branch_push.set_sensitive(not self.notbranch)
1173
 
            self.menuitem_branch_update.set_sensitive(not self.notbranch)
1174
1054
            self.menuitem_branch_revert.set_sensitive(not self.notbranch)
1175
1055
            self.menuitem_branch_merge.set_sensitive(not self.notbranch)
1176
1056
            self.menuitem_branch_commit.set_sensitive(not self.notbranch)
1192
1072
            self.toolbutton_commit.set_sensitive(not self.notbranch)
1193
1073
            self.toolbutton_pull.set_sensitive(not self.notbranch)
1194
1074
            self.toolbutton_push.set_sensitive(not self.notbranch)
1195
 
            self.toolbutton_update.set_sensitive(not self.notbranch)
1196
1075
        else:
1197
1076
            # We're remote
1198
1077
            self.menuitem_branch_init.set_sensitive(False)
1200
1079
            self.menuitem_branch_checkout.set_sensitive(True)
1201
1080
            self.menuitem_branch_pull.set_sensitive(False)
1202
1081
            self.menuitem_branch_push.set_sensitive(False)
1203
 
            self.menuitem_branch_update.set_sensitive(False)
1204
1082
            self.menuitem_branch_revert.set_sensitive(False)
1205
1083
            self.menuitem_branch_merge.set_sensitive(False)
1206
1084
            self.menuitem_branch_commit.set_sensitive(False)
1222
1100
            self.toolbutton_commit.set_sensitive(False)
1223
1101
            self.toolbutton_pull.set_sensitive(False)
1224
1102
            self.toolbutton_push.set_sensitive(False)
1225
 
            self.toolbutton_update.set_sensitive(False)
1226
1103
    
1227
1104
    def refresh_left(self):
1228
1105
        """ Refresh the bookmark list. """
1238
1115
        bookmarks = self.pref.get_bookmarks()
1239
1116
 
1240
1117
        # Add them to the TreeStore
1241
 
        titer = treestore.append(None, [_i18n('Bookmarks'), None])
 
1118
        titer = treestore.append(None, [_('Bookmarks'), None])
1242
1119
        for item in bookmarks:
1243
1120
            title = self.pref.get_bookmark_title(item)
1244
1121
            treestore.append(titer, [title, item])
1274
1151
    
1275
1152
            # Fill the appropriate lists
1276
1153
            dotted_files = self.pref.get_preference('dotted_files', 'bool')
1277
 
            ignored_files = self.pref.get_preference('ignored_files', 'bool')
1278
 
 
1279
1154
            for item in os.listdir(path):
1280
1155
                if not dotted_files and item[0] == '.':
1281
1156
                    continue
1299
1174
                
1300
1175
            # Add'em to the ListStore
1301
1176
            for item in dirs:
1302
 
                try:
1303
 
                    statinfo = os.stat(self.path + os.sep + item)
1304
 
                except OSError, e:
1305
 
                    if e.errno == 40:
1306
 
                        continue
1307
 
                    else:
1308
 
                        raise
 
1177
                statinfo = os.stat(self.path + os.sep + item)
1309
1178
                liststore.append([gtk.STOCK_DIRECTORY,
1310
1179
                                  True,
1311
1180
                                  item,
1352
1221
                        self.wt.unlock()
1353
1222
                
1354
1223
                if status == 'renamed':
1355
 
                    st = _i18n('renamed')
 
1224
                    st = _('renamed')
1356
1225
                elif status == 'removed':
1357
 
                    st = _i18n('removed')
 
1226
                    st = _('removed')
1358
1227
                elif status == 'added':
1359
 
                    st = _i18n('added')
 
1228
                    st = _('added')
1360
1229
                elif status == 'modified':
1361
 
                    st = _i18n('modified')
 
1230
                    st = _('modified')
1362
1231
                elif status == 'unchanged':
1363
 
                    st = _i18n('unchanged')
 
1232
                    st = _('unchanged')
1364
1233
                elif status == 'ignored':
1365
 
                    st = _i18n('ignored')
1366
 
                    if not ignored_files:
1367
 
                        continue
 
1234
                    st = _('ignored')
1368
1235
                else:
1369
 
                    st = _i18n('unknown')
 
1236
                    st = _('unknown')
1370
1237
                
1371
 
                try:
1372
 
                    statinfo = os.stat(self.path + os.sep + item)
1373
 
                except OSError, e:
1374
 
                    if e.errno == 40:
1375
 
                        continue
1376
 
                    else:
1377
 
                        raise
 
1238
                statinfo = os.stat(self.path + os.sep + item)
1378
1239
                liststore.append([gtk.STOCK_FILE,
1379
1240
                                  False,
1380
1241
                                  item,
1606
1467
        # Some default options
1607
1468
        self.defaults = { 'strict_commit' : False,
1608
1469
                          'dotted_files'  : False,
1609
 
                          'ignored_files' : True,
1610
1470
                          'window_width'  : 700,
1611
1471
                          'window_height' : 400,
1612
1472
                          'window_x'      : 40,