109
104
return fixed_newline.decode('utf-8')
112
class CommitDialog(gtk.Dialog):
107
class CommitDialog(Gtk.Dialog):
113
108
"""Implementation of Commit."""
115
110
def __init__(self, wt, selected=None, parent=None):
116
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
117
parent=parent, flags=0,)
111
super(CommitDialog, self).__init__(
112
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
118
113
self.connect('delete-event', self._on_delete_window)
119
114
self._question_dialog = question_dialog
121
self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
116
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
124
119
# TODO: Do something with this value, it is used by Olive
317
313
self._hpane.set_position(300)
319
315
def _construct_accelerators(self):
320
group = gtk.AccelGroup()
321
group.connect_group(gtk.gdk.keyval_from_name('N'),
322
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
316
group = Gtk.AccelGroup()
317
group.connect(Gdk.keyval_from_name('N'),
318
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
323
319
self.add_accel_group(group)
325
321
# ignore the escape key (avoid closing the window)
326
322
self.connect_object('close', self.emit_stop_by_name, 'close')
328
324
def _construct_left_pane(self):
329
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
325
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
330
326
self._construct_file_list()
331
327
self._construct_pending_list()
333
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
329
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
334
330
use_underline=True)
335
self._left_pane_box.pack_end(self._check_local, False, False)
331
self._left_pane_box.pack_end(self._check_local, False, False, 0)
336
332
self._check_local.set_active(False)
338
334
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
357
353
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
359
355
def _construct_action_pane(self):
360
self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
356
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
361
357
self._button_cancel.connect('clicked', self._on_cancel_clicked)
362
358
self._button_cancel.show()
363
self.action_area.pack_end(self._button_cancel)
364
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
359
self.get_action_area().pack_end(
360
self._button_cancel, True, True, 0)
361
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
365
362
self._button_commit.connect('clicked', self._on_commit_clicked)
366
self._button_commit.set_flags(gtk.CAN_DEFAULT)
363
self._button_commit.set_can_default(True)
367
364
self._button_commit.show()
368
self.action_area.pack_end(self._button_commit)
365
self.get_action_area().pack_end(
366
self._button_commit, True, True, 0)
369
367
self._button_commit.grab_default()
371
369
def _add_to_right_table(self, widget, weight, expanding=False):
386
384
self._right_pane_table_row = end_row
388
386
def _construct_file_list(self):
389
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
390
file_label = gtk.Label(_i18n('Files'))
387
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
388
file_label = Gtk.Label(label=_i18n('Files'))
391
389
# file_label.show()
392
self._files_box.pack_start(file_label, expand=False)
390
self._files_box.pack_start(file_label, False, True, 0)
394
self._commit_all_files_radio = gtk.RadioButton(
392
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
395
393
None, _i18n("Commit all changes"))
396
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
394
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
397
395
self._commit_all_files_radio.show()
398
396
self._commit_all_files_radio.connect('toggled',
399
397
self._toggle_commit_selection)
400
self._commit_selected_radio = gtk.RadioButton(
398
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
401
399
self._commit_all_files_radio, _i18n("Only commit selected changes"))
402
self._files_box.pack_start(self._commit_selected_radio, expand=False)
400
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
403
401
self._commit_selected_radio.show()
404
402
self._commit_selected_radio.connect('toggled',
405
403
self._toggle_commit_selection)
408
406
self._commit_all_files_radio.set_sensitive(False)
409
407
self._commit_selected_radio.set_sensitive(False)
411
scroller = gtk.ScrolledWindow()
412
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
413
self._treeview_files = gtk.TreeView()
409
scroller = Gtk.ScrolledWindow()
410
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
411
self._treeview_files = Gtk.TreeView()
414
412
self._treeview_files.show()
415
413
scroller.add(self._treeview_files)
416
scroller.set_shadow_type(gtk.SHADOW_IN)
414
scroller.set_shadow_type(Gtk.ShadowType.IN)
418
self._files_box.pack_start(scroller,
419
expand=True, fill=True)
416
self._files_box.pack_start(scroller, True, True, 0)
420
417
self._files_box.show()
421
self._left_pane_box.pack_start(self._files_box)
418
self._left_pane_box.pack_start(self._files_box, True, True, 0)
423
420
# Keep note that all strings stored in a ListStore must be UTF-8
424
421
# strings. GTK does not support directly setting and restoring Unicode
426
liststore = gtk.ListStore(
427
gobject.TYPE_STRING, # [0] file_id
428
gobject.TYPE_STRING, # [1] real path
429
gobject.TYPE_BOOLEAN, # [2] checkbox
430
gobject.TYPE_STRING, # [3] display path
431
gobject.TYPE_STRING, # [4] changes type
432
gobject.TYPE_STRING, # [5] commit message
423
liststore = Gtk.ListStore(
424
GObject.TYPE_STRING, # [0] file_id
425
GObject.TYPE_STRING, # [1] real path
426
GObject.TYPE_BOOLEAN, # [2] checkbox
427
GObject.TYPE_STRING, # [3] display path
428
GObject.TYPE_STRING, # [4] changes type
429
GObject.TYPE_STRING, # [5] commit message
434
431
self._files_store = liststore
435
432
self._treeview_files.set_model(liststore)
436
crt = gtk.CellRendererToggle()
433
crt = Gtk.CellRendererToggle()
437
434
crt.set_property('activatable', not bool(self._pending))
438
435
crt.connect("toggled", self._toggle_commit, self._files_store)
439
436
if self._pending:
440
437
name = _i18n('Commit*')
442
439
name = _i18n('Commit')
443
commit_col = gtk.TreeViewColumn(name, crt, active=2)
440
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
444
441
commit_col.set_visible(False)
445
442
self._treeview_files.append_column(commit_col)
446
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
447
gtk.CellRendererText(), text=3))
448
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
449
gtk.CellRendererText(), text=4))
443
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
444
Gtk.CellRendererText(), text=3))
445
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
446
Gtk.CellRendererText(), text=4))
450
447
self._treeview_files.connect('cursor-changed',
451
448
self._on_treeview_files_cursor_changed)
467
464
checked_col.set_visible(False)
469
466
checked_col.set_visible(True)
470
renderer = checked_col.get_cell_renderers()[0]
467
renderer = checked_col.get_cells()[0]
471
468
renderer.set_property('activatable', not all_files)
473
470
def _construct_pending_list(self):
474
471
# Pending information defaults to hidden, we put it all in 1 box, so
475
472
# that we can show/hide all of them at once
476
self._pending_box = gtk.VBox()
473
self._pending_box = Gtk.VBox()
477
474
self._pending_box.hide()
479
pending_message = gtk.Label()
476
pending_message = Gtk.Label()
480
477
pending_message.set_markup(
481
478
_i18n('<i>* Cannot select specific files when merging</i>'))
482
self._pending_box.pack_start(pending_message, expand=False, padding=5)
479
self._pending_box.pack_start(pending_message, False, True, 5)
483
480
pending_message.show()
485
pending_label = gtk.Label(_i18n('Pending Revisions'))
486
self._pending_box.pack_start(pending_label, expand=False, padding=0)
482
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
483
self._pending_box.pack_start(pending_label, False, True, 0)
487
484
pending_label.show()
489
scroller = gtk.ScrolledWindow()
490
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
491
self._treeview_pending = gtk.TreeView()
486
scroller = Gtk.ScrolledWindow()
487
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
488
self._treeview_pending = Gtk.TreeView()
492
489
scroller.add(self._treeview_pending)
493
scroller.set_shadow_type(gtk.SHADOW_IN)
490
scroller.set_shadow_type(Gtk.ShadowType.IN)
495
self._pending_box.pack_start(scroller,
496
expand=True, fill=True, padding=5)
492
self._pending_box.pack_start(scroller, True, True, 5)
497
493
self._treeview_pending.show()
498
self._left_pane_box.pack_start(self._pending_box)
494
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
500
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
501
gobject.TYPE_STRING, # date
502
gobject.TYPE_STRING, # committer
503
gobject.TYPE_STRING, # summary
496
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
497
GObject.TYPE_STRING, # date
498
GObject.TYPE_STRING, # committer
499
GObject.TYPE_STRING, # summary
505
501
self._pending_store = liststore
506
502
self._treeview_pending.set_model(liststore)
507
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
508
gtk.CellRendererText(), text=1))
509
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
510
gtk.CellRendererText(), text=2))
511
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
512
gtk.CellRendererText(), text=3))
503
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
504
Gtk.CellRendererText(), text=1))
505
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
506
Gtk.CellRendererText(), text=2))
507
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
508
Gtk.CellRendererText(), text=3))
514
510
def _construct_diff_view(self):
515
511
from bzrlib.plugins.gtk.diff import DiffView
529
525
self._diff_view.show()
531
527
def _construct_file_message(self):
532
scroller = gtk.ScrolledWindow()
533
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
528
scroller = Gtk.ScrolledWindow()
529
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
535
self._file_message_text_view = gtk.TextView()
531
self._file_message_text_view = Gtk.TextView()
536
532
scroller.add(self._file_message_text_view)
537
scroller.set_shadow_type(gtk.SHADOW_IN)
533
scroller.set_shadow_type(Gtk.ShadowType.IN)
540
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
541
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
536
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
537
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
542
538
self._file_message_text_view.set_accepts_tab(False)
543
539
self._file_message_text_view.show()
545
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
541
self._file_message_expander = Gtk.Expander(
542
label=_i18n('File commit message'))
546
543
self._file_message_expander.set_expanded(True)
547
544
self._file_message_expander.add(scroller)
548
545
self._add_to_right_table(self._file_message_expander, 1, False)
549
546
self._file_message_expander.show()
551
548
def _construct_global_message(self):
552
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
549
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
553
550
self._global_message_label.set_markup(
554
551
_i18n('<b>Global Commit Message</b>'))
555
552
self._global_message_label.set_alignment(0, 0)
558
555
# Can we remove the spacing between the label and the box?
559
556
self._global_message_label.show()
561
scroller = gtk.ScrolledWindow()
562
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
558
scroller = Gtk.ScrolledWindow()
559
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
564
self._global_message_text_view = gtk.TextView()
561
self._global_message_text_view = Gtk.TextView()
565
562
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
566
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
563
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
567
564
scroller.add(self._global_message_text_view)
568
scroller.set_shadow_type(gtk.SHADOW_IN)
565
scroller.set_shadow_type(Gtk.ShadowType.IN)
570
567
self._add_to_right_table(scroller, 2, True)
571
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
568
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
572
569
self._file_message_text_view.set_accepts_tab(False)
573
570
self._global_message_text_view.show()
599
596
# We have either made it to the end of the list, or nothing was
600
597
# selected. Either way, select All Files, and jump to the global
601
598
# commit message.
602
self._treeview_files.set_cursor((0,))
599
self._treeview_files.set_cursor(
600
Gtk.TreePath(path=0), None, False)
603
601
self._global_message_text_view.grab_focus()
605
603
# Set the cursor to this entry, and jump to the per-file commit
607
self._treeview_files.set_cursor(model.get_path(next))
605
self._treeview_files.set_cursor(model.get_path(next), None, False)
608
606
self._file_message_text_view.grab_focus()
610
608
def _save_current_file_message(self):
761
759
self.committed_revision_id = rev_id
762
760
# destroy old comments if any
763
761
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
764
self.response(gtk.RESPONSE_OK)
762
self.response(Gtk.ResponseType.OK)
766
764
def _get_global_commit_message(self):
767
765
buf = self._global_message_text_view.get_buffer()
768
766
start, end = buf.get_bounds()
769
text = buf.get_text(start, end)
767
text = buf.get_text(start, end, True)
770
768
return _sanitize_and_decode_message(text)
772
770
def _set_global_commit_message(self, message):