/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 preferences/identity.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
preferences/identity.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
18
 
 
19
 
 
20
 
class IdentityPage(Gtk.Table):
21
 
 
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
 
24
 
 
25
class IdentityPage(gtk.Table):
22
26
    def __init__(self, config):
23
27
        self.config = config
24
 
        super(IdentityPage, self).__init__(rows=4, columns=2)
25
 
        self.set_border_width(12)
 
28
        gtk.Table.__init__(self, rows=4, columns=2)
26
29
        self.set_row_spacings(6)
27
30
        self.set_col_spacings(6)
28
31
 
29
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
30
 
        label = Gtk.Label()
31
 
        label.set_markup("E-Mail:")
 
32
        align = gtk.Alignment(1.0, 0.5)
 
33
        label = gtk.Label()
 
34
        label.set_markup("<b>User Id:</b>")
32
35
        align.add(label)
33
 
        self.attach(
34
 
            align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
36
        self.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
35
37
 
36
 
        self.username = Gtk.Entry()
 
38
        self.username = gtk.Entry()
37
39
        self.username.set_text(self.config.username())
38
 
        self.attach(
39
 
            self.username, 1, 2, 0, 1,
40
 
            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
41
 
            Gtk.AttachOptions.FILL)
 
40
        self.attach(self.username, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
42
41
 
43
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
44
 
        label = Gtk.Label()
45
 
        label.set_markup("GPG signing command:")
 
42
        align = gtk.Alignment(1.0, 0.5)
 
43
        label = gtk.Label()
 
44
        label.set_markup("<b>GPG signing command:</b>")
46
45
        align.add(label)
47
 
        self.attach(
48
 
            align, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
46
        self.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
49
47
 
50
 
        self.email = Gtk.Entry()
 
48
        self.email = gtk.Entry()
51
49
        self.email.set_text(self.config.gpg_signing_command())
52
 
        self.attach(
53
 
            self.email, 1, 2, 1, 2,
54
 
            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
55
 
            Gtk.AttachOptions.FILL)
 
50
        self.attach(self.email, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
56
51
 
57
 
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
58
 
        label = Gtk.Label()
59
 
        label.set_markup("Check GPG Signatures:")
 
52
        align = gtk.Alignment(1.0, 0.5)
 
53
        label = gtk.Label()
 
54
        label.set_markup("<b>Check GPG Signatures:</b>")
60
55
        align.add(label)
61
 
        self.attach(
62
 
            align, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
56
        self.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
63
57
 
64
 
        sigvals = Gtk.VBox()
65
 
        self.check_sigs_if_possible = Gtk.RadioButton.new_with_label(
66
 
            None, "_Check if possible")
67
 
        sigvals.pack_start(self.check_sigs_if_possible, True, True, 0)
68
 
        self.check_sigs_always = Gtk.RadioButton.new_with_label_from_widget(
69
 
            self.check_sigs_if_possible, "Check _always")
70
 
        sigvals.pack_start(self.check_sigs_always, True, True, 0)
71
 
        self.check_sigs_never = Gtk.RadioButton.new_with_label_from_widget(
72
 
            self.check_sigs_if_possible, "Check _never")
73
 
        sigvals.pack_start(self.check_sigs_never, True, True, 0)
 
58
        sigvals = gtk.VBox()
 
59
        self.check_sigs_if_possible = gtk.RadioButton(None, 
 
60
                                                      "_Check if possible")
 
61
        sigvals.pack_start(self.check_sigs_if_possible)
 
62
        self.check_sigs_always = gtk.RadioButton(self.check_sigs_if_possible, 
 
63
                                                 "Check _always")
 
64
        sigvals.pack_start(self.check_sigs_always)
 
65
        self.check_sigs_never = gtk.RadioButton(self.check_sigs_if_possible,
 
66
                                                "Check _never")
 
67
        sigvals.pack_start(self.check_sigs_never)
74
68
        # FIXME: Set default
75
 
        self.attach(
76
 
            sigvals, 1, 2, 2, 3,
77
 
            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
78
 
            Gtk.AttachOptions.FILL)
 
69
        self.attach(sigvals, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
79
70
 
80
 
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
81
 
        label = Gtk.Label()
82
 
        label.set_markup("Create GPG Signatures:")
 
71
        align = gtk.Alignment(1.0, 0.5)
 
72
        label = gtk.Label()
 
73
        label.set_markup("<b>Create GPG Signatures:</b>")
83
74
        align.add(label)
84
 
        self.attach(
85
 
            align, 0, 1, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
75
        self.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
86
76
 
87
 
        create_sigs = Gtk.VBox()
88
 
        self.create_sigs_when_required = Gtk.RadioButton.new_with_label(
89
 
            None, "Sign When _Required")
90
 
        create_sigs.pack_start(self.create_sigs_when_required, True, True, 0)
91
 
        self.create_sigs_always = Gtk.RadioButton.new_with_label_from_widget(
 
77
        create_sigs = gtk.VBox()
 
78
        self.create_sigs_when_required = gtk.RadioButton(None, 
 
79
                                                         "Sign When _Required")
 
80
        create_sigs.pack_start(self.create_sigs_when_required)
 
81
        self.create_sigs_always = gtk.RadioButton(
92
82
            self.create_sigs_when_required, "Sign _Always")
93
 
        create_sigs.pack_start(self.create_sigs_always, True, True, 0)
94
 
        self.create_sigs_never = Gtk.RadioButton.new_with_label_from_widget(
 
83
        create_sigs.pack_start(self.create_sigs_always)
 
84
        self.create_sigs_never = gtk.RadioButton(
95
85
            self.create_sigs_when_required, "Sign _Never")
96
 
        create_sigs.pack_start(self.create_sigs_never, True, True, 0)
 
86
        create_sigs.pack_start(self.create_sigs_never)
97
87
        # FIXME: Set default
98
 
        self.attach(
99
 
            create_sigs, 1, 2, 3, 4,
100
 
            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
101
 
            Gtk.AttachOptions.FILL)
 
88
        self.attach(create_sigs, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)