Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In .:

Browse Source 
2006-05-05  Alex Roitman  <shura@gramps-project.org>
	* src/UndoHistory.py: Add new file.
	* src/ViewManager.py: undo history support.
	* src/GrampsDb/_GrampsDbBase.py (Transaction.__init__): Add
	timestamp to the transaction.
	(GrampsDbBase.redo): Update undo history window.
	(GrampsDbBase.undo): Update undo history window.
	(GrampsDbBase.transaction_commit): Update undo history window.
	(GrampsDbBase.transaction_commit): Set transaction timestamp.
	(GrampsDbBase.__init__): Define undo_history_callback.
	* src/Makefile.am (gdir_PYTHON): Ship new file.

In po:
2006-05-05  Alex Roitman  <shura@gramps-project.org>
	* POTFILES.in: Add new file.



svn: r6557
This commit is contained in:
Alex Roitman
2006-05-05 21:55:01 +00:00
parent 43bc6b3e8c
commit 404cf87c93
7 changed files with 217 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gramps2/src/ViewManager.py
View File

@ -78,6 +78,7 @@ import RecentFiles
import NameDisplay
import Mime
import GrampsWidgets
import UndoHistory
#-------------------------------------------------------------------------
#
@ -107,8 +108,8 @@ uidefault = '''<ui>
</menu>
<menu action="EditMenu">
<menuitem action="Undo"/>
<menuitem action="UndoHistory"/>
<menuitem action="Redo"/>
<menuitem action="UndoHistory"/>
<separator/>
<placeholder name="CommonEdit"/>
<menuitem action="CmpMerge"/>
@ -359,7 +360,6 @@ class ViewManager:
self._undo_action_list = [
('Undo', gtk.STOCK_UNDO, _('_Undo'),'<control>z', None, self.undo),
('UndoHistory', 'stock_undo-history', _('_Undo History'), None, None, self.undo_history),
]
self._redo_action_list = [
@ -367,6 +367,11 @@ class ViewManager:
self.redo),
]
self._undo_history_action_list = [
('UndoHistory', 'stock_undo-history',
_('Undo History'), None, None, self.undo_history),
]
self._navigation_type = {
PageView.NAVIGATION_NONE: (None, None),
PageView.NAVIGATION_PERSON: (None, None),
@ -438,6 +443,7 @@ class ViewManager:
self.fileactions = gtk.ActionGroup('FileWindow')
self.undoactions = gtk.ActionGroup('Undo')
self.redoactions = gtk.ActionGroup('Redo')
self.undohistoryactions = gtk.ActionGroup('UndoHistory')
self.fileactions.add_actions(self._file_action_list)
self.actiongroup.add_actions(self._action_action_list)
@ -449,12 +455,15 @@ class ViewManager:
self.redoactions.add_actions(self._redo_action_list)
self.redoactions.set_sensitive(False)
self.undohistoryactions.add_actions(self._undo_history_action_list)
merge_id = self.uimanager.add_ui_from_string(uidefault)
self.uimanager.insert_action_group(self.fileactions, 1)
self.uimanager.insert_action_group(self.actiongroup, 1)
self.uimanager.insert_action_group(self.undoactions, 1)
self.uimanager.insert_action_group(self.redoactions, 1)
self.uimanager.insert_action_group(self.undohistoryactions, 1)
self.uimanager.ensure_update()
def home_page_activate(self, obj):
@ -891,9 +900,6 @@ class ViewManager:
log.error("Failed to open database.", exc_info=True)
return False
# Undo/Redo always start with standard labels and insensitive state
#self.undo_callback(None)
#self.redo_callback(None)
self.file_loaded = True
self.actiongroup.set_visible(True)
return True
@ -932,6 +938,7 @@ class ViewManager:
self.change_page(None, None)
self.state.db.undo_callback = self.change_undo_label
self.state.db.redo_callback = self.change_redo_label
self.state.db.undo_history_callback = self.undo_history_update
self.actiongroup.set_visible(True)
self.window.window.set_cursor(None)
return True
@ -941,7 +948,7 @@ class ViewManager:
self.undoactions = gtk.ActionGroup('Undo')
if label:
self.undoactions.add_actions([
('Undo', gtk.STOCK_UNDO, label, '<control>z', None, self.undo)])
('Undo',gtk.STOCK_UNDO,label,'<control>z',None,self.undo)])
else:
self.undoactions.add_actions([
('Undo', gtk.STOCK_UNDO, '_Undo',
@ -963,6 +970,19 @@ class ViewManager:
self.redoactions.set_sensitive(False)
self.uimanager.insert_action_group(self.redoactions, 1)
def undo_history_update(self):
"""
This function is called to update both the state of
the Undo History menu item (enable/disable) and
the contents of the Undo History window.
"""
try:
# Try updating undo history window if it exists
self.undo_history_window.update()
except AttributeError:
# Let it go: history window does not exist
pass
def setup_bookmarks(self):
self.bookmarks = Bookmarks.Bookmarks(self.state, self.uistate,
self.state.db.get_bookmarks())
@ -1007,7 +1027,11 @@ class ViewManager:
self.state.db.redo()
def undo_history(self, obj):
print "UNDO HISTORY"
try:
self.undo_history_window = UndoHistory.UndoHistory(self.state,
self.uistate)
except Errors.WindowActiveError:
pass
def export_data(self, obj):
import Exporter