/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-02-18 13:01:03 UTC
  • Revision ID: jelmer@samba.org-20110218130103-fiyk203auk28thpn
Remove some unused imports, fix some formatting.

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