/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 merge.py

  • Committer: Curtis Hovey
  • Date: 2011-08-13 01:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110813011220-qj1u0dvft7jk0x6m
Updated gpush to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
37
37
    
38
38
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
39
39
        """ Initialize the Merge dialog. """
40
 
        Gtk.Dialog.__init__(self, title="Merge changes",
 
40
        GObject.GObject.__init__(self, title="Merge changes",
41
41
                                  parent=parent,
42
42
                                  flags=0,
43
43
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
63
63
        self._button_merge.connect('clicked', self._on_merge_clicked)
64
64
        
65
65
        # Add widgets to dialog
66
 
        self.get_content_area().pack_start(self._hbox, False, False, 0)
 
66
        self.vbox.pack_start(self._hbox, False, False, 0)
67
67
        self._hbox.add(self._label_merge_from)
68
68
        self._hbox.add(self._combo_source)
69
69
        self._hbox.set_spacing(5)
78
78
        else:
79
79
            # If no default_branch_path give, default to folder source with current folder
80
80
            self._combo_source.set_active(0)
81
 
        self.get_content_area().show_all()
 
81
        self.vbox.show_all()
82
82
    
83
83
    def _on_folder_source(self):
84
84
        """ Merge from folder, create a filechooser dialog and button """
96
96
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
97
97
        self._filechooser_dialog.set_current_folder(directory)
98
98
        self._source.pack_start(self._filechooser, True, True, 0)
99
 
        self.get_content_area().pack_start(self._source, True, True, 5)
 
99
        self.vbox.pack_start(self._source, True, True, 5)
100
100
        self._source.show()
101
101
    
102
102
    def _on_custom_source(self):
108
108
        self._custom_entry.connect("activate", self._on_merge_clicked)
109
109
        self._custom_entry.show()
110
110
        self._source.pack_start(self._custom_entry, True, True, 0)
111
 
        self.get_content_area().pack_start(self._source, True, True, 5)
 
111
        self.vbox.pack_start(self._source, True, True, 5)
112
112
        self._source.show()
113
113
    
114
114
    def _on_combo_changed(self, widget):