New headers

svn: r710
2002-01-20 23:11:18 +00:00
parent 6986de8394
commit cf8c6ef314
16 changed files with 398 additions and 3144 deletions
--- a/src/Config.py
+++ b/src/Config.py
@@ -36,6 +36,7 @@ import PaperMenu
 #-------------------------------------------------------------------------
 import GTK
 import gtk
+import gnome.ui
 import libglade
 from gnome.config import get_string, get_bool, get_int, set_string, sync, set_bool, set_int

@@ -463,7 +464,11 @@ def save_config_color(name,color):
 #-------------------------------------------------------------------------

 def get_config_text(panel,key):
-    return get_string("/gramps/%s/%s" % (panel,key))
+    val = get_string("/gramps/%s/%s" % (panel,key))
+    if val:
+        return val
+    else:
+        return ""

 def get_config_bool(panel,key):
    return get_bool("/gramps/%s/%s" % (panel,key))
@@ -506,17 +511,25 @@ class ConfigEntry(ConfigWidget):

 class ConfigInt(ConfigWidget):

+    def set_range(self,lower,upper):
+        self.lower = lower
+        self.upper = upper
+        
    def get_widgets(self):
        l = gtk.GtkLabel(self.l)
        l.show()
        self.w = gtk.GtkSpinButton(digits=0)
        self.w.show()
        
-        val = get_int(self.tag)
+        val = get_string(self.tag)
        if val == None:
-            self.w.set_value(int(self.d))
+            val = int(self.d)
        else:
-            self.w.set_value(val)
+            val = int(val)
+
+        adj = gtk.GtkAdjustment(val,self.lower,self.upper,1,1,1)
+        
+        self.w.set_adjustment(adj)
        return [l,self.w]

    def set(self):
@@ -539,11 +552,37 @@ class ConfigCheckbox(ConfigWidget):
        val = self.w.get_active()
        set_bool(self.tag,val)
        
+
+class ConfigFile(ConfigWidget):
+
+    def get_widgets(self):
+        self.w = gnome.ui.GnomeFileEntry(self.tag)
+        lbl = gtk.GtkLabel(self.l)
+        self.w.show()
+        lbl.show()
+        val = get_string(self.tag)
+        self.w.set_title("%s -- GRAMPS" % (self.l))
+        if val == None:
+            self.w.gtk_entry().set_text(self.d)
+        else:
+            self.w.gtk_entry().set_text(val)
+        return [lbl,self.w]
+
+    def set(self):
+        val = self.w.get_full_path(0)
+        set_string(self.tag,val)
+        
+
 def add_text(category,panel,frame,config_tag,label,default):
    ext_items.append(category,panel,frame,ConfigEntry(panel,config_tag,label,default))

-def add_int(category,panel,frame,config_tag,label,default):
-    ext_items.append(category,panel,frame,ConfigInt(panel,config_tag,label,default))
+def add_file_entry(category,panel,frame,config_tag,label,default):
+    ext_items.append(category,panel,frame,ConfigFile(panel,config_tag,label,default))
+
+def add_int(category,panel,frame,config_tag,label,default,range=(0,100)):
+    cfgint = ConfigInt(panel,config_tag,label,default)
+    cfgint.set_range(range[0],range[1])
+    ext_items.append(category,panel,frame,cfgint)

 def add_checkbox(category,panel,frame,config_tag,label,default):
    ext_items.append(category,panel,frame,ConfigCheckbox(panel,config_tag,label,default))
--- a/src/EditPerson.glade
+++ b/src/EditPerson.glade
@@ -21,7 +21,7 @@
    <handler>on_delete_event</handler>
    <last_modification_time>Fri, 03 Aug 2001 01:42:42 GMT</last_modification_time>
  </signal>
-  <title>Gramps - Edit Person</title>
+  <title>Edit Person - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -286,36 +286,6 @@
 		</child>
 	      </widget>

-	      <widget>
-		<class>GtkButton</class>
-		<name>button99</name>
-		<border_width>1</border_width>
-		<tooltip>Invoke birth event editor</tooltip>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>on_edit_birth_clicked</handler>
-		  <object>editPerson</object>
-		  <last_modification_time>Tue, 02 Oct 2001 22:28:32 GMT</last_modification_time>
-		</signal>
-		<label>Edit</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<child>
-		  <left_attach>2</left_attach>
-		  <right_attach>3</right_attach>
-		  <top_attach>2</top_attach>
-		  <bottom_attach>3</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>False</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
 	      <widget>
 		<class>GtkCombo</class>
 		<name>bpcombo</name>
@@ -382,6 +352,36 @@
 		  <yfill>False</yfill>
 		</child>
 	      </widget>
+
+	      <widget>
+		<class>GtkButton</class>
+		<name>button99</name>
+		<border_width>1</border_width>
+		<tooltip>Invoke birth event editor</tooltip>
+		<can_focus>True</can_focus>
+		<signal>
+		  <name>clicked</name>
+		  <handler>on_edit_birth_clicked</handler>
+		  <object>editPerson</object>
+		  <last_modification_time>Tue, 02 Oct 2001 22:28:32 GMT</last_modification_time>
+		</signal>
+		<label>Edit</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>3</right_attach>
+		  <top_attach>2</top_attach>
+		  <bottom_attach>3</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>False</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
 	    </widget>
 	  </widget>

@@ -544,36 +544,6 @@
 		</child>
 	      </widget>

-	      <widget>
-		<class>GtkButton</class>
-		<name>button126</name>
-		<border_width>1</border_width>
-		<tooltip>Invoke death event editor</tooltip>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>on_edit_death_clicked</handler>
-		  <object>editPerson</object>
-		  <last_modification_time>Tue, 02 Oct 2001 22:28:47 GMT</last_modification_time>
-		</signal>
-		<label>Edit</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-		<child>
-		  <left_attach>2</left_attach>
-		  <right_attach>3</right_attach>
-		  <top_attach>2</top_attach>
-		  <bottom_attach>3</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>False</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
 	      <widget>
 		<class>GtkCombo</class>
 		<name>dpcombo</name>
@@ -615,6 +585,36 @@
 		  <text></text>
 		</widget>
 	      </widget>
+
+	      <widget>
+		<class>GtkButton</class>
+		<name>button126</name>
+		<border_width>1</border_width>
+		<tooltip>Invoke death event editor</tooltip>
+		<can_focus>True</can_focus>
+		<signal>
+		  <name>clicked</name>
+		  <handler>on_edit_death_clicked</handler>
+		  <object>editPerson</object>
+		  <last_modification_time>Tue, 02 Oct 2001 22:28:47 GMT</last_modification_time>
+		</signal>
+		<label>Edit</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>3</right_attach>
+		  <top_attach>2</top_attach>
+		  <bottom_attach>3</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>False</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
 	    </widget>
 	  </widget>

@@ -5318,7 +5318,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>name_edit</name>
-  <title>Gramps - Alternate Name Editor</title>
+  <title>Alternate Name Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -5732,7 +5732,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>addr_edit</name>
-  <title>Gramps - Address Editor</title>
+  <title>Address Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -6308,7 +6308,7 @@ French
 <widget>
  <class>GnomeDialog</class>
  <name>url_edit</name>
-  <title>Gramps - Internet Address Editor</title>
+  <title>Internet Address Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/bookmarks.glade
+++ b/src/bookmarks.glade
@@ -15,7 +15,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>top</name>
-  <title>Gramps - Edit Bookmarks</title>
+  <title>Edit Bookmarks - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/config.glade
+++ b/src/config.glade
--- a/src/dialog.glade
+++ b/src/dialog.glade
@@ -15,7 +15,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>event_edit</name>
-  <title>Gramps - Event Editor</title>
+  <title>Event Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -581,7 +581,7 @@ French
 <widget>
  <class>GnomeDialog</class>
  <name>attr_edit</name>
-  <title>Gramps - Attribute Editor</title>
+  <title>Attribute Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -943,7 +943,7 @@ French
 <widget>
  <class>GnomeDialog</class>
  <name>loc_edit</name>
-  <title>Gramps - Event Editor</title>
+  <title>Event Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/editnote.glade
+++ b/src/editnote.glade
@@ -15,7 +15,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>editnote</name>
-  <title>Gramps - Edit Note</title>
+  <title>Edit Note - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/find.glade
+++ b/src/find.glade
@@ -17,7 +17,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>find</name>
-  <title>Gramps - Find Person</title>
+  <title>Find Person - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -32,7 +32,7 @@
    <handler>on_gramps_configure_event</handler>
    <last_modification_time>Sat, 25 Aug 2001 22:08:28 GMT</last_modification_time>
  </signal>
-  <title>Gramps</title>
+  <title>GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -4236,7 +4236,7 @@
  <class>GtkFileSelection</class>
  <name>fileselection</name>
  <border_width>10</border_width>
-  <title>Gramps - Select File</title>
+  <title>Select File - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -4281,7 +4281,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>spouseDialog</name>
-  <title>Gramps - Choose Spouse</title>
+  <title>Choose Spouse - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -4690,7 +4690,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>familyDialog</name>
-  <title>Gramps - Choose Parents</title>
+  <title>Choose Parents - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -5264,7 +5264,7 @@ Unknown
 <widget>
  <class>GnomeDialog</class>
  <name>selectChild</name>
-  <title>Gramps - Add Child</title>
+  <title>Add Child - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -5645,12 +5645,13 @@ Unknown
 <widget>
  <class>GnomeDialog</class>
  <name>marriageQuery</name>
-  <title>Gramps - Marriage Editor</title>
+  <width>280</width>
+  <title>Marriage Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
+  <allow_grow>True</allow_grow>
  <auto_shrink>False</auto_shrink>
  <auto_close>False</auto_close>
  <hide_on_close>False</hide_on_close>
@@ -5803,7 +5804,7 @@ Unknown
 <widget>
  <class>GnomeDialog</class>
  <name>sourceEditor</name>
-  <title>Gramps - Source Editor</title>
+  <title>Source Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -6306,7 +6307,7 @@ Unknown
 <widget>
  <class>GnomeDialog</class>
  <name>addChild</name>
-  <title>Gramps - Add New Child</title>
+  <title>Add New Child - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -6807,7 +6808,7 @@ Unknown
 <widget>
  <class>GnomeDialog</class>
  <name>addperson</name>
-  <title>Gramps - Edit Person</title>
+  <title>Edit Person - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -7137,7 +7138,7 @@ Unknown
    <handler>on_opendb_delete_event</handler>
    <last_modification_time>Mon, 24 Dec 2001 16:08:13 GMT</last_modification_time>
  </signal>
-  <title>Gramps - Open a Database</title>
+  <title>Open a Database - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -407,7 +407,7 @@ def clear_database():
    const.familyRelations = const.initialize_family_relation_list()
    
    database.new()
-    topWindow.set_title("Gramps")
+    topWindow.set_title("GRAMPS")
    active_person = None
    active_father = None
    active_family = None
@@ -567,7 +567,8 @@ def read_file(filename):
    statusbar.set_status(_("Loading %s ...") % filename)

    if load_database(filename) == 1:
-        topWindow.set_title("%s - %s" % (_("Gramps"),filename))
+        name = os.path.basename(filename[:-1])
+        topWindow.set_title("%s - %s" % (name,_("GRAMPS")))
    else:
        statusbar.set_status("")
        Config.save_last_file("")
--- a/src/imagesel.glade
+++ b/src/imagesel.glade
@@ -15,7 +15,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>imageSelect</name>
-  <title>Gramps - Select a Media Object</title>
+  <title>Select a Media Object - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -352,7 +352,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>change_description</name>
-  <title>Gramps - Change Local Media Object Properties</title>
+  <title>Change Local Media Object Properties - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -1308,7 +1308,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>change_global</name>
-  <title>Gramps - Change Global Media Object Properties</title>
+  <title>Change Global Media Object Properties - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/places.glade
+++ b/src/places.glade
@@ -17,7 +17,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>placeEditor</name>
-  <title>Gramps - Place Editor</title>
+  <title>Place Editor - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/plugins.glade
+++ b/src/plugins.glade
@@ -15,7 +15,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>pluginsel</name>
-  <title>Gramps - Plugin Selection</title>
+  <title>Tool Selection - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -231,7 +231,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>report</name>
-  <title>Gramps - Report Selection</title>
+  <title>Report Selection - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/preferences.glade
+++ b/src/preferences.glade
@@ -21,7 +21,7 @@
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
+  <allow_grow>True</allow_grow>
  <auto_shrink>False</auto_shrink>
  <auto_close>False</auto_close>
  <hide_on_close>False</hide_on_close>
@@ -196,7 +196,7 @@
 	    <class>GtkNotebook</class>
 	    <child_name>GnomePropertyBox:notebook</child_name>
 	    <name>panel</name>
-	    <width>450</width>
+	    <width>490</width>
 	    <height>350</height>
 	    <show_tabs>False</show_tabs>
 	    <show_border>False</show_border>
--- a/src/revision.glade
+++ b/src/revision.glade
@@ -17,7 +17,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>dbopen</name>
-  <title>Gramps - Open a database</title>
+  <title>Open a database - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -200,7 +200,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>revselect</name>
-  <title>Gramps - Select an older revision</title>
+  <title>Select an older revision - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -391,7 +391,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>revcom</name>
-  <title>Gramps - Revison Control Comment</title>
+  <title>Revison Control Comment - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/srcsel.glade
+++ b/src/srcsel.glade
@@ -17,7 +17,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>sourceDisplay</name>
-  <title>Gramps - Source Information</title>
+  <title>Source Information - GRAMPS</title>
  <type>GTK_WINDOW_DIALOG</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>True</modal>
@@ -640,7 +640,7 @@ Very High
 <widget>
  <class>GnomeDialog</class>
  <name>sourcesel</name>
-  <title>Gramps - Source Reference Selection</title>
+  <title>Source Reference Selection - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
--- a/src/styles.glade
+++ b/src/styles.glade
@@ -18,7 +18,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>styles</name>
-  <title>Gramps - Document Styles</title>
+  <title>Document Styles - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -256,7 +256,7 @@
 <widget>
  <class>GnomeDialog</class>
  <name>editor</name>
-  <title>Gramps - Style Editor</title>
+  <title>Style Editor - GRAMPS</title>
  <type>GTK_WINDOW_TOPLEVEL</type>
  <position>GTK_WIN_POS_NONE</position>
  <modal>False</modal>
@@ -531,75 +531,6 @@
 	      </child>
 	    </widget>

-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>bold</name>
-	      <can_focus>True</can_focus>
-	      <label>Bold</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>5</xpad>
-		<ypad>5</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>italic</name>
-	      <can_focus>True</can_focus>
-	      <label>Italic</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>4</top_attach>
-		<bottom_attach>5</bottom_attach>
-		<xpad>5</xpad>
-		<ypad>5</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>underline</name>
-	      <can_focus>True</can_focus>
-	      <label>Underline</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>5</top_attach>
-		<bottom_attach>6</bottom_attach>
-		<xpad>5</xpad>
-		<ypad>5</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label5</name>
@@ -634,8 +565,8 @@
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
 	      <child>
 		<left_attach>0</left_attach>
 		<right_attach>1</right_attach>
@@ -654,8 +585,8 @@

 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>Options</label>
+	      <name>label4</name>
+	      <label>Type Face</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -665,6 +596,29 @@
 	      <child>
 		<left_attach>0</left_attach>
 		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>bold</name>
+	      <can_focus>True</can_focus>
+	      <label>Bold</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
 		<top_attach>3</top_attach>
 		<bottom_attach>4</bottom_attach>
 		<xpad>5</xpad>
@@ -679,24 +633,47 @@
 	    </widget>

 	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>color</name>
+	      <class>GtkCheckButton</class>
+	      <name>italic</name>
 	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
+	      <label>Italic</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
 	      <child>
 		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
+		<right_attach>3</right_attach>
+		<top_attach>4</top_attach>
+		<bottom_attach>5</bottom_attach>
 		<xpad>5</xpad>
 		<ypad>5</ypad>
 		<xexpand>False</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
-		<xfill>False</xfill>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>underline</name>
+	      <can_focus>True</can_focus>
+	      <label>Underline</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
+		<top_attach>5</top_attach>
+		<bottom_attach>6</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
@@ -708,7 +685,7 @@
 	      <spacing>0</spacing>
 	      <child>
 		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
+		<right_attach>3</right_attach>
 		<top_attach>0</top_attach>
 		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
@@ -752,10 +729,33 @@
 	      </widget>
 	    </widget>

+	    <widget>
+	      <class>GnomeColorPicker</class>
+	      <name>color</name>
+	      <can_focus>True</can_focus>
+	      <dither>True</dither>
+	      <use_alpha>False</use_alpha>
+	      <title>Pick a color</title>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>False</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>label4</name>
-	      <label>Type Face</label>
+	      <name>label7</name>
+	      <label>Options</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -765,8 +765,8 @@
 	      <child>
 		<left_attach>0</left_attach>
 		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
+		<top_attach>3</top_attach>
+		<bottom_attach>6</bottom_attach>
 		<xpad>5</xpad>
 		<ypad>5</ypad>
 		<xexpand>False</xexpand>
@@ -906,29 +906,6 @@
 	      </child>
 	    </widget>

-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>bgcolor</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>5</xpad>
-		<ypad>5</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label17</name>
@@ -1080,119 +1057,55 @@
 	    </widget>

 	    <widget>
-	      <class>GtkTable</class>
-	      <name>table5</name>
-	      <rows>2</rows>
-	      <columns>2</columns>
-	      <homogeneous>True</homogeneous>
-	      <row_spacing>0</row_spacing>
-	      <column_spacing>0</column_spacing>
+	      <class>GtkLabel</class>
+	      <name>label9</name>
+	      <label>Alignment</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0</yalign>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
 	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>5</top_attach>
-		<bottom_attach>6</bottom_attach>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
 		<xpad>5</xpad>
 		<ypad>5</ypad>
 		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
+		<yexpand>True</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
 		<xfill>True</xfill>
 		<yfill>True</yfill>
 	      </child>
+	    </widget>

-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>lborder</name>
-		<can_focus>True</can_focus>
-		<label>left</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tborder</name>
-		<can_focus>True</can_focus>
-		<label>top</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>rborder</name>
-		<can_focus>True</can_focus>
-		<label>right</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>bborder</name>
-		<can_focus>True</can_focus>
-		<label>bottom</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label14</name>
+	      <label>Borders</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0</yalign>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>5</top_attach>
+		<bottom_attach>6</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>True</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
+	      </child>
 	    </widget>

 	    <widget>
@@ -1205,7 +1118,7 @@
 	      <column_spacing>0</column_spacing>
 	      <child>
 		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
+		<right_attach>3</right_attach>
 		<top_attach>0</top_attach>
 		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
@@ -1316,55 +1229,142 @@
 	    </widget>

 	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>Alignment</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
+	      <class>GtkTable</class>
+	      <name>table5</name>
+	      <rows>2</rows>
+	      <columns>2</columns>
+	      <homogeneous>True</homogeneous>
+	      <row_spacing>0</row_spacing>
+	      <column_spacing>0</column_spacing>
 	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>5</xpad>
-		<ypad>5</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label14</name>
-	      <label>Borders</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
 		<top_attach>5</top_attach>
 		<bottom_attach>6</bottom_attach>
 		<xpad>5</xpad>
 		<ypad>5</ypad>
 		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
+		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
 		<xfill>True</xfill>
 		<yfill>True</yfill>
 	      </child>
+
+	      <widget>
+		<class>GtkCheckButton</class>
+		<name>lborder</name>
+		<can_focus>True</can_focus>
+		<label>left</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>True</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkCheckButton</class>
+		<name>tborder</name>
+		<can_focus>True</can_focus>
+		<label>top</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>True</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkCheckButton</class>
+		<name>rborder</name>
+		<can_focus>True</can_focus>
+		<label>right</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>True</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkCheckButton</class>
+		<name>bborder</name>
+		<can_focus>True</can_focus>
+		<label>bottom</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>True</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>GnomeColorPicker</class>
+	      <name>bgcolor</name>
+	      <can_focus>True</can_focus>
+	      <dither>True</dither>
+	      <use_alpha>False</use_alpha>
+	      <title>Pick a color</title>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>3</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>False</xfill>
+		<yfill>False</yfill>
+	      </child>
 	    </widget>
 	  </widget>
 	</widget>