The attached patch contains the HIG improvements from Rodney. It looks
fine to me. Could somebody else please also review it?
Cheers,
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# irlizouino63cs1m
# target_branch: lp:bzr-gtk
# testament_sha1: 50569bd37a0c0492aff8d2f5c005b1695750a195
# timestamp: 2008-10-28 03:29:36 +0100
# source_branch: lp:~dobey/bzr-gtk/hig-prefs
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'preferences/__init__.py'
--- preferences/__init__.py 2008-03-28 19:39:35 +0000
+++ preferences/__init__.py 2008-10-25 06:02:09 +0000
@@ -37,20 +37,26 @@
""" Initialize the Status window. """
super(PreferencesWindow, self).__init__(flags=gtk.DIALOG_MODAL)
self.set_title("Bazaar Preferences")
+ self.set_has_separator(False)
self.config = config
if self.config is None:
self.config = GlobalConfig()
self._create()
- self._create_pages()
-
def _create(self):
- self.set_default_size(600, 600)
+ self.set_default_size(320, 480)
+ self.set_border_width(0)
+
notebook = gtk.Notebook()
+ notebook.set_border_width(12)
for (label, page) in self._create_pages():
- notebook.insert_page(page, gtk.Label(label))
+ notebook.append_page(page, gtk.Label(label))
+
+ notebook.set_current_page(0)
+ self.vbox.set_border_width(0)
self.vbox.pack_start(notebook, True, True)
self.vbox.show_all()
+ self.action_area.set_border_width(12)
def _create_pages(self):
return [("Identity", IdentityPage(self.config)),
=== modified file 'preferences/identity.py'
--- preferences/identity.py 2008-03-28 19:39:35 +0000
+++ preferences/identity.py 2008-10-25 06:02:09 +0000
@@ -26,12 +26,13 @@
def __init__(self, config):
self.config = config
gtk.Table.__init__(self, rows=4, columns=2)
+ self.set_border_width(12)
self.set_row_spacings(6)
self.set_col_spacings(6)
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.5)
label = gtk.Label()
- label.set_markup("<b>User Id:</b>")
+ label.set_markup("E-Mail:")
align.add(label)
self.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
@@ -39,9 +40,9 @@
self.username.set_text(self.config.username())
self.attach(self.username, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.5)
label = gtk.Label()
- label.set_markup("<b>GPG signing command:</b>")
+ label.set_markup("GPG signing command:")
align.add(label)
self.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
@@ -49,9 +50,9 @@
self.email.set_text(self.config.gpg_signing_command())
self.attach(self.email, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.1)
label = gtk.Label()
- label.set_markup("<b>Check GPG Signatures:</b>")
+ label.set_markup("Check GPG Signatures:")
align.add(label)
self.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
@@ -68,9 +69,9 @@
# FIXME: Set default
self.attach(sigvals, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.1)
label = gtk.Label()
- label.set_markup("<b>Create GPG Signatures:</b>")
+ label.set_markup("Create GPG Signatures:")
align.add(label)
self.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
=== modified file 'preferences/plugins.py'
--- preferences/plugins.py 2008-07-21 13:50:35 +0000
+++ preferences/plugins.py 2008-10-25 06:02:09 +0000
@@ -25,14 +25,19 @@
class PluginsPage(gtk.VPaned):
def __init__(self):
gtk.VPaned.__init__(self)
+ self.set_border_width(12)
+ self.set_position(216)
+
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ scrolledwindow.set_shadow_type(gtk.SHADOW_IN)
self.model = gtk.ListStore(str, str)
treeview = gtk.TreeView()
scrolledwindow.add(treeview)
self.pack1(scrolledwindow, resize=True, shrink=False)
self.table = gtk.Table(columns=2)
+ self.table.set_border_width(12)
self.table.set_row_spacings(6)
self.table.set_col_spacings(6)
@@ -74,7 +79,7 @@
self.table.remove(w)
if getattr(p, '__author__', None) is not None:
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.5)
label = gtk.Label()
label.set_markup("<b>Author:</b>")
align.add(label)
@@ -90,7 +95,7 @@
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
if getattr(p, '__version__', None) is not None:
- align = gtk.Alignment(1.0, 0.5)
+ align = gtk.Alignment(0.0, 0.5)
label = gtk.Label()
label.set_markup("<b>Version:</b>")
align.add(label)
# Begin bundle
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
bCMhdyRThQkELEs2oA==
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
