/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: Curtis Hovey
  • Date: 2011-08-01 14:46:23 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110801144623-ldjf0bu7kyi5bxzu
Updated commit to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
16
16
 
17
17
import re
18
18
 
 
19
from gi.repository import Gdk
19
20
from gi.repository import Gtk
20
21
from gi.repository import GObject
21
22
from gi.repository import Pango
107
108
    """Implementation of Commit."""
108
109
 
109
110
    def __init__(self, wt, selected=None, parent=None):
110
 
        GObject.GObject.__init__(self, title="Commit to %s" % wt.basedir,
 
111
        Gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
111
112
                            parent=parent, flags=0,)
112
113
        self.connect('delete-event', self._on_delete_window)
113
114
        self._question_dialog = question_dialog
121
122
        self._enable_per_file_commits = True
122
123
        self._commit_all_changes = True
123
124
        self.committed_revision_id = None # Nothing has been committed yet
124
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
 
125
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
 
126
            self._wt, self._wt.branch)
125
127
 
126
128
        self.setup_params()
127
129
        self.construct()
226
228
        # This sets the cursor, which causes the expander to close, which
227
229
        # causes the _file_message_text_view to never get realized. So we have
228
230
        # to give it a little kick, or it warns when we try to grab the focus
229
 
        self._treeview_files.set_cursor(initial_cursor)
 
231
        self._treeview_files.set_cursor(initial_cursor, None, None)
230
232
 
231
233
        def _realize_file_message_tree_view(*args):
232
234
            self._file_message_text_view.realize()
286
288
        self._construct_right_pane()
287
289
        self._construct_action_pane()
288
290
 
289
 
        self.vbox.pack_start(self._hpane, True, True, 0)
 
291
        self.get_content_area().pack_start(self._hpane, True, True, 0)
290
292
        self._hpane.show()
291
293
        self.set_focus(self._global_message_text_view)
292
294
 
312
314
 
313
315
    def _construct_accelerators(self):
314
316
        group = Gtk.AccelGroup()
315
 
        group.connect_group(Gdk.keyval_from_name('N'),
316
 
                            Gdk.EventMask.CONTROL_MASK, 0, self._on_accel_next)
 
317
        group.connect(Gdk.keyval_from_name('N'),
 
318
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
317
319
        self.add_accel_group(group)
318
320
 
319
321
        # ignore the escape key (avoid closing the window)
326
328
 
327
329
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
328
330
                                            use_underline=True)
329
 
        self._left_pane_box.pack_end(self._check_local, False, False)
 
331
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
330
332
        self._check_local.set_active(False)
331
333
 
332
334
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
354
356
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
355
357
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
356
358
        self._button_cancel.show()
357
 
        self.action_area.pack_end(self._button_cancel)
 
359
        self.get_action_area().pack_end(
 
360
            self._button_cancel, True, True, 0)
358
361
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
359
362
        self._button_commit.connect('clicked', self._on_commit_clicked)
360
363
        self._button_commit.set_can_default(True)
361
364
        self._button_commit.show()
362
 
        self.action_area.pack_end(self._button_commit)
 
365
        self.get_action_area().pack_end(
 
366
            self._button_commit, True, True, 0)
363
367
        self._button_commit.grab_default()
364
368
 
365
369
    def _add_to_right_table(self, widget, weight, expanding=False):
409
413
        scroller.add(self._treeview_files)
410
414
        scroller.set_shadow_type(Gtk.ShadowType.IN)
411
415
        scroller.show()
412
 
        self._files_box.pack_start(scroller,
413
 
                                   expand=True, fill=True)
 
416
        self._files_box.pack_start(scroller, True, True, 0)
414
417
        self._files_box.show()
415
418
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
416
419
 
473
476
        pending_message = Gtk.Label()
474
477
        pending_message.set_markup(
475
478
            _i18n('<i>* Cannot select specific files when merging</i>'))
476
 
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
 
479
        self._pending_box.pack_start(pending_message, False, True, 5)
477
480
        pending_message.show()
478
481
 
479
482
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
 
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
 
483
        self._pending_box.pack_start(pending_label, False, True, 0)
481
484
        pending_label.show()
482
485
 
483
486
        scroller = Gtk.ScrolledWindow()
486
489
        scroller.add(self._treeview_pending)
487
490
        scroller.set_shadow_type(Gtk.ShadowType.IN)
488
491
        scroller.show()
489
 
        self._pending_box.pack_start(scroller,
490
 
                                     expand=True, fill=True, padding=5)
 
492
        self._pending_box.pack_start(scroller, True, True, 5)
491
493
        self._treeview_pending.show()
492
494
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
493
495
 
536
538
        self._file_message_text_view.set_accepts_tab(False)
537
539
        self._file_message_text_view.show()
538
540
 
539
 
        self._file_message_expander = Gtk.Expander(_i18n('File commit message'))
 
541
        self._file_message_expander = Gtk.Expander(
 
542
            label=_i18n('File commit message'))
540
543
        self._file_message_expander.set_expanded(True)
541
544
        self._file_message_expander.add(scroller)
542
545
        self._add_to_right_table(self._file_message_expander, 1, False)
606
609
            return # Nothing to save
607
610
        text_buffer = self._file_message_text_view.get_buffer()
608
611
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
609
 
                                        text_buffer.get_end_iter())
 
612
                                        text_buffer.get_end_iter(), True)
610
613
        last_selected = self._files_store.get_iter(self._last_selected_file)
611
614
        self._files_store.set_value(last_selected, 5, cur_text)
612
615
 
760
763
    def _get_global_commit_message(self):
761
764
        buf = self._global_message_text_view.get_buffer()
762
765
        start, end = buf.get_bounds()
763
 
        text = buf.get_text(start, end)
 
766
        text = buf.get_text(start, end, True)
764
767
        return _sanitize_and_decode_message(text)
765
768
 
766
769
    def _set_global_commit_message(self, message):