/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: Jelmer Vernooij
  • Date: 2008-03-14 02:13:27 UTC
  • mto: (452.2.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021327-q1pabtpneeasz8qv
Fix support for default value in BranchSelectionDialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
1
 
 #!/usr/bin/python
 
1
#!/usr/bin/python
 
2
# -*- coding: UTF-8 -*-
2
3
 
3
4
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
4
5
#
41
42
from bzrlib.ui import ui_factory
42
43
from bzrlib.workingtree import WorkingTree
43
44
 
44
 
from bzrlib.plugins.gtk import _i18n
45
45
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
46
46
from bzrlib.plugins.gtk.errors import show_bzr_error
47
47
from guifiles import GLADEFILENAME
69
69
 
70
70
    # Set version
71
71
    dialog.set_version(__version__)
72
 
    dialog.set_authors([ _i18n("Lead Developer:"),
 
72
    dialog.set_authors([ _("Lead Developer:"),
73
73
                         "Szilveszter Farkas <szilveszter.farkas@gmail.com>",
74
 
                         _i18n("Contributors:"),
 
74
                         _("Contributors:"),
75
75
                         "Jelmer Vernooij <jelmer@samba.org>",
76
76
                         "Mateusz Korniak <mateusz.korniak@ant.gliwice.pl>",
77
77
                         "Gary van der Merwe <garyvdm@gmail.com>" ])
106
106
        # Get some important menu items
107
107
        self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
108
        self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
 
        self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
109
        self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
110
        self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
111
        self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
163
162
                "on_about_activate": self.on_about_activate,
164
163
                "on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
164
                "on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
 
                "on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
165
                "on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
166
                "on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
167
                "on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
198
196
                "on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
197
                "on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
198
                "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
199
                "on_treeview_left_row_activated": self.on_treeview_left_row_activated,
203
200
                "on_button_location_up_clicked": self.on_button_location_up_clicked,
204
201
                "on_button_location_jump_clicked": self.on_button_location_jump_clicked,
446
443
    @show_bzr_error
447
444
    def on_entry_history_revno_key_press_event(self, widget, event):
448
445
        """ 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'):
 
446
        if event.keyval == 65293:
450
447
            # Return was hit, so we have to load that specific revision
451
448
            # Emulate being remote, so inventory should be used
452
449
            path = self.get_path()
461
458
    
462
459
    def on_entry_location_key_press_event(self, widget, event):
463
460
        """ 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'):
 
461
        if event.keyval == 65293:
465
462
            # Return was hit, so we have to jump
466
463
            self.on_button_location_jump_clicked(widget)
467
464
    
537
534
        from bzrlib.plugins.gtk.merge import MergeDialog
538
535
        
539
536
        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.'))
 
537
            error_dialog(_('There are local changes in the branch'),
 
538
                         _('Please commit or revert the changes before merging.'))
542
539
        else:
543
540
            parent_branch_path = self.wt.branch.get_parent()
544
541
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
553
550
        local_branch = self.wt.branch
554
551
        parent_branch_path = local_branch.get_parent()
555
552
        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.'))
 
553
            error_dialog(_('Parent location is unknown'),
 
554
                         _('Cannot determine missing revisions if no parent location is known.'))
558
555
            return
559
556
        
560
557
        parent_branch = Branch.open(parent_branch_path)
576
573
            
577
574
            dlg_txt = ""
578
575
            if local_extra:
579
 
                dlg_txt += _i18n('%d local extra revision(s). \n') % (len(local_extra),) 
 
576
                dlg_txt += _('%d local extra revision(s). \n') % (len(local_extra),) 
580
577
                ## NOTE: We do not want such ugly info about missing revisions
581
578
                ##       Revision Browser should be used there
582
579
                ## max_revisions = 10
583
580
                ## for log_revision in iter_log_revisions(local_extra, local_branch.repository, verbose=1):
584
581
                ##    dlg_txt += log_revision_one_line_text(log_revision)
585
582
                ##    if max_revisions <= 0:
586
 
                ##        dlg_txt += _i18n("more ... \n")
 
583
                ##        dlg_txt += _("more ... \n")
587
584
                ##        break
588
585
                ## max_revisions -= 1
589
586
            ## dlg_txt += "\n"
590
587
            if remote_extra:
591
 
                dlg_txt += _i18n('%d local missing revision(s).\n') % (len(remote_extra),) 
 
588
                dlg_txt += _('%d local missing revision(s).\n') % (len(remote_extra),) 
592
589
                ## max_revisions = 10
593
590
                ## for log_revision in iter_log_revisions(remote_extra, parent_branch.repository, verbose=1):
594
591
                ##    dlg_txt += log_revision_one_line_text(log_revision)
595
592
                ##    if max_revisions <= 0:
596
 
                ##        dlg_txt += _i18n("more ... \n")
 
593
                ##        dlg_txt += _("more ... \n")
597
594
                ##        break
598
595
                ##    max_revisions -= 1
599
596
                
600
 
            info_dialog(_i18n('There are missing revisions'),
 
597
            info_dialog(_('There are missing revisions'),
601
598
                        dlg_txt)
602
599
        else:
603
 
            info_dialog(_i18n('Local branch up to date'),
604
 
                        _i18n('There are no missing revisions.'))
 
600
            info_dialog(_('Local branch up to date'),
 
601
                        _('There are no missing revisions.'))
605
602
 
606
603
    @show_bzr_error
607
604
    def on_menuitem_branch_pull_activate(self, widget):
610
607
 
611
608
        location = branch_to.get_parent()
612
609
        if location is None:
613
 
            error_dialog(_i18n('Parent location is unknown'),
614
 
                                     _i18n('Pulling is not possible until there is a parent location.'))
 
610
            error_dialog(_('Parent location is unknown'),
 
611
                                     _('Pulling is not possible until there is a parent location.'))
615
612
            return
616
613
 
617
614
        branch_from = Branch.open(location)
621
618
 
622
619
        ret = branch_to.pull(branch_from)
623
620
        
624
 
        info_dialog(_i18n('Pull successful'), _i18n('%d revision(s) pulled.') % ret)
 
621
        info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
625
622
        
626
623
    @show_bzr_error
627
624
    def on_menuitem_branch_update_activate(self, widget):
630
627
        ret = self.wt.update()
631
628
        conflicts = self.wt.conflicts()
632
629
        if conflicts:
633
 
            info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) )
 
630
            info_dialog(_('Update successful but conflicts generated'), _('Number of conflicts generated: %d.') % (len(conflicts),) )
634
631
        else:
635
 
            info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') )
 
632
            info_dialog(_('Update successful'), _('No conflicts generated.') )
636
633
    
637
634
    def on_menuitem_branch_push_activate(self, widget):
638
635
        """ Branch/Push... menu handler. """
646
643
        """ Branch/Revert all changes menu handler. """
647
644
        ret = self.wt.revert([])
648
645
        if ret:
649
 
            warning_dialog(_i18n('Conflicts detected'),
650
 
                           _i18n('Please have a look at the working tree before continuing.'))
 
646
            warning_dialog(_('Conflicts detected'),
 
647
                           _('Please have a look at the working tree before continuing.'))
651
648
        else:
652
 
            info_dialog(_i18n('Revert successful'),
653
 
                        _i18n('All files reverted to last revision.'))
 
649
            info_dialog(_('Revert successful'),
 
650
                        _('All files reverted to last revision.'))
654
651
        self.refresh_right()
655
652
    
656
653
    def on_menuitem_branch_status_activate(self, widget):
685
682
    def on_menuitem_file_annotate_activate(self, widget):
686
683
        """ File/Annotate... menu handler. """
687
684
        if self.get_selected_right() is None:
688
 
            error_dialog(_i18n('No file was selected'),
689
 
                         _i18n('Please select a file from the list.'))
 
685
            error_dialog(_('No file was selected'),
 
686
                         _('Please select a file from the list.'))
690
687
            return
691
688
        
692
689
        branch = self.wt.branch
702
699
        finally:
703
700
            branch.unlock()
704
701
    
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
702
    def on_menuitem_file_make_directory_activate(self, widget):
718
703
        """ File/Make directory... menu handler. """
719
704
        from mkdir import OliveMkdir
811
796
            menu.left_context_menu().popup(None, None, None, 0,
812
797
                                           event.time)
813
798
 
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
799
    def on_treeview_left_row_activated(self, treeview, path, view_column):
829
800
        """ Occurs when somebody double-clicks or enters an item in the
830
801
        bookmark list. """
940
911
        bookmarks = self.pref.get_bookmarks()
941
912
        
942
913
        # Add them to the TreeStore
943
 
        titer = treestore.append(None, [_i18n('Bookmarks'), None])
 
914
        titer = treestore.append(None, [_('Bookmarks'), None])
944
915
        for item in bookmarks:
945
916
            title = self.pref.get_bookmark_title(item)
946
917
            treestore.append(titer, [title, item])
947
918
        
948
919
        # Create the column and add it to the TreeView
949
920
        self.treeview_left.set_model(treestore)
950
 
        tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
 
921
        tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
922
        self.treeview_left.append_column(tvcolumn_bookmark)
952
923
        
953
924
        # Set up the cells
1047
1018
                    self.wt.unlock()
1048
1019
            
1049
1020
            if status == 'renamed':
1050
 
                st = _i18n('renamed')
 
1021
                st = _('renamed')
1051
1022
            elif status == 'removed':
1052
 
                st = _i18n('removed')
 
1023
                st = _('removed')
1053
1024
            elif status == 'added':
1054
 
                st = _i18n('added')
 
1025
                st = _('added')
1055
1026
            elif status == 'modified':
1056
 
                st = _i18n('modified')
 
1027
                st = _('modified')
1057
1028
            elif status == 'unchanged':
1058
 
                st = _i18n('unchanged')
 
1029
                st = _('unchanged')
1059
1030
            elif status == 'ignored':
1060
 
                st = _i18n('ignored')
 
1031
                st = _('ignored')
1061
1032
            else:
1062
 
                st = _i18n('unknown')
 
1033
                st = _('unknown')
1063
1034
            
1064
1035
            try:
1065
1036
                statinfo = os.stat(self.path + os.sep + item)
1081
1052
        
1082
1053
        # Create the columns and add them to the TreeView
1083
1054
        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'))
 
1055
        self._tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
 
1056
        self._tvcolumn_status = gtk.TreeViewColumn(_('Status'))
 
1057
        self._tvcolumn_size = gtk.TreeViewColumn(_('Size'))
 
1058
        self._tvcolumn_mtime = gtk.TreeViewColumn(_('Last modified'))
1088
1059
        self.treeview_right.append_column(self._tvcolumn_filename)
1089
1060
        self.treeview_right.append_column(self._tvcolumn_status)
1090
1061
        self.treeview_right.append_column(self._tvcolumn_size)
1238
1209
        bookmarks = self.pref.get_bookmarks()
1239
1210
 
1240
1211
        # Add them to the TreeStore
1241
 
        titer = treestore.append(None, [_i18n('Bookmarks'), None])
 
1212
        titer = treestore.append(None, [_('Bookmarks'), None])
1242
1213
        for item in bookmarks:
1243
1214
            title = self.pref.get_bookmark_title(item)
1244
1215
            treestore.append(titer, [title, item])
1352
1323
                        self.wt.unlock()
1353
1324
                
1354
1325
                if status == 'renamed':
1355
 
                    st = _i18n('renamed')
 
1326
                    st = _('renamed')
1356
1327
                elif status == 'removed':
1357
 
                    st = _i18n('removed')
 
1328
                    st = _('removed')
1358
1329
                elif status == 'added':
1359
 
                    st = _i18n('added')
 
1330
                    st = _('added')
1360
1331
                elif status == 'modified':
1361
 
                    st = _i18n('modified')
 
1332
                    st = _('modified')
1362
1333
                elif status == 'unchanged':
1363
 
                    st = _i18n('unchanged')
 
1334
                    st = _('unchanged')
1364
1335
                elif status == 'ignored':
1365
 
                    st = _i18n('ignored')
 
1336
                    st = _('ignored')
1366
1337
                    if not ignored_files:
1367
1338
                        continue
1368
1339
                else:
1369
 
                    st = _i18n('unknown')
 
1340
                    st = _('unknown')
1370
1341
                
1371
1342
                try:
1372
1343
                    statinfo = os.stat(self.path + os.sep + item)