/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

Merge signatures tab.

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