From e43a29b72a1442ab4509a0f4dbdca48dd1b61783 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sun, 12 Oct 2003 00:16:54 +0000
Subject: [PATCH] * src/GrampsCfg.py: eliminate name only option in status line
 * src/gramps_main.py: eliminate name only option in status line *
 src/preferences.py : eliminate name only option in status line *
 src/plugins/GraphViz.py: install only for python 2.2

svn: r2234
---
 src/GrampsCfg.py        | 10 +++-------
 src/gramps_main.py      |  5 +----
 src/plugins/GraphViz.py | 21 ++++++++++++---------
 src/preferences.glade   | 35 ++++++-----------------------------
 4 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py
index 8f9155b67..37f54f011 100644
--- a/src/GrampsCfg.py
+++ b/src/GrampsCfg.py
@@ -129,7 +129,7 @@ vc_comment    = 0
 uncompress    = 0
 lastfile      = None
 nameof        = Utils.normal_name
-status_bar    = 0
+status_bar    = 1
 toolbar       = 2
 calendar      = 0
 paper_preference = ""
@@ -591,9 +591,7 @@ class GrampsPreferences:
         self.top.get_widget("sprefix").set_text(sprefix)
         self.top.get_widget("pprefix").set_text(pprefix)
 
-        if status_bar == 0:
-            self.top.get_widget("stat1").set_active(1)
-        elif status_bar == 1:
+        if status_bar == 0 or status_bar == 1:
             self.top.get_widget("stat2").set_active(1)
         else:
             self.top.get_widget("stat3").set_active(1)
@@ -850,9 +848,7 @@ class GrampsPreferences:
         output_obj = self.osubmenu.get_active()
         goutput_obj = self.gsubmenu.get_active()
 
-        if self.top.get_widget("stat1").get_active():
-            status_bar = 0
-        elif self.top.get_widget("stat2").get_active():
+        if self.top.get_widget("stat2").get_active():
             status_bar = 1
         else:
             status_bar = 2
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 1ef7a7b1a..28410a806 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -1443,7 +1443,6 @@ class Gramps:
         self.topWindow.set_title("%s - GRAMPS" % name)
         self.status_text("")
         self.statusbar.set_progress_percentage(0.0)
-        #self.statusbar.set_pulse_step(0.02)
         self.delete_autosave(old_file)
 
     def delete_autosave(self,filename):
@@ -1593,9 +1592,7 @@ class Gramps:
         if self.active_person == None:
             self.status_text("")
         else:
-            if GrampsCfg.status_bar == 0:
-                name = GrampsCfg.nameof(self.active_person)
-            elif GrampsCfg.status_bar == 1:
+            if GrampsCfg.status_bar <= 1:
                 pname = GrampsCfg.nameof(self.active_person)
                 name = "[%s] %s" % (self.active_person.getId(),pname)
             else:
diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py
index ce819fb8d..67fd889ab 100644
--- a/src/plugins/GraphViz.py
+++ b/src/plugins/GraphViz.py
@@ -517,14 +517,17 @@ def get_description():
 #
 #------------------------------------------------------------------------
 from Plugins import register_report
+import sys
 
-register_report(
-    report,
-    _("Relationship Graph"),
-    status=(_("Beta")),
-    category=_("Graphical Reports"),
-    description=get_description(),
-    author_name="Donald N. Allingham",
-    author_email="dallingham@users.sourceforge.net"
-    )
+ver = sys.version_info
+if ver[0] == 2 and ver[1] == 2:
+    register_report(
+        report,
+        _("Relationship Graph"),
+        status=(_("Beta")),
+        category=_("Graphical Reports"),
+        description=get_description(),
+        author_name="Donald N. Allingham",
+        author_email="dallingham@users.sourceforge.net"
+        )
 
diff --git a/src/preferences.glade b/src/preferences.glade
index 8e0ddeff4..dbfed3a43 100644
--- a/src/preferences.glade
+++ b/src/preferences.glade
@@ -735,7 +735,7 @@
 			    <widget class="GtkTable" id="table15">
 			      <property name="border_width">12</property>
 			      <property name="visible">True</property>
-			      <property name="n_rows">9</property>
+			      <property name="n_rows">8</property>
 			      <property name="n_columns">3</property>
 			      <property name="homogeneous">False</property>
 			      <property name="row_spacing">6</property>
@@ -858,10 +858,10 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkRadioButton" id="stat1">
+				<widget class="GtkRadioButton" id="stat2">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Active person's name only</property>
+				  <property name="label" translatable="yes">Active person's name and _GRAMPS ID</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">True</property>
@@ -879,29 +879,6 @@
 				</packing>
 			      </child>
 
-			      <child>
-				<widget class="GtkRadioButton" id="stat2">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Active person's name and _GRAMPS ID</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">stat1</property>
-				  <signal name="toggled" handler="on_object_toggled" object="propertybox"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">7</property>
-				  <property name="bottom_attach">8</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
 			      <child>
 				<widget class="GtkRadioButton" id="stat3">
 				  <property name="visible">True</property>
@@ -912,14 +889,14 @@
 				  <property name="active">True</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">stat1</property>
+				  <property name="group">stat2</property>
 				  <signal name="toggled" handler="on_object_toggled" object="propertybox"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">3</property>
-				  <property name="top_attach">8</property>
-				  <property name="bottom_attach">9</property>
+				  <property name="top_attach">7</property>
+				  <property name="bottom_attach">8</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>