From fe78de0606852de0aea08bf324d334310251b47f Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 15 Dec 2005 04:45:20 +0000
Subject: [PATCH] * src/DisplayState.py: start of Windows menu *
 src/ReadGedcom.py: sync database with transaction * src/ViewManager.py:
 WinMenu support

svn: r5551
---
 gramps2/ChangeLog           | 5 +++++
 gramps2/src/DisplayState.py | 4 ++++
 gramps2/src/ReadGedcom.py   | 3 +--
 gramps2/src/ViewManager.py  | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e07f6b564..d0962b9b2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14  Don Allingham  <don@gramps-project.org>
+	* src/DisplayState.py: start of Windows menu
+	* src/ReadGedcom.py: sync database with transaction
+	* src/ViewManager.py: WinMenu support
+
 2005-12-14  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/gramps.glade: Fix Tip of the day
 
diff --git a/gramps2/src/DisplayState.py b/gramps2/src/DisplayState.py
index 6db57e745..054c32691 100644
--- a/gramps2/src/DisplayState.py
+++ b/gramps2/src/DisplayState.py
@@ -131,6 +131,10 @@ class History(GrampsDBCallback.GrampsDBCallback):
 # Window manager
 #
 #-------------------------------------------------------------------------
+
+_win_top = '<ui><menubar name="MenuBar"><menu name="WindowsMenu"><placeholder name="WinMenu">'
+_win_btm = '</placeholder</menu></menubar></ui>'
+
 class GrampsWindowManager:
     """
     Manage hierarchy of open GRAMPS windows.
diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py
index ff1d2381c..b2a1f66e2 100644
--- a/gramps2/src/ReadGedcom.py
+++ b/gramps2/src/ReadGedcom.py
@@ -604,8 +604,7 @@ class GedcomParser:
 
         self.progressbar.set_fraction(1.0)
         self.progressbar.set_text(_("Complete"))
-        if use_trans:
-            self.db.transaction_commit(self.trans,_("GEDCOM import"))
+        self.db.transaction_commit(self.trans,_("GEDCOM import"))
         self.db.enable_signals()
         self.db.request_rebuild()
         
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 6d6ea5927..a5342ce07 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -117,6 +117,7 @@ uidefault = '''<ui>
   <menu action="ToolsMenu">
   </menu>
   <menu action="WindowsMenu">
+    <placeholder name="WinMenu"/>
   </menu>
   <menu action="HelpMenu">
     <menuitem action="UserManual"/>