/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-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
 
24
import gobject
 
25
import pango
 
26
 
 
27
import os.path
17
28
import re
18
29
 
19
 
from gi.repository import Gdk
20
 
from gi.repository import Gtk
21
 
from gi.repository import GObject
22
 
from gi.repository import Pango
23
 
 
24
 
try:
25
 
    from bzrlib import bencode
26
 
except ImportError:
27
 
    from bzrlib.util import bencode
28
 
 
29
 
from bzrlib import (
30
 
    errors,
31
 
    trace,
32
 
    )
33
 
from bzrlib.plugins.gtk.dialog import question_dialog
34
 
from bzrlib.plugins.gtk.errors import show_bzr_error
35
 
from bzrlib.plugins.gtk.i18n import _i18n
36
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
 
30
from bzrlib import errors, osutils
 
31
from bzrlib.trace import mutter
 
32
from bzrlib.util import bencode
 
33
 
 
34
from dialog import error_dialog, question_dialog
 
35
from errors import show_bzr_error
37
36
 
38
37
try:
39
38
    import dbus
97
96
    return pm
98
97
 
99
98
 
100
 
_newline_variants_re = re.compile(r'\r\n?')
101
 
def _sanitize_and_decode_message(utf8_message):
102
 
    """Turn a utf-8 message into a sanitized Unicode message."""
103
 
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
104
 
    return fixed_newline.decode('utf-8')
105
 
 
106
 
 
107
 
class CommitDialog(Gtk.Dialog):
 
99
class CommitDialog(gtk.Dialog):
108
100
    """Implementation of Commit."""
109
101
 
110
102
    def __init__(self, wt, selected=None, parent=None):
111
 
        super(CommitDialog, self).__init__(
112
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
113
 
        self.connect('delete-event', self._on_delete_window)
 
103
        gtk.Dialog.__init__(self, title="Commit - Olive",
 
104
                                  parent=parent,
 
105
                                  flags=0,
 
106
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
114
107
        self._question_dialog = question_dialog
115
108
 
116
 
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
117
 
 
118
109
        self._wt = wt
119
110
        # TODO: Do something with this value, it is used by Olive
120
111
        #       It used to set all changes but this one to False
122
113
        self._enable_per_file_commits = True
123
114
        self._commit_all_changes = True
124
115
        self.committed_revision_id = None # Nothing has been committed yet
125
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
126
 
            self._wt, self._wt.branch)
127
116
 
128
117
        self.setup_params()
129
118
        self.construct()
175
164
        store = self._files_store
176
165
        self._treeview_files.set_model(None)
177
166
 
178
 
        added = _i18n('added')
179
 
        removed = _i18n('removed')
180
 
        renamed = _i18n('renamed')
181
 
        renamed_and_modified = _i18n('renamed and modified')
182
 
        modified = _i18n('modified')
183
 
        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')
184
173
 
185
174
        # The store holds:
186
175
        # [file_id, real path, checkbox, display path, changes type, message]
198
187
        self._basis_tree.lock_read()
199
188
        try:
200
189
            from diff import iter_changes_to_status
201
 
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
202
190
            for (file_id, real_path, change_type, display_path
203
191
                ) in iter_changes_to_status(self._basis_tree, self._wt):
204
192
                if self._selected and real_path != self._selected:
205
193
                    enabled = False
206
194
                else:
207
195
                    enabled = True
208
 
                try:
209
 
                    default_message = saved_file_messages[file_id]
210
 
                except KeyError:
211
 
                    default_message = ''
212
196
                item_iter = store.append([
213
197
                    file_id,
214
198
                    real_path.encode('UTF-8'),
215
199
                    enabled,
216
200
                    display_path.encode('UTF-8'),
217
201
                    change_type,
218
 
                    default_message, # Initial comment
 
202
                    '', # Initial comment
219
203
                    ])
220
204
                if self._selected and enabled:
221
205
                    initial_cursor = store.get_path(item_iter)
228
212
        # This sets the cursor, which causes the expander to close, which
229
213
        # causes the _file_message_text_view to never get realized. So we have
230
214
        # to give it a little kick, or it warns when we try to grab the focus
231
 
        self._treeview_files.set_cursor(initial_cursor, None, False)
 
215
        self._treeview_files.set_cursor(initial_cursor)
232
216
 
233
217
        def _realize_file_message_tree_view(*args):
234
218
            self._file_message_text_view.realize()
247
231
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
248
232
                                           '/org/freedesktop/NetworkManager')
249
233
            except dbus.DBusException:
250
 
                trace.mutter("networkmanager not available.")
 
234
                mutter("networkmanager not available.")
251
235
                self._check_local.show()
252
236
                return
253
237
            
259
243
            except dbus.DBusException, e:
260
244
                # Silently drop errors. While DBus may be
261
245
                # available, NetworkManager doesn't necessarily have to be
262
 
                trace.mutter("unable to get networkmanager state: %r" % e)
 
246
                mutter("unable to get networkmanager state: %r" % e)
263
247
        self._check_local.show()
264
248
 
265
249
    def _fill_in_per_file_info(self):
273
257
            self._enable_per_file_commits = True
274
258
        if not self._enable_per_file_commits:
275
259
            self._file_message_expander.hide()
276
 
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
 
260
            self._global_message_label.set_markup(_('<b>Commit Message</b>'))
277
261
 
278
262
    def _compute_delta(self):
279
263
        self._delta = self._wt.changes_from(self._basis_tree)
282
266
        """Build up the dialog widgets."""
283
267
        # The primary pane which splits it into left and right (adjustable)
284
268
        # sections.
285
 
        self._hpane = Gtk.HPaned()
 
269
        self._hpane = gtk.HPaned()
286
270
 
287
271
        self._construct_left_pane()
288
272
        self._construct_right_pane()
289
273
        self._construct_action_pane()
290
274
 
291
 
        self.get_content_area().pack_start(self._hpane, True, True, 0)
 
275
        self.vbox.pack_start(self._hpane)
292
276
        self._hpane.show()
293
277
        self.set_focus(self._global_message_text_view)
294
278
 
313
297
        self._hpane.set_position(300)
314
298
 
315
299
    def _construct_accelerators(self):
316
 
        group = Gtk.AccelGroup()
317
 
        group.connect(Gdk.keyval_from_name('N'),
318
 
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
 
300
        group = gtk.AccelGroup()
 
301
        group.connect_group(gtk.gdk.keyval_from_name('N'),
 
302
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
319
303
        self.add_accel_group(group)
320
304
 
321
 
        # ignore the escape key (avoid closing the window)
322
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
323
 
 
324
305
    def _construct_left_pane(self):
325
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
306
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
326
307
        self._construct_file_list()
327
308
        self._construct_pending_list()
328
309
 
329
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
310
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
330
311
                                            use_underline=True)
331
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
312
        self._left_pane_box.pack_end(self._check_local, False, False)
332
313
        self._check_local.set_active(False)
333
314
 
334
315
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
341
322
        # commit, and 1 for file commit, and it looked good. But I don't seem
342
323
        # to have a way to do that with the gtk boxes... :( (Which is extra
343
324
        # weird since wx uses gtk on Linux...)
344
 
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
 
325
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
345
326
        self._right_pane_table.set_row_spacings(5)
346
327
        self._right_pane_table.set_col_spacings(5)
347
328
        self._right_pane_table_row = 0
353
334
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
354
335
 
355
336
    def _construct_action_pane(self):
356
 
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
357
 
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
358
 
        self._button_cancel.show()
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)
 
337
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
362
338
        self._button_commit.connect('clicked', self._on_commit_clicked)
363
 
        self._button_commit.set_can_default(True)
 
339
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
364
340
        self._button_commit.show()
365
 
        self.get_action_area().pack_end(
366
 
            self._button_commit, True, True, 0)
 
341
        self.action_area.pack_end(self._button_commit)
367
342
        self._button_commit.grab_default()
368
343
 
369
344
    def _add_to_right_table(self, widget, weight, expanding=False):
375
350
        """
376
351
        end_row = self._right_pane_table_row + weight
377
352
        options = 0
378
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
353
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
379
354
        if expanding:
380
355
            options = expand_opts
381
356
        self._right_pane_table.attach(widget, 0, 1,
384
359
        self._right_pane_table_row = end_row
385
360
 
386
361
    def _construct_file_list(self):
387
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
388
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
362
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
363
        file_label = gtk.Label(_('Files'))
389
364
        # file_label.show()
390
 
        self._files_box.pack_start(file_label, False, True, 0)
 
365
        self._files_box.pack_start(file_label, expand=False)
391
366
 
392
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
393
 
            None, _i18n("Commit all changes"))
394
 
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
 
367
        self._commit_all_files_radio = gtk.RadioButton(
 
368
            None, _("Commit all changes"))
 
369
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
395
370
        self._commit_all_files_radio.show()
396
371
        self._commit_all_files_radio.connect('toggled',
397
372
            self._toggle_commit_selection)
398
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
399
 
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
400
 
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
 
373
        self._commit_selected_radio = gtk.RadioButton(
 
374
            self._commit_all_files_radio, _("Only commit selected changes"))
 
375
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
401
376
        self._commit_selected_radio.show()
402
377
        self._commit_selected_radio.connect('toggled',
403
378
            self._toggle_commit_selection)
404
379
        if self._pending:
405
 
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
 
380
            self._commit_all_files_radio.set_label(_('Commit all changes*'))
406
381
            self._commit_all_files_radio.set_sensitive(False)
407
382
            self._commit_selected_radio.set_sensitive(False)
408
383
 
409
 
        scroller = Gtk.ScrolledWindow()
410
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
411
 
        self._treeview_files = Gtk.TreeView()
 
384
        scroller = gtk.ScrolledWindow()
 
385
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
386
        self._treeview_files = gtk.TreeView()
412
387
        self._treeview_files.show()
413
388
        scroller.add(self._treeview_files)
414
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
389
        scroller.set_shadow_type(gtk.SHADOW_IN)
415
390
        scroller.show()
416
 
        self._files_box.pack_start(scroller, True, True, 0)
 
391
        self._files_box.pack_start(scroller,
 
392
                                   expand=True, fill=True)
417
393
        self._files_box.show()
418
 
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
394
        self._left_pane_box.pack_start(self._files_box)
419
395
 
420
396
        # Keep note that all strings stored in a ListStore must be UTF-8
421
397
        # strings. GTK does not support directly setting and restoring Unicode
422
398
        # objects.
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
 
399
        liststore = gtk.ListStore(
 
400
            gobject.TYPE_STRING,  # [0] file_id
 
401
            gobject.TYPE_STRING,  # [1] real path
 
402
            gobject.TYPE_BOOLEAN, # [2] checkbox
 
403
            gobject.TYPE_STRING,  # [3] display path
 
404
            gobject.TYPE_STRING,  # [4] changes type
 
405
            gobject.TYPE_STRING,  # [5] commit message
430
406
            )
431
407
        self._files_store = liststore
432
408
        self._treeview_files.set_model(liststore)
433
 
        crt = Gtk.CellRendererToggle()
 
409
        crt = gtk.CellRendererToggle()
434
410
        crt.set_property('activatable', not bool(self._pending))
435
411
        crt.connect("toggled", self._toggle_commit, self._files_store)
436
412
        if self._pending:
437
 
            name = _i18n('Commit*')
 
413
            name = _('Commit*')
438
414
        else:
439
 
            name = _i18n('Commit')
440
 
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
 
415
            name = _('Commit')
 
416
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
441
417
        commit_col.set_visible(False)
442
418
        self._treeview_files.append_column(commit_col)
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))
 
419
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
 
420
                                           gtk.CellRendererText(), text=3))
 
421
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
 
422
                                           gtk.CellRendererText(), text=4))
447
423
        self._treeview_files.connect('cursor-changed',
448
424
                                     self._on_treeview_files_cursor_changed)
449
425
 
464
440
                checked_col.set_visible(False)
465
441
            else:
466
442
                checked_col.set_visible(True)
467
 
            renderer = checked_col.get_cells()[0]
 
443
            renderer = checked_col.get_cell_renderers()[0]
468
444
            renderer.set_property('activatable', not all_files)
469
445
 
470
446
    def _construct_pending_list(self):
471
447
        # Pending information defaults to hidden, we put it all in 1 box, so
472
448
        # that we can show/hide all of them at once
473
 
        self._pending_box = Gtk.VBox()
 
449
        self._pending_box = gtk.VBox()
474
450
        self._pending_box.hide()
475
451
 
476
 
        pending_message = Gtk.Label()
 
452
        pending_message = gtk.Label()
477
453
        pending_message.set_markup(
478
 
            _i18n('<i>* Cannot select specific files when merging</i>'))
479
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
454
            _('<i>* Cannot select specific files when merging</i>'))
 
455
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
480
456
        pending_message.show()
481
457
 
482
 
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
483
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
458
        pending_label = gtk.Label(_('Pending Revisions'))
 
459
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
484
460
        pending_label.show()
485
461
 
486
 
        scroller = Gtk.ScrolledWindow()
487
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
488
 
        self._treeview_pending = Gtk.TreeView()
 
462
        scroller = gtk.ScrolledWindow()
 
463
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
464
        self._treeview_pending = gtk.TreeView()
489
465
        scroller.add(self._treeview_pending)
490
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
466
        scroller.set_shadow_type(gtk.SHADOW_IN)
491
467
        scroller.show()
492
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
468
        self._pending_box.pack_start(scroller,
 
469
                                     expand=True, fill=True, padding=5)
493
470
        self._treeview_pending.show()
494
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
471
        self._left_pane_box.pack_start(self._pending_box)
495
472
 
496
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
497
 
                                  GObject.TYPE_STRING, # date
498
 
                                  GObject.TYPE_STRING, # committer
499
 
                                  GObject.TYPE_STRING, # summary
 
473
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
 
474
                                  gobject.TYPE_STRING, # date
 
475
                                  gobject.TYPE_STRING, # committer
 
476
                                  gobject.TYPE_STRING, # summary
500
477
                                 )
501
478
        self._pending_store = liststore
502
479
        self._treeview_pending.set_model(liststore)
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))
 
480
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
 
481
                                             gtk.CellRendererText(), text=1))
 
482
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
 
483
                                             gtk.CellRendererText(), text=2))
 
484
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
 
485
                                             gtk.CellRendererText(), text=3))
509
486
 
510
487
    def _construct_diff_view(self):
511
 
        from bzrlib.plugins.gtk.diff import DiffView
 
488
        from diff import DiffView
512
489
 
513
490
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
514
491
        #       decide that we really don't ever want to display it, we should
515
492
        #       actually remove it, and other references to it, along with the
516
493
        #       tests that it is set properly.
517
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
494
        self._diff_label = gtk.Label(_('Diff for whole tree'))
518
495
        self._diff_label.set_alignment(0, 0)
519
496
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
520
497
        self._add_to_right_table(self._diff_label, 1, False)
525
502
        self._diff_view.show()
526
503
 
527
504
    def _construct_file_message(self):
528
 
        scroller = Gtk.ScrolledWindow()
529
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
505
        scroller = gtk.ScrolledWindow()
 
506
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
530
507
 
531
 
        self._file_message_text_view = Gtk.TextView()
 
508
        self._file_message_text_view = gtk.TextView()
532
509
        scroller.add(self._file_message_text_view)
533
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
510
        scroller.set_shadow_type(gtk.SHADOW_IN)
534
511
        scroller.show()
535
512
 
536
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
537
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
513
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
514
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
538
515
        self._file_message_text_view.set_accepts_tab(False)
539
516
        self._file_message_text_view.show()
540
517
 
541
 
        self._file_message_expander = Gtk.Expander(
542
 
            label=_i18n('File commit message'))
 
518
        self._file_message_expander = gtk.Expander(_('File commit message'))
543
519
        self._file_message_expander.set_expanded(True)
544
520
        self._file_message_expander.add(scroller)
545
521
        self._add_to_right_table(self._file_message_expander, 1, False)
546
522
        self._file_message_expander.show()
547
523
 
548
524
    def _construct_global_message(self):
549
 
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
550
 
        self._global_message_label.set_markup(
551
 
            _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>'))
552
527
        self._global_message_label.set_alignment(0, 0)
553
528
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
554
529
        self._add_to_right_table(self._global_message_label, 1, False)
555
530
        # Can we remove the spacing between the label and the box?
556
531
        self._global_message_label.show()
557
532
 
558
 
        scroller = Gtk.ScrolledWindow()
559
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
533
        scroller = gtk.ScrolledWindow()
 
534
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
560
535
 
561
 
        self._global_message_text_view = Gtk.TextView()
562
 
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
563
 
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
536
        self._global_message_text_view = gtk.TextView()
 
537
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
564
538
        scroller.add(self._global_message_text_view)
565
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
539
        scroller.set_shadow_type(gtk.SHADOW_IN)
566
540
        scroller.show()
567
541
        self._add_to_right_table(scroller, 2, True)
568
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
542
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
569
543
        self._file_message_text_view.set_accepts_tab(False)
570
544
        self._global_message_text_view.show()
571
545
 
575
549
 
576
550
        if selection is not None:
577
551
            path, display_path = model.get(selection, 1, 3)
578
 
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
 
552
            self._diff_label.set_text(_('Diff for ') + display_path)
579
553
            if path is None:
580
554
                self._diff_view.show_diff(None)
581
555
            else:
596
570
            # We have either made it to the end of the list, or nothing was
597
571
            # selected. Either way, select All Files, and jump to the global
598
572
            # commit message.
599
 
            self._treeview_files.set_cursor(
600
 
                Gtk.TreePath(path=0), None, False)
 
573
            self._treeview_files.set_cursor((0,))
601
574
            self._global_message_text_view.grab_focus()
602
575
        else:
603
576
            # Set the cursor to this entry, and jump to the per-file commit
604
577
            # message
605
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
578
            self._treeview_files.set_cursor(model.get_path(next))
606
579
            self._file_message_text_view.grab_focus()
607
580
 
608
581
    def _save_current_file_message(self):
610
583
            return # Nothing to save
611
584
        text_buffer = self._file_message_text_view.get_buffer()
612
585
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
 
                                        text_buffer.get_end_iter(), True)
 
586
                                        text_buffer.get_end_iter())
614
587
        last_selected = self._files_store.get_iter(self._last_selected_file)
615
588
        self._files_store.set_value(last_selected, 5, cur_text)
616
589
 
623
596
        text_buffer = self._file_message_text_view.get_buffer()
624
597
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
598
        if file_id is None: # Whole tree
626
 
            self._file_message_expander.set_label(_i18n('File commit message'))
 
599
            self._file_message_expander.set_label(_('File commit message'))
627
600
            self._file_message_expander.set_expanded(False)
628
601
            self._file_message_expander.set_sensitive(False)
629
602
            text_buffer.set_text('')
630
603
            self._last_selected_file = None
631
604
        else:
632
 
            self._file_message_expander.set_label(_i18n('Commit message for ')
 
605
            self._file_message_expander.set_label(_('Commit message for ')
633
606
                                                  + display_path)
634
607
            self._file_message_expander.set_expanded(True)
635
608
            self._file_message_expander.set_sensitive(True)
652
625
            if self._commit_all_changes or record[2]:# [2] checkbox
653
626
                file_id = record[0] # [0] file_id
654
627
                path = record[1]    # [1] real path
655
 
                # [5] commit message
656
 
                file_message = _sanitize_and_decode_message(record[5])
 
628
                file_message = record[5] # [5] commit message
657
629
                files.append(path.decode('UTF-8'))
658
630
                if self._enable_per_file_commits and file_message:
659
631
                    # All of this needs to be utf-8 information
660
 
                    file_message = file_message.encode('UTF-8')
661
632
                    file_info.append({'path':path, 'file_id':file_id,
662
633
                                     'message':file_message})
663
634
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
667
638
            return files, []
668
639
 
669
640
    @show_bzr_error
670
 
    def _on_cancel_clicked(self, button):
671
 
        """ Cancel button clicked handler. """
672
 
        self._do_cancel()
673
 
 
674
 
    @show_bzr_error
675
 
    def _on_delete_window(self, source, event):
676
 
        """ Delete window handler. """
677
 
        self._do_cancel()
678
 
 
679
 
    def _do_cancel(self):
680
 
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
681
 
        mgr = SavedCommitMessagesManager()
682
 
        self._saved_commit_messages_manager = mgr
683
 
        mgr.insert(self._get_global_commit_message(),
684
 
                   self._get_specific_files()[1])
685
 
        if mgr.is_not_empty(): # maybe worth saving
686
 
            response = self._question_dialog(
687
 
                _i18n('Commit cancelled'),
688
 
                _i18n('Do you want to save your commit messages ?'),
689
 
                parent=self)
690
 
            if response == Gtk.ResponseType.NO:
691
 
                 # save nothing and destroy old comments if any
692
 
                mgr = SavedCommitMessagesManager()
693
 
        mgr.save(self._wt, self._wt.branch)
694
 
        self.response(Gtk.ResponseType.CANCEL) # close window
695
 
 
696
 
    @show_bzr_error
697
641
    def _on_commit_clicked(self, button):
698
642
        """ Commit button clicked handler. """
699
643
        self._do_commit()
703
647
 
704
648
        if message == '':
705
649
            response = self._question_dialog(
706
 
                _i18n('Commit with an empty message?'),
707
 
                _i18n('You can describe your commit intent in the message.'),
708
 
                parent=self)
709
 
            if response == Gtk.ResponseType.NO:
 
650
                            _('Commit with an empty message?'),
 
651
                            _('You can describe your commit intent in the message.'))
 
652
            if response == gtk.RESPONSE_NO:
710
653
                # Kindly give focus to message area
711
654
                self._global_message_text_view.grab_focus()
712
655
                return
724
667
        #       files at this point.
725
668
        for path in self._wt.unknowns():
726
669
            response = self._question_dialog(
727
 
                _i18n("Commit with unknowns?"),
728
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
729
 
                parent=self)
730
 
                # Doesn't set a parent for the dialog..
731
 
            if response == Gtk.ResponseType.NO:
 
670
                _("Commit with unknowns?"),
 
671
                _("Unknown files exist in the working tree. Commit anyway?"))
 
672
            if response == gtk.RESPONSE_NO:
732
673
                return
733
674
            break
734
675
 
745
686
                       revprops=revprops)
746
687
        except errors.PointlessCommit:
747
688
            response = self._question_dialog(
748
 
                _i18n('Commit with no changes?'),
749
 
                _i18n('There are no changes in the working tree.'
750
 
                      ' Do you want to commit anyway?'),
751
 
                parent=self)
752
 
            if response == Gtk.ResponseType.YES:
 
689
                                _('Commit with no changes?'),
 
690
                                _('There are no changes in the working tree.'
 
691
                                  ' Do you want to commit anyway?'))
 
692
            if response == gtk.RESPONSE_YES:
753
693
                rev_id = self._wt.commit(message,
754
694
                               allow_pointless=True,
755
695
                               strict=False,
757
697
                               specific_files=specific_files,
758
698
                               revprops=revprops)
759
699
        self.committed_revision_id = rev_id
760
 
        # destroy old comments if any
761
 
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
762
 
        self.response(Gtk.ResponseType.OK)
 
700
        self.response(gtk.RESPONSE_OK)
763
701
 
764
702
    def _get_global_commit_message(self):
765
703
        buf = self._global_message_text_view.get_buffer()
766
704
        start, end = buf.get_bounds()
767
 
        text = buf.get_text(start, end, True)
768
 
        return _sanitize_and_decode_message(text)
 
705
        return buf.get_text(start, end).decode('utf-8')
769
706
 
770
707
    def _set_global_commit_message(self, message):
771
708
        """Just a helper for the test suite."""
792
729
                                       show_offset=False)
793
730
        rev_dict['revision_id'] = rev.revision_id
794
731
        return rev_dict
795