31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
34
from bzrlib.plugins.gtk import _i18n
34
35
from dialog import error_dialog, question_dialog
35
36
from errors import show_bzr_error
164
165
store = self._files_store
165
166
self._treeview_files.set_model(None)
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')
174
175
# The store holds:
175
176
# [file_id, real path, checkbox, display path, changes type, message]
176
# _iter_changes returns:
177
# iter_changes returns:
177
178
# (file_id, (path_in_source, path_in_target),
178
179
# changed_content, versioned, parent, name, kind,
186
187
self._wt.lock_read()
187
188
self._basis_tree.lock_read()
189
from diff import _iter_changes_to_status
190
from diff import iter_changes_to_status
190
191
for (file_id, real_path, change_type, display_path
191
) in _iter_changes_to_status(self._basis_tree, self._wt):
192
) in iter_changes_to_status(self._basis_tree, self._wt):
192
193
if self._selected and real_path != self._selected:
229
230
bus = dbus.SystemBus()
230
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
231
'/org/freedesktop/NetworkManager')
232
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
233
'/org/freedesktop/NetworkManager')
234
except dbus.DBusException:
235
mutter("networkmanager not available.")
236
self._check_local.show()
232
239
dbus_iface = dbus.Interface(proxy_obj,
233
240
'org.freedesktop.NetworkManager')
251
258
self._enable_per_file_commits = True
252
259
if not self._enable_per_file_commits:
253
260
self._file_message_expander.hide()
254
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
261
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
256
263
def _compute_delta(self):
257
264
self._delta = self._wt.changes_from(self._basis_tree)
296
303
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
297
304
self.add_accel_group(group)
306
# ignore the escape key (avoid closing the window)
307
self.connect_object('close', self.emit_stop_by_name, 'close')
299
309
def _construct_left_pane(self):
300
310
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
301
311
self._construct_file_list()
302
312
self._construct_pending_list()
304
self._check_local = gtk.CheckButton(_("_Only commit locally"),
314
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
305
315
use_underline=True)
306
316
self._left_pane_box.pack_end(self._check_local, False, False)
307
317
self._check_local.set_active(False)
328
338
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
330
340
def _construct_action_pane(self):
331
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
341
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
332
342
self._button_commit.connect('clicked', self._on_commit_clicked)
333
343
self._button_commit.set_flags(gtk.CAN_DEFAULT)
334
344
self._button_commit.show()
355
365
def _construct_file_list(self):
356
366
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
357
file_label = gtk.Label(_('Files'))
367
file_label = gtk.Label(_i18n('Files'))
358
368
# file_label.show()
359
369
self._files_box.pack_start(file_label, expand=False)
361
371
self._commit_all_files_radio = gtk.RadioButton(
362
None, _("Commit all changes"))
372
None, _i18n("Commit all changes"))
363
373
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
364
374
self._commit_all_files_radio.show()
365
375
self._commit_all_files_radio.connect('toggled',
366
376
self._toggle_commit_selection)
367
377
self._commit_selected_radio = gtk.RadioButton(
368
self._commit_all_files_radio, _("Only commit selected changes"))
378
self._commit_all_files_radio, _i18n("Only commit selected changes"))
369
379
self._files_box.pack_start(self._commit_selected_radio, expand=False)
370
380
self._commit_selected_radio.show()
371
381
self._commit_selected_radio.connect('toggled',
372
382
self._toggle_commit_selection)
373
383
if self._pending:
374
self._commit_all_files_radio.set_label(_('Commit all changes*'))
384
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
375
385
self._commit_all_files_radio.set_sensitive(False)
376
386
self._commit_selected_radio.set_sensitive(False)
404
414
crt.set_property('activatable', not bool(self._pending))
405
415
crt.connect("toggled", self._toggle_commit, self._files_store)
406
416
if self._pending:
417
name = _i18n('Commit*')
419
name = _i18n('Commit')
410
420
commit_col = gtk.TreeViewColumn(name, crt, active=2)
411
421
commit_col.set_visible(False)
412
422
self._treeview_files.append_column(commit_col)
413
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
423
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
414
424
gtk.CellRendererText(), text=3))
415
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
425
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
416
426
gtk.CellRendererText(), text=4))
417
427
self._treeview_files.connect('cursor-changed',
418
428
self._on_treeview_files_cursor_changed)
446
456
pending_message = gtk.Label()
447
457
pending_message.set_markup(
448
_('<i>* Cannot select specific files when merging</i>'))
458
_i18n('<i>* Cannot select specific files when merging</i>'))
449
459
self._pending_box.pack_start(pending_message, expand=False, padding=5)
450
460
pending_message.show()
452
pending_label = gtk.Label(_('Pending Revisions'))
462
pending_label = gtk.Label(_i18n('Pending Revisions'))
453
463
self._pending_box.pack_start(pending_label, expand=False, padding=0)
454
464
pending_label.show()
472
482
self._pending_store = liststore
473
483
self._treeview_pending.set_model(liststore)
474
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
484
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
475
485
gtk.CellRendererText(), text=1))
476
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
486
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
477
487
gtk.CellRendererText(), text=2))
478
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
488
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
479
489
gtk.CellRendererText(), text=3))
481
491
def _construct_diff_view(self):
485
495
# decide that we really don't ever want to display it, we should
486
496
# actually remove it, and other references to it, along with the
487
497
# tests that it is set properly.
488
self._diff_label = gtk.Label(_('Diff for whole tree'))
498
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
489
499
self._diff_label.set_alignment(0, 0)
490
500
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
491
501
self._add_to_right_table(self._diff_label, 1, False)
509
519
self._file_message_text_view.set_accepts_tab(False)
510
520
self._file_message_text_view.show()
512
self._file_message_expander = gtk.Expander(_('File commit message'))
522
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
513
523
self._file_message_expander.set_expanded(True)
514
524
self._file_message_expander.add(scroller)
515
525
self._add_to_right_table(self._file_message_expander, 1, False)
516
526
self._file_message_expander.show()
518
528
def _construct_global_message(self):
519
self._global_message_label = gtk.Label(_('Global Commit Message'))
520
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>'))
521
532
self._global_message_label.set_alignment(0, 0)
522
533
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
523
534
self._add_to_right_table(self._global_message_label, 1, False)
544
555
if selection is not None:
545
556
path, display_path = model.get(selection, 1, 3)
546
self._diff_label.set_text(_('Diff for ') + display_path)
557
self._diff_label.set_text(_i18n('Diff for ') + display_path)
548
559
self._diff_view.show_diff(None)
590
601
text_buffer = self._file_message_text_view.get_buffer()
591
602
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
592
603
if file_id is None: # Whole tree
593
self._file_message_expander.set_label(_('File commit message'))
604
self._file_message_expander.set_label(_i18n('File commit message'))
594
605
self._file_message_expander.set_expanded(False)
595
606
self._file_message_expander.set_sensitive(False)
596
607
text_buffer.set_text('')
597
608
self._last_selected_file = None
599
self._file_message_expander.set_label(_('Commit message for ')
610
self._file_message_expander.set_label(_i18n('Commit message for ')
601
612
self._file_message_expander.set_expanded(True)
602
613
self._file_message_expander.set_sensitive(True)
642
653
if message == '':
643
654
response = self._question_dialog(
644
_('Commit with an empty message?'),
645
_('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.'))
646
657
if response == gtk.RESPONSE_NO:
647
658
# Kindly give focus to message area
648
659
self._global_message_text_view.grab_focus()
661
672
# files at this point.
662
673
for path in self._wt.unknowns():
663
674
response = self._question_dialog(
664
_("Commit with unknowns?"),
665
_("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?"))
666
677
if response == gtk.RESPONSE_NO:
680
691
revprops=revprops)
681
692
except errors.PointlessCommit:
682
693
response = self._question_dialog(
683
_('Commit with no changes?'),
684
_('There are no changes in the working tree.'
685
' 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?'))
686
697
if response == gtk.RESPONSE_YES:
687
698
rev_id = self._wt.commit(message,
688
699
allow_pointless=True,
added
removed
commit.py
