/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 commit.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
33
33
 
 
34
from bzrlib.plugins.gtk import _i18n
34
35
from dialog import error_dialog, question_dialog
35
36
from errors import show_bzr_error
36
37
 
164
165
        store = self._files_store
165
166
        self._treeview_files.set_model(None)
166
167
 
167
 
        added = _('added')
168
 
        removed = _('removed')
169
 
        renamed = _('renamed')
170
 
        renamed_and_modified = _('renamed and modified')
171
 
        modified = _('modified')
172
 
        kind_changed = _('kind changed')
 
168
        added = _i18n('added')
 
169
        removed = _i18n('removed')
 
170
        renamed = _i18n('renamed')
 
171
        renamed_and_modified = _i18n('renamed and modified')
 
172
        modified = _i18n('modified')
 
173
        kind_changed = _i18n('kind changed')
173
174
 
174
175
        # The store holds:
175
176
        # [file_id, real path, checkbox, display path, changes type, message]
257
258
            self._enable_per_file_commits = True
258
259
        if not self._enable_per_file_commits:
259
260
            self._file_message_expander.hide()
260
 
            self._global_message_label.set_markup(_('<b>Commit Message</b>'))
 
261
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
261
262
 
262
263
    def _compute_delta(self):
263
264
        self._delta = self._wt.changes_from(self._basis_tree)
302
303
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
303
304
        self.add_accel_group(group)
304
305
 
 
306
        # ignore the escape key (avoid closing the window)
 
307
        self.connect_object('close', self.emit_stop_by_name, 'close')
 
308
 
305
309
    def _construct_left_pane(self):
306
310
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
307
311
        self._construct_file_list()
308
312
        self._construct_pending_list()
309
313
 
310
 
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
 
314
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
311
315
                                            use_underline=True)
312
316
        self._left_pane_box.pack_end(self._check_local, False, False)
313
317
        self._check_local.set_active(False)
334
338
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
335
339
 
336
340
    def _construct_action_pane(self):
337
 
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
 
341
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
338
342
        self._button_commit.connect('clicked', self._on_commit_clicked)
339
343
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
340
344
        self._button_commit.show()
360
364
 
361
365
    def _construct_file_list(self):
362
366
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
363
 
        file_label = gtk.Label(_('Files'))
 
367
        file_label = gtk.Label(_i18n('Files'))
364
368
        # file_label.show()
365
369
        self._files_box.pack_start(file_label, expand=False)
366
370
 
367
371
        self._commit_all_files_radio = gtk.RadioButton(
368
 
            None, _("Commit all changes"))
 
372
            None, _i18n("Commit all changes"))
369
373
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
370
374
        self._commit_all_files_radio.show()
371
375
        self._commit_all_files_radio.connect('toggled',
372
376
            self._toggle_commit_selection)
373
377
        self._commit_selected_radio = gtk.RadioButton(
374
 
            self._commit_all_files_radio, _("Only commit selected changes"))
 
378
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
375
379
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
376
380
        self._commit_selected_radio.show()
377
381
        self._commit_selected_radio.connect('toggled',
378
382
            self._toggle_commit_selection)
379
383
        if self._pending:
380
 
            self._commit_all_files_radio.set_label(_('Commit all changes*'))
 
384
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
381
385
            self._commit_all_files_radio.set_sensitive(False)
382
386
            self._commit_selected_radio.set_sensitive(False)
383
387
 
410
414
        crt.set_property('activatable', not bool(self._pending))
411
415
        crt.connect("toggled", self._toggle_commit, self._files_store)
412
416
        if self._pending:
413
 
            name = _('Commit*')
 
417
            name = _i18n('Commit*')
414
418
        else:
415
 
            name = _('Commit')
 
419
            name = _i18n('Commit')
416
420
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
417
421
        commit_col.set_visible(False)
418
422
        self._treeview_files.append_column(commit_col)
419
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
 
423
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
420
424
                                           gtk.CellRendererText(), text=3))
421
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
 
425
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
422
426
                                           gtk.CellRendererText(), text=4))
423
427
        self._treeview_files.connect('cursor-changed',
424
428
                                     self._on_treeview_files_cursor_changed)
451
455
 
452
456
        pending_message = gtk.Label()
453
457
        pending_message.set_markup(
454
 
            _('<i>* Cannot select specific files when merging</i>'))
 
458
            _i18n('<i>* Cannot select specific files when merging</i>'))
455
459
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
456
460
        pending_message.show()
457
461
 
458
 
        pending_label = gtk.Label(_('Pending Revisions'))
 
462
        pending_label = gtk.Label(_i18n('Pending Revisions'))
459
463
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
460
464
        pending_label.show()
461
465
 
477
481
                                 )
478
482
        self._pending_store = liststore
479
483
        self._treeview_pending.set_model(liststore)
480
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
 
484
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
481
485
                                             gtk.CellRendererText(), text=1))
482
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
 
486
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
483
487
                                             gtk.CellRendererText(), text=2))
484
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
 
488
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
485
489
                                             gtk.CellRendererText(), text=3))
486
490
 
487
491
    def _construct_diff_view(self):
491
495
        #       decide that we really don't ever want to display it, we should
492
496
        #       actually remove it, and other references to it, along with the
493
497
        #       tests that it is set properly.
494
 
        self._diff_label = gtk.Label(_('Diff for whole tree'))
 
498
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
495
499
        self._diff_label.set_alignment(0, 0)
496
500
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
497
501
        self._add_to_right_table(self._diff_label, 1, False)
515
519
        self._file_message_text_view.set_accepts_tab(False)
516
520
        self._file_message_text_view.show()
517
521
 
518
 
        self._file_message_expander = gtk.Expander(_('File commit message'))
 
522
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
519
523
        self._file_message_expander.set_expanded(True)
520
524
        self._file_message_expander.add(scroller)
521
525
        self._add_to_right_table(self._file_message_expander, 1, False)
522
526
        self._file_message_expander.show()
523
527
 
524
528
    def _construct_global_message(self):
525
 
        self._global_message_label = gtk.Label(_('Global Commit Message'))
526
 
        self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
 
529
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
 
530
        self._global_message_label.set_markup(
 
531
            _i18n('<b>Global Commit Message</b>'))
527
532
        self._global_message_label.set_alignment(0, 0)
528
533
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
529
534
        self._add_to_right_table(self._global_message_label, 1, False)
549
554
 
550
555
        if selection is not None:
551
556
            path, display_path = model.get(selection, 1, 3)
552
 
            self._diff_label.set_text(_('Diff for ') + display_path)
 
557
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
553
558
            if path is None:
554
559
                self._diff_view.show_diff(None)
555
560
            else:
596
601
        text_buffer = self._file_message_text_view.get_buffer()
597
602
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
598
603
        if file_id is None: # Whole tree
599
 
            self._file_message_expander.set_label(_('File commit message'))
 
604
            self._file_message_expander.set_label(_i18n('File commit message'))
600
605
            self._file_message_expander.set_expanded(False)
601
606
            self._file_message_expander.set_sensitive(False)
602
607
            text_buffer.set_text('')
603
608
            self._last_selected_file = None
604
609
        else:
605
 
            self._file_message_expander.set_label(_('Commit message for ')
 
610
            self._file_message_expander.set_label(_i18n('Commit message for ')
606
611
                                                  + display_path)
607
612
            self._file_message_expander.set_expanded(True)
608
613
            self._file_message_expander.set_sensitive(True)
647
652
 
648
653
        if message == '':
649
654
            response = self._question_dialog(
650
 
                            _('Commit with an empty message?'),
651
 
                            _('You can describe your commit intent in the message.'))
 
655
                _i18n('Commit with an empty message?'),
 
656
                _i18n('You can describe your commit intent in the message.'))
652
657
            if response == gtk.RESPONSE_NO:
653
658
                # Kindly give focus to message area
654
659
                self._global_message_text_view.grab_focus()
667
672
        #       files at this point.
668
673
        for path in self._wt.unknowns():
669
674
            response = self._question_dialog(
670
 
                _("Commit with unknowns?"),
671
 
                _("Unknown files exist in the working tree. Commit anyway?"))
 
675
                _i18n("Commit with unknowns?"),
 
676
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
672
677
            if response == gtk.RESPONSE_NO:
673
678
                return
674
679
            break
686
691
                       revprops=revprops)
687
692
        except errors.PointlessCommit:
688
693
            response = self._question_dialog(
689
 
                                _('Commit with no changes?'),
690
 
                                _('There are no changes in the working tree.'
691
 
                                  ' Do you want to commit anyway?'))
 
694
                _i18n('Commit with no changes?'),
 
695
                _i18n('There are no changes in the working tree.'
 
696
                      ' Do you want to commit anyway?'))
692
697
            if response == gtk.RESPONSE_YES:
693
698
                rev_id = self._wt.commit(message,
694
699
                               allow_pointless=True,