Rev 457: Split identity settings out of main preferences window. in file:///data/jelmer/bzr-gtk/preferences/

Jelmer Vernooij jelmer at samba.org
Fri Mar 28 19:39:36 GMT 2008


At file:///data/jelmer/bzr-gtk/preferences/

------------------------------------------------------------
revno: 457
revision-id: jelmer at samba.org-20080328193935-ih23kvdwk3w0adp5
parent: jelmer at samba.org-20080328193027-gs7n8tsbwv31nmry
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: preferences
timestamp: Fri 2008-03-28 20:39:35 +0100
message:
  Split identity settings out of main preferences window.
added:
  preferences/identity.py        identity.py-20080328193928-kkgn1xjgrkadu2ch-1
modified:
  preferences/__init__.py        preferences.py-20070313153956-vcdqjrfal0wuk0vb-1
=== modified file 'preferences/__init__.py'
--- a/preferences/__init__.py	2008-03-28 19:30:27 +0000
+++ b/preferences/__init__.py	2008-03-28 19:39:35 +0000
@@ -23,6 +23,7 @@
 import gtk
 
 from bzrlib.config import GlobalConfig
+from identity import IdentityPage
 from plugins import PluginsPage
 
 class PreferencesWindow(gtk.Dialog):
@@ -40,80 +41,21 @@
         if self.config is None:
             self.config = GlobalConfig()
         self._create()
-
-    def _create_mainpage(self):
-        table = gtk.Table(rows=4, columns=2)
-        table.set_row_spacings(6)
-        table.set_col_spacings(6)
-
-        align = gtk.Alignment(1.0, 0.5)
-        label = gtk.Label()
-        label.set_markup("<b>User Id:</b>")
-        align.add(label)
-        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
-
-        self.username = gtk.Entry()
-        self.username.set_text(self.config.username())
-        table.attach(self.username, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
-
-        align = gtk.Alignment(1.0, 0.5)
-        label = gtk.Label()
-        label.set_markup("<b>GPG signing command:</b>")
-        align.add(label)
-        table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
-
-        self.email = gtk.Entry()
-        self.email.set_text(self.config.gpg_signing_command())
-        table.attach(self.email, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
-
-        align = gtk.Alignment(1.0, 0.5)
-        label = gtk.Label()
-        label.set_markup("<b>Check GPG Signatures:</b>")
-        align.add(label)
-        table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
-
-        sigvals = gtk.VBox()
-        self.check_sigs_if_possible = gtk.RadioButton(None, 
-                                                      "_Check if possible")
-        sigvals.pack_start(self.check_sigs_if_possible)
-        self.check_sigs_always = gtk.RadioButton(self.check_sigs_if_possible, 
-                                                 "Check _always")
-        sigvals.pack_start(self.check_sigs_always)
-        self.check_sigs_never = gtk.RadioButton(self.check_sigs_if_possible,
-                                                "Check _never")
-        sigvals.pack_start(self.check_sigs_never)
-        # FIXME: Set default
-        table.attach(sigvals, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
-
-        align = gtk.Alignment(1.0, 0.5)
-        label = gtk.Label()
-        label.set_markup("<b>Create GPG Signatures:</b>")
-        align.add(label)
-        table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
-
-        create_sigs = gtk.VBox()
-        self.create_sigs_when_required = gtk.RadioButton(None, 
-                                                         "Sign When _Required")
-        create_sigs.pack_start(self.create_sigs_when_required)
-        self.create_sigs_always = gtk.RadioButton(
-            self.create_sigs_when_required, "Sign _Always")
-        create_sigs.pack_start(self.create_sigs_always)
-        self.create_sigs_never = gtk.RadioButton(
-            self.create_sigs_when_required, "Sign _Never")
-        create_sigs.pack_start(self.create_sigs_never)
-        # FIXME: Set default
-        table.attach(create_sigs, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
-
-        return table
+        self._create_pages()
+
 
     def _create(self):
         self.set_default_size(600, 600)
         notebook = gtk.Notebook()
-        notebook.insert_page(self._create_mainpage(), gtk.Label("Main"))
-        notebook.insert_page(PluginsPage(), gtk.Label("Plugins"))
+        for (label, page) in self._create_pages():
+            notebook.insert_page(page, gtk.Label(label))
         self.vbox.pack_start(notebook, True, True)
         self.vbox.show_all()
 
+    def _create_pages(self):
+        return [("Identity", IdentityPage(self.config)), 
+                ("Plugins", PluginsPage())]
+
     def display(self):
         self.window.show_all()
 

=== added file 'preferences/identity.py'
--- a/preferences/identity.py	1970-01-01 00:00:00 +0000
+++ b/preferences/identity.py	2008-03-28 19:39:35 +0000
@@ -0,0 +1,88 @@
+# Copyright (C) 2007-2008 Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+try:
+    import pygtk
+    pygtk.require("2.0")
+except:
+    pass
+
+import gtk
+
+class IdentityPage(gtk.Table):
+    def __init__(self, config):
+        self.config = config
+        gtk.Table.__init__(self, rows=4, columns=2)
+        self.set_row_spacings(6)
+        self.set_col_spacings(6)
+
+        align = gtk.Alignment(1.0, 0.5)
+        label = gtk.Label()
+        label.set_markup("<b>User Id:</b>")
+        align.add(label)
+        self.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
+
+        self.username = gtk.Entry()
+        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)
+        label = gtk.Label()
+        label.set_markup("<b>GPG signing command:</b>")
+        align.add(label)
+        self.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
+
+        self.email = gtk.Entry()
+        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)
+        label = gtk.Label()
+        label.set_markup("<b>Check GPG Signatures:</b>")
+        align.add(label)
+        self.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
+
+        sigvals = gtk.VBox()
+        self.check_sigs_if_possible = gtk.RadioButton(None, 
+                                                      "_Check if possible")
+        sigvals.pack_start(self.check_sigs_if_possible)
+        self.check_sigs_always = gtk.RadioButton(self.check_sigs_if_possible, 
+                                                 "Check _always")
+        sigvals.pack_start(self.check_sigs_always)
+        self.check_sigs_never = gtk.RadioButton(self.check_sigs_if_possible,
+                                                "Check _never")
+        sigvals.pack_start(self.check_sigs_never)
+        # FIXME: Set default
+        self.attach(sigvals, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
+
+        align = gtk.Alignment(1.0, 0.5)
+        label = gtk.Label()
+        label.set_markup("<b>Create GPG Signatures:</b>")
+        align.add(label)
+        self.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
+
+        create_sigs = gtk.VBox()
+        self.create_sigs_when_required = gtk.RadioButton(None, 
+                                                         "Sign When _Required")
+        create_sigs.pack_start(self.create_sigs_when_required)
+        self.create_sigs_always = gtk.RadioButton(
+            self.create_sigs_when_required, "Sign _Always")
+        create_sigs.pack_start(self.create_sigs_always)
+        self.create_sigs_never = gtk.RadioButton(
+            self.create_sigs_when_required, "Sign _Never")
+        create_sigs.pack_start(self.create_sigs_never)
+        # FIXME: Set default
+        self.attach(create_sigs, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)




More information about the bazaar-commits mailing list