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

  • Committer: Curtis Hovey
  • Date: 2011-07-31 15:52:43 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731155243-ln8istmxbryhb4pz
Mechanical changes made by pygi.convert.sh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mergedirective.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
 
17
23
from gi.repository import Gtk
18
24
 
19
25
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
45
51
 
46
52
    def _create(self):
47
53
        table = Gtk.Table(rows=3, columns=2)
48
 
        self.get_content_area().add(table)
 
54
        self.vbox.add(table)
49
55
 
50
56
        label = Gtk.Label()
51
57
        label.set_markup("<b>Branch to Submit:</b>")
61
67
        self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
62
68
        table.attach(self.submit_branch, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
63
69
 
64
 
        # TODO: Display number of revisions to be sent whenever 
 
70
        # TODO: Display number of revisions to be send whenever 
65
71
        # submit branch changes
66
72
 
67
73
        label = Gtk.Label()
68
74
        label.set_markup("<b>Email To:</b>")
69
75
        table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
70
76
 
71
 
        self.mail_to = Gtk.ComboBox.new_with_entry()
 
77
        self.mail_to = Gtk.ComboBoxEntry()
72
78
        mail_to = self.branch.get_config().get_user_option('submit_to')
73
79
        if mail_to is None:
74
80
            submit_branch = self.submit_branch.get_branch()