/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: rodney.dawes at canonical
  • Date: 2008-10-25 06:02:09 UTC
  • Revision ID: rodney.dawes@canonical.com-20081025060209-irlizouino63cs1m
        * preferences/__init__.py:
        Remove the dialog separator
        Remove useless extra call to self._create_pages()
        Make the default window size smaller
        Set the default border width on various widgets
        Set the current notebook page to the first one

        * preferences/identity.py:
        Set various border widths appropriately
        Align the labels to the left
        Remove the unneeded bold markup from the labels
        Change the "User Id" label to "E-Mail"
        Align the radio group labels to the top of the groups

        * preferences/plugins.py:
        Set various border widths appropriately
        Set the default paned position to something more sensible
        Set the shadow type on the treeview's scrolled window to in
        Align the Author and Version labels to the left

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