/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: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

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