From cb89ccf8f7428e83a3196b26b2ca35e900d52a18 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 15 Dec 2005 21:50:14 +0000 Subject: [PATCH] * src/DisplayState.py: Window management completed svn: r5559 --- ChangeLog | 3 ++ src/DisplayState.py | 82 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cfbcc69a..bc446d8e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2005-12-15 Don Allingham + * src/DisplayState.py: Window management completed + 2005-12-15 Alex Roitman * src/GrampsBSDDB.py: go back to a single load function; finish gramps_upgrade_9. diff --git a/src/DisplayState.py b/src/DisplayState.py index 054c32691..3b616b44f 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -25,6 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- +from cStringIO import StringIO #------------------------------------------------------------------------- # @@ -132,8 +133,9 @@ class History(GrampsDBCallback.GrampsDBCallback): # #------------------------------------------------------------------------- -_win_top = '' -_win_btm = '' +_win_top = '' +_win_btm = '' +DISABLED = -1 class GrampsWindowManager: """ @@ -160,15 +162,35 @@ class GrampsWindowManager: Lookup can be also done by ID for windows that are identifiable. """ - def __init__(self): + def __init__(self,uimanager): # initialize empty tree and lookup dictionary + self.uimanager = uimanager self.window_tree = [] self.id2item = {} + self.action_group = gtk.ActionGroup('WindowManger') + self.active = DISABLED + self.ui = _win_top + _win_btm + + def disable(self): + """ + Removes the UI and action groups if the navigation is enabled + """ + if self.active != DISABLED: + self.uimanager.remove_ui(self.active) + self.uimanager.remove_action_group(self.action_group) + self.active = DISABLED + + def enable(self): + """ + Enables the UI and action groups + """ + self.uimanager.insert_action_group(self.action_group, 1) + self.active = self.uimanager.add_ui_from_string(self.ui) def get_item_from_track(self,track): # Recursively find an item given track sequence item = self.window_tree - print "track", track + #print "track", track for index in track: item = item[index] return item @@ -181,7 +203,7 @@ class GrampsWindowManager: def close_track(self,track): # This is called when item needs to be closed # Closes all its children and then removes the item from the tree. - print "1", track + #print "1", track item = self.get_item_from_track(track) self.close_item(item) # This only needs to be run once for the highest level point @@ -228,7 +250,7 @@ class GrampsWindowManager: if item.window_id: self.id2item[item.window_id] = item - print "Adding: Track:", track + #print "Adding: Track:", track # Make sure we have a track parent_item = self.get_item_from_track(track) @@ -256,17 +278,53 @@ class GrampsWindowManager: def call_back_factory(self,item): if type(item) != list: def f(obj): - if item.window_id and self.get_window_from_id(item.window_id): - self.get_window_from_id(item.window_id).present() + if item.window_id and self.id2item.get(item.window_id): + self.id2item[item.window_id].present() else: def f(obj): pass return f + def generate_id(self,win_id): + return str(win_id).replace(' ','-')[1:-1] + + def display_menu_list(self,data,action_data,mlist): + i = mlist[0] + idval = self.generate_id(i.window_id) + data.write('' % idval) + data.write('' % self.generate_id(i.window_id)) + + action_data.append(("M:"+idval,None,i.submenu_label,None,None,None)) + action_data.append((idval,None,i.menu_label,None,None,self.call_back_factory(i))) + + if len(mlist) > 1: + for i in mlist[1:]: + if type(i) == list: + self.display_menu_list(data,action_data,i) + else: + idval = self.generate_id(i.window_id) + data.write('' %self.generate_id(i.window_id)) + action_data.append((idval,None,i.menu_label,None,None,self.call_back_factory(i))) + data.write('') + def build_windows_menu(self): - print self.window_tree - print self.id2item - pass + + if self.active != DISABLED: + self.uimanager.remove_ui(self.active) + self.uimanager.remove_action_group(self.action_group) + + self.action_group = gtk.ActionGroup('WindowManger') + action_data = [] + + data = StringIO() + data.write(_win_top) + for i in self.window_tree: + self.display_menu_list(data,action_data,i) + data.write(_win_btm) + self.ui = data.getvalue() + data.close() + self.action_group.add_actions(action_data) + self.enable() #------------------------------------------------------------------------- # @@ -353,7 +411,7 @@ class DisplayState(GrampsDBCallback.GrampsDBCallback): self.status = status self.status_id = status.get_context_id('GRAMPS') self.phistory = History() - self.gwm = GrampsWindowManager() + self.gwm = GrampsWindowManager(uimanager) def modify_statusbar(self,active=None): self.status.pop(self.status_id)