/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
20
20
except:
21
21
    pass
22
22
 
23
 
import gtk
 
23
from gi.repository import Gtk
24
24
 
25
25
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
26
26
 
27
 
class CreateMergeDirectiveDialog(gtk.Dialog):
 
27
class CreateMergeDirectiveDialog(Gtk.Dialog):
28
28
    def __init__(self, branch, stop_revid=None):
29
29
        super(CreateMergeDirectiveDialog, self).__init__()
30
30
        self.branch = branch
42
42
        pass
43
43
 
44
44
 
45
 
class SendMergeDirectiveDialog(gtk.Dialog):
 
45
class SendMergeDirectiveDialog(Gtk.Dialog):
46
46
    def __init__(self, branch, parent=None):
47
47
        super(SendMergeDirectiveDialog, self).__init__(parent)
48
48
        self.branch = branch
50
50
        self._create()
51
51
 
52
52
    def _create(self):
53
 
        table = gtk.Table(rows=3, columns=2)
 
53
        table = Gtk.Table(rows=3, columns=2)
54
54
        self.vbox.add(table)
55
55
 
56
 
        label = gtk.Label()
 
56
        label = Gtk.Label()
57
57
        label.set_markup("<b>Branch to Submit:</b>")
58
 
        table.attach(label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
59
 
 
60
 
        label = gtk.Label(str(self.branch))
61
 
        table.attach(label, 1, 2, 0, 1, gtk.FILL, gtk.FILL)
62
 
 
63
 
        label = gtk.Label()
 
58
        table.attach(label, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
59
 
 
60
        label = Gtk.Label(label=str(self.branch))
 
61
        table.attach(label, 1, 2, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
62
 
 
63
        label = Gtk.Label()
64
64
        label.set_markup("<b>Target Branch:</b>")
65
 
        table.attach(label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
 
65
        table.attach(label, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
66
66
 
67
67
        self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
68
 
        table.attach(self.submit_branch, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
 
68
        table.attach(self.submit_branch, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
69
69
 
70
70
        # TODO: Display number of revisions to be send whenever 
71
71
        # submit branch changes
72
72
 
73
 
        label = gtk.Label()
 
73
        label = Gtk.Label()
74
74
        label.set_markup("<b>Email To:</b>")
75
 
        table.attach(label, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
 
75
        table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
76
76
 
77
 
        self.mail_to = gtk.ComboBoxEntry()
 
77
        self.mail_to = Gtk.ComboBoxEntry()
78
78
        mail_to = self.branch.get_config().get_user_option('submit_to')
79
79
        if mail_to is None:
80
80
            submit_branch = self.submit_branch.get_branch()
83
83
                            'child_submit_to')
84
84
        if mail_to is not None:
85
85
            self.mail_to.get_child().set_text(mail_to)
86
 
        table.attach(self.mail_to, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
 
86
        table.attach(self.mail_to, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
87
87
 
88
 
        self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, 
89
 
                         gtk.STOCK_OK, gtk.RESPONSE_OK)
 
88
        self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, 
 
89
                         Gtk.STOCK_OK, Gtk.ResponseType.OK)
90
90
 
91
91
        self.show_all()
92
92
 
110
110
 
111
111
 
112
112
 
113
 
class ApplyMergeDirectiveDialog(gtk.Dialog):
 
113
class ApplyMergeDirectiveDialog(Gtk.Dialog):
114
114
    def __init__(self):
115
115
        super(ApplyMergeDirectiveDialog, self).__init__()