/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: 2012-03-29 13:15:14 UTC
  • mfrom: (786.1.1 register-lazy)
  • Revision ID: jelmer@samba.org-20120329131514-knrl1w2wzntx89rv
Use lazy registration.

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