From 1eb5f0542402c2c228894e7287531b4a5f0a1f8c Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 26 Apr 2006 02:46:09 +0000
Subject: [PATCH] 	* src/GrampsCfg/py: move and rename tabs

svn: r6443
---
 ChangeLog              |  1 +
 src/GrampsCfg.py       | 12 ++++++------
 src/glade/gramps.glade |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b13d1e36..183cd420d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-04-25  Don Allingham  <don@gramps-project.org>
+	* src/GrampsCfg/py: move and rename tabs
 	* src/ViewManager.py: new config changes, handle exception
 	* src/GrampsCfg.py: new config changes
 	* src/Config/gen_schema_keys.py: new config changes
diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py
index 73a5c7272..25e604015 100644
--- a/src/GrampsCfg.py
+++ b/src/GrampsCfg.py
@@ -102,16 +102,16 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
         self.window.vbox.pack_start(tlabel, padding=12)
         self.window.vbox.add(panel)
         self.window.connect('response',self.done)
-        panel.append_page(self.add_researcher_panel(),
-                          MarkupLabel("<b>%s</b>" % _('Researcher')))
-        panel.append_page(self.add_formats_panel(),
-                          MarkupLabel("<b>%s</b>" % _('Formats')))
         panel.append_page(self.add_behavior_panel(),
-                          MarkupLabel("<b>%s</b>" % _('Behavior')))
+                          MarkupLabel("<b>%s</b>" % _('General')))
+        panel.append_page(self.add_formats_panel(),
+                          MarkupLabel("<b>%s</b>" % _('Display')))
         panel.append_page(self.add_prefix_panel(),
                           MarkupLabel("<b>%s</b>" % _('ID Prefixes')))
         panel.append_page(self.add_advanced_panel(),
-                          MarkupLabel("<b>%s</b>" % _('Advanced')))
+                          MarkupLabel("<b>%s</b>" % _('Warnings')))
+        panel.append_page(self.add_researcher_panel(),
+                          MarkupLabel("<b>%s</b>" % _('Researcher')))
 
         self.window.show_all()
         self.show()
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index cc9d8d08d..fe4a5eda8 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -11267,6 +11267,7 @@ Text Beside Icons</property>
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
+	      <property name="has_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>