From 06d9588736cace43aeae366a45872d70e33be7c2 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 14 Jun 2007 04:20:44 +0000
Subject: [PATCH] 	* src/DbManager.py: handle cursor while rebuilding 
 * src/glade/gramps.glade: fix label placement

2007-06-13  Don Allingham  <don@gramps-project.org>


svn: r8547
---
 ChangeLog              |  4 ++
 src/DbManager.py       |  4 ++
 src/glade/gramps.glade | 91 ++++++++++++++++++++++++------------------
 3 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afa701d9b..97b30f718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-13  Don Allingham  <don@gramps-project.org>
+	* src/DbManager.py: handle cursor while rebuilding
+	* src/glade/gramps.glade: fix label placement
+
 2007-06-13  Don Allingham  <don@gramps-project.org>
 	* src/DbManager.py: handle broken dbs that have been opened
 	* src/DbState.py: handle broken dbs that have been opened
diff --git a/src/DbManager.py b/src/DbManager.py
index 5fbcdbb75..d9765b374 100644
--- a/src/DbManager.py
+++ b/src/DbManager.py
@@ -358,9 +358,13 @@ class DbManager:
         db.set_save_path(dirname)
         db.load(dirname, None)
         self.msg.set_label(_("Rebuilding database from backup files"))
+        
+        self.top.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
         while (gtk.events_pending()):
             gtk.main_iteration()
         GrampsDbUtils.Backup.restore(db)
+        self.top.window.set_cursor(None)
+
         self.msg.set_label("")
         db.close()
         self.dbstate.no_database()
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index 72ab5b4ab..4a272db5a 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -15620,26 +15620,64 @@ Very High</property>
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow88">
+		<widget class="GtkVBox" id="vbox133">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkTreeView" id="dblist">
+		    <widget class="GtkScrolledWindow" id="scrolledwindow88">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="headers_visible">True</property>
-		      <property name="rules_hint">False</property>
-		      <property name="reorderable">False</property>
-		      <property name="enable_search">True</property>
-		      <property name="fixed_height_mode">False</property>
-		      <property name="hover_selection">False</property>
-		      <property name="hover_expand">False</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_IN</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="dblist">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			  <property name="fixed_height_mode">False</property>
+			  <property name="hover_selection">False</property>
+			  <property name="hover_expand">False</property>
+			</widget>
+		      </child>
 		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="msg">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_CENTER</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">6</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
 		  </child>
 		</widget>
 		<packing>
@@ -15743,31 +15781,6 @@ Very High</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="msg">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>