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

2007-12-19 Benny Malengier <benny.malengier@gramps-project.org>

Browse Source 
* src/Editors/_EditPrimary.py:
	* src/Editors/_EditPlace.py:
	* src/Editors/_EditSecondary.py:
	* src/Editors/_EditSourceRef.py:
	* src/Editors/_EditReference.py:
	* src/Editors/_EditRepoRef.py:
	* src/Editors/_EditNote.py:
	* src/Editors/_EditMediaRef.py:
	* src/Editors/_EditEventRef.py:
	* src/Editors/_EditName.py:
	* src/DisplayTabs/__init__.py:
	* src/DisplayTabs/_GalleryTab.py:
	* src/DisplayTabs/_BackRefList.py:
	* src/DisplayTabs/_ButtonTab.py:
	* src/DisplayTabs/_GrampsTab.py:
	Accelator keys on displaytabs, convert _all_ tabs to GrampsTab! 
	Feature #955 #1438



svn: r9545
This commit is contained in:
Benny Malengier
2007-12-20 13:49:41 +00:00
parent fb12457651
commit 13bd98097b
16 changed files with 379 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Editors/_EditEventRef.py
View File

@@ -45,7 +45,7 @@ import gen.lib
from DisplayTabs import SourceEmbedList,NoteTab,GalleryTab,EventBackRefList,AttrEmbedList
from GrampsWidgets import *
from _EditReference import EditReference
from _EditReference import RefTab, EditReference
#-------------------------------------------------------------------------
#
@@ -53,6 +53,7 @@ from _EditReference import EditReference
#
#-------------------------------------------------------------------------
#-------------------------------------------------------------------------
#
# EditEventRef class
@@ -78,7 +79,20 @@ class EditEventRef(EditReference):
self.define_expander(self.top.get_widget("eer_expander"))
self.share_btn = self.top.get_widget('share_place')
self.add_del_btn = self.top.get_widget('add_del_place')
tblref = self.top.get_widget('table64')
notebook = self.top.get_widget('notebook_ref')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.reftab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
tblref = self.top.get_widget('table62')
notebook = self.top.get_widget('notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
def _init_event(self):
self.commit_event = self.db.commit_personal_event
self.add_event = self.db.add_person_event
@@ -155,19 +169,19 @@ class EditEventRef(EditReference):
notebook = self.top.get_widget('notebook')
notebook_ref = self.top.get_widget('notebook_ref')
self._add_tab(notebook, self.primtab)
self._add_tab(notebook_ref, self.reftab)
self.srcref_list = self._add_tab(
notebook,
SourceEmbedList(self.dbstate,self.uistate,self.track,self.source))
try:
self.attr_list = self._add_tab(
notebook,
AttrEmbedList(self.dbstate, self.uistate, self.track,
self.source.get_attribute_list()))
except AttributeError:
print "Attribute list not available yet"
self.attr_list = self._add_tab(
notebook,
AttrEmbedList(self.dbstate, self.uistate, self.track,
self.source.get_attribute_list()))
self.note_tab = self._add_tab(
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
@@ -191,13 +205,10 @@ class EditEventRef(EditReference):
self.db.find_backlink_handles(self.source.handle),
self.enable_warnbox))
try:
self.attr_ref_list = self._add_tab(
notebook_ref,
AttrEmbedList(self.dbstate, self.uistate, self.track,
self.source_ref.get_attribute_list()))
except AttributeError:
print "Attribute list not available yet"
self.attr_ref_list = self._add_tab(
notebook_ref,
AttrEmbedList(self.dbstate, self.uistate, self.track,
self.source_ref.get_attribute_list()))
self._setup_notebook_tabs( notebook)
self._setup_notebook_tabs( notebook_ref)

22
src/Editors/_EditMediaRef.py
View File

@@ -48,7 +48,7 @@ from gen.lib import NoteType
from DisplayTabs import \
SourceEmbedList,AttrEmbedList,MediaBackRefList,NoteTab
from GrampsWidgets import *
from _EditReference import EditReference
from _EditReference import RefTab, EditReference
#-------------------------------------------------------------------------
#
@@ -74,6 +74,20 @@ class EditMediaRef(EditReference):
self.top.get_widget('title'),
_('Media Reference Editor'))
self.define_warn_box(self.top.get_widget("warn_box"))
tblref = self.top.get_widget('table50')
notebook = self.top.get_widget('notebook_ref')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.reftab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
tblref = self.top.get_widget('table2')
notebook = self.top.get_widget('notebook_shared')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
def _setup_fields(self):
@@ -368,11 +382,13 @@ class EditMediaRef(EditReference):
"""
Creates the notebook tabs and inserts them into the main
window.
"""
notebook_ref = self.top.get_widget('notebook_ref')
notebook_src = self.top.get_widget('notebook_shared')
self._add_tab(notebook_src, self.primtab)
self._add_tab(notebook_ref, self.reftab)
self.srcref_list = self._add_tab(
notebook_ref,
SourceEmbedList(self.dbstate,self.uistate,self.track,

59
src/Editors/_EditName.py
View File

@@ -46,9 +46,53 @@ from BasicUtils import name_displayer
from _EditSecondary import EditSecondary
from gen.lib import NoteType
from DisplayTabs import SourceEmbedList,NoteTab
from DisplayTabs import GrampsTab,SourceEmbedList,NoteTab
from GrampsWidgets import *
#-------------------------------------------------------------------------
#
# Classes
#
#-------------------------------------------------------------------------
class GeneralNameTab(GrampsTab):
"""
This class provides the tabpage of the general name tab
"""
def __init__(self, dbstate, uistate, track, name, widget):
"""
@param dbstate: The database state. Contains a reference to
the database, along with other state information. The GrampsTab
uses this to access the database and to pass to and created
child windows (such as edit dialogs).
@type dbstate: DbState
@param uistate: The UI state. Used primarily to pass to any created
subwindows.
@type uistate: DisplayState
@param track: The window tracking mechanism used to manage windows.
This is only used to pass to generted child windows.
@type track: list
@param name: Notebook label name
@type name: str/unicode
@param widget: widget to be shown in the tab
@type widge: gtk widget
"""
GrampsTab.__init__(self, dbstate, uistate, track, name)
eventbox = gtk.EventBox()
eventbox.add(widget)
self.pack_start(eventbox)
self._set_label(show_image=False)
widget.connect('key_press_event', self.key_pressed)
self.show_all()
def is_empty(self):
"""
Override base class
"""
return False
#-------------------------------------------------------------------------
#
# EditName class
@@ -71,21 +115,24 @@ class EditName(EditSecondary):
self.top.get_widget("title"),
_("Name Editor"))
tblgnam = self.top.get_widget('table23')
notebook = self.top.get_widget('notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.gennam = GeneralNameTab(self.dbstate, self.uistate, self.track,
_('General'), tblgnam)
self.original_group_as = self.obj.get_group_as()
self.original_group_set = not (self.original_group_as == '')
srn = self.obj.get_surname()
self._get_global_grouping(srn)
self.general_label = self.top.get_widget("general_tab")
self.group_over = self.top.get_widget('group_over')
self.group_over.connect('toggled',self.on_group_over_toggled)
self.group_over.set_sensitive(not self.db.readonly)
self.toggle_dirty = False
Utils.bold_label(self.general_label)
def _post_init(self):
"""if there is override, set the override toggle active
"""
@@ -195,6 +242,8 @@ class EditName(EditSecondary):
notebook = self.top.get_widget("notebook")
self._add_tab(notebook, self.gennam)
self.srcref_list = self._add_tab(
notebook,
SourceEmbedList(self.dbstate,self.uistate,self.track,self.obj))

61
src/Editors/_EditNote.py
View File

@@ -46,7 +46,7 @@ import Config
import GrampsDisplay
import MarkupText
from _EditPrimary import EditPrimary
from DisplayTabs import NoteBackRefList
from DisplayTabs import GrampsTab, NoteBackRefList
from GrampsWidgets import *
from gen.lib import Note
@@ -66,11 +66,57 @@ URLPATH = "/[" + PATHCHARS + "]*[^]'.}>) \t\r\n,\\\"]"
(GENERAL, HTTP, MAIL) = range(3)
#-------------------------------------------------------------------------
#
# NoteTab
#
#-------------------------------------------------------------------------
class NoteTab(GrampsTab):
"""
This class provides the tabpage of the note
"""
def __init__(self, dbstate, uistate, track, name, widget):
"""
@param dbstate: The database state. Contains a reference to
the database, along with other state information. The GrampsTab
uses this to access the database and to pass to and created
child windows (such as edit dialogs).
@type dbstate: DbState
@param uistate: The UI state. Used primarily to pass to any created
subwindows.
@type uistate: DisplayState
@param track: The window tracking mechanism used to manage windows.
This is only used to pass to generted child windows.
@type track: list
@param name: Notebook label name
@type name: str/unicode
@param widget: widget to be shown in the tab
@type widge: gtk widget
"""
GrampsTab.__init__(self, dbstate, uistate, track, name)
eventbox = gtk.EventBox()
eventbox.add(widget)
self.pack_start(eventbox)
self._set_label(show_image=False)
eventbox.connect('key_press_event', self.key_pressed)
self.show_all()
def is_empty(self):
"""
Override base class
"""
return False
#-------------------------------------------------------------------------
#
# EditNote
#
#-------------------------------------------------------------------------
class EditNote(EditPrimary):
hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
regular_cursor = gtk.gdk.Cursor(gtk.gdk.XTERM)
@@ -139,6 +185,13 @@ class EditNote(EditPrimary):
settings = gtk.settings_get_default()
self.show_unicode = settings.get_property('gtk-show-unicode-menu')
settings.set_property('gtk-show-unicode-menu', False)
vboxnote = self.top.get_widget('vbox131')
notebook = self.top.get_widget('note_notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.ntab = NoteTab(self.dbstate, self.uistate, self.track,
_('Note'), vboxnote)
self.build_interface()
@@ -193,7 +246,9 @@ class EditNote(EditPrimary):
window.
"""
notebook = self.top.get_widget("note_notebook")
self._add_tab(notebook, self.ntab)
self.backref_tab = self._add_tab(
notebook,
NoteBackRefList(self.dbstate, self.uistate, self.track,
@@ -202,8 +257,6 @@ class EditNote(EditPrimary):
)
self._setup_notebook_tabs( notebook)
notebook.show_all()
def build_interface(self):
FORMAT_TOOLBAR = '''

53
src/Editors/_EditPlace.py
View File

@@ -51,6 +51,49 @@ from DisplayTabs import *
from GrampsWidgets import *
from PlaceUtils import conv_lat_lon
#-------------------------------------------------------------------------
#
# Classes
#
#-------------------------------------------------------------------------
class MainLocTab(GrampsTab):
"""
This class provides the tabpage of the main location tab
"""
def __init__(self, dbstate, uistate, track, name, widget):
"""
@param dbstate: The database state. Contains a reference to
the database, along with other state information. The GrampsTab
uses this to access the database and to pass to and created
child windows (such as edit dialogs).
@type dbstate: DbState
@param uistate: The UI state. Used primarily to pass to any created
subwindows.
@type uistate: DisplayState
@param track: The window tracking mechanism used to manage windows.
This is only used to pass to generted child windows.
@type track: list
@param name: Notebook label name
@type name: str/unicode
@param widget: widget to be shown in the tab
@type widge: gtk widget
"""
GrampsTab.__init__(self, dbstate, uistate, track, name)
eventbox = gtk.EventBox()
eventbox.add(widget)
self.pack_start(eventbox)
self._set_label(show_image=False)
widget.connect('key_press_event', self.key_pressed)
self.show_all()
def is_empty(self):
"""
Override base class
"""
return False
#-------------------------------------------------------------------------
#
# EditPlace
@@ -73,6 +116,12 @@ class EditPlace(EditPrimary):
width = Config.get(Config.PLACE_WIDTH)
height = Config.get(Config.PLACE_HEIGHT)
self.window.resize(width, height)
tblmloc = self.top.get_widget('table19')
notebook = self.top.get_widget('notebook3')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.mloc = MainLocTab(self.dbstate, self.uistate, self.track,
_('Location'), tblmloc)
def get_menu_title(self):
if self.obj and self.obj.get_handle():
@@ -167,6 +216,8 @@ class EditPlace(EditPrimary):
"""
notebook = self.top.get_widget('notebook3')
self._add_tab(notebook, self.mloc)
self.loc_list = self._add_tab(
notebook,
LocationEmbedList(self.dbstate,self.uistate, self.track,
@@ -197,7 +248,7 @@ class EditPlace(EditPrimary):
PlaceBackRefList(self.dbstate,self.uistate,self.track,
self.db.find_backlink_handles(self.obj.handle)))
self._setup_notebook_tabs( notebook)
self._setup_notebook_tabs(notebook)
def _cleanup_on_exit(self):
self.backref_list.close()

1
src/Editors/_EditPrimary.py
View File

@@ -99,6 +99,7 @@ class EditPrimary(ManagedWindow.ManagedWindow):
self._switch_page_on_dnd,
notebook,
page_no)
child.set_parent_notebook(notebook)
def _switch_page_on_dnd(self, widget, context, x, y, time, notebook, page_no):
if notebook.get_current_page() != page_no:

45
src/Editors/_EditReference.py
View File

@@ -27,8 +27,52 @@
#-------------------------------------------------------------------------
import ManagedWindow
from GrampsWidgets import *
from DisplayTabs import GrampsTab
import Config
#-------------------------------------------------------------------------
#
# Classes
#
#-------------------------------------------------------------------------
class RefTab(GrampsTab):
"""
This class provides a simple tabpage for use on EditReference
"""
def __init__(self, dbstate, uistate, track, name, widget):
"""
@param dbstate: The database state. Contains a reference to
the database, along with other state information. The GrampsTab
uses this to access the database and to pass to and created
child windows (such as edit dialogs).
@type dbstate: DbState
@param uistate: The UI state. Used primarily to pass to any created
subwindows.
@type uistate: DisplayState
@param track: The window tracking mechanism used to manage windows.
This is only used to pass to generted child windows.
@type track: list
@param name: Notebook label name
@type name: str/unicode
@param widget: widget to be shown in the tab
@type widge: gtk widget
"""
GrampsTab.__init__(self, dbstate, uistate, track, name)
eventbox = gtk.EventBox()
eventbox.add(widget)
self.pack_start(eventbox)
self._set_label(show_image=False)
widget.connect('key_press_event', self.key_pressed)
self.show_all()
def is_empty(self):
"""
Override base class
"""
return False
#-------------------------------------------------------------------------
#
# EditReference class
@@ -96,6 +140,7 @@ class EditReference(ManagedWindow.ManagedWindow):
self._switch_page_on_dnd,
notebook,
page_no)
child.set_parent_notebook(notebook)
def _switch_page_on_dnd(self, widget, context, x, y, time, notebook, page_no):
if notebook.get_current_page() != page_no:

18
src/Editors/_EditRepoRef.py
View File

@@ -46,7 +46,7 @@ from gen.lib import NoteType
from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList
from GrampsWidgets import *
from _EditReference import EditReference
from _EditReference import RefTab, EditReference
#-------------------------------------------------------------------------
#
@@ -74,6 +74,19 @@ class EditRepoRef(EditReference):
self.define_warn_box(self.top.get_widget("warn_box"))
self.define_expander(self.top.get_widget("src_expander"))
tblref = self.top.get_widget('table70')
notebook = self.top.get_widget('notebook_ref')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.reftab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
tblref = self.top.get_widget('table69')
notebook = self.top.get_widget('notebook_src')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
@@ -132,6 +145,9 @@ class EditRepoRef(EditReference):
notebook_src = self.top.get_widget('notebook_src')
notebook_ref = self.top.get_widget('notebook_ref')
self._add_tab(notebook_src, self.primtab)
self._add_tab(notebook_ref, self.reftab)
self.note_tab = self._add_tab(
notebook_src,
NoteTab(self.dbstate, self.uistate, self.track,

1
src/Editors/_EditSecondary.py
View File

@@ -92,6 +92,7 @@ class EditSecondary(ManagedWindow.ManagedWindow):
self._switch_page_on_dnd,
notebook,
page_no)
child.set_parent_notebook(notebook)
def _switch_page_on_dnd(self, widget, context, x, y, time, notebook, page_no):
if notebook.get_current_page() != page_no:

24
src/Editors/_EditSourceRef.py
View File

@@ -45,7 +45,7 @@ import gen.lib
from DisplayTabs import \
NoteTab,TextTab,GalleryTab,SourceBackRefList,DataEmbedList,RepoEmbedList
from GrampsWidgets import *
from _EditReference import EditReference
from _EditReference import RefTab, EditReference
#-------------------------------------------------------------------------
#
@@ -69,6 +69,19 @@ class EditSourceRef(EditReference):
self.define_warn_box(self.top.get_widget("warn_box"))
self.define_expander(self.top.get_widget("src_expander"))
tblref = self.top.get_widget('table67')
notebook = self.top.get_widget('notebook_ref')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.reftab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
tblref = self.top.get_widget('table68')
notebook = self.top.get_widget('notebook_src')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
_('General'), tblref)
def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
@@ -131,12 +144,13 @@ class EditSourceRef(EditReference):
"""
Creates the notebook tabs and inserts them into the main
window.
"""
notebook_src = self.top.get_widget('notebook_src')
notebook_ref = self.top.get_widget('notebook_ref')
self._add_tab(notebook_src, self.primtab)
self._add_tab(notebook_ref, self.reftab)
self.note_tab = self._add_tab(
notebook_src,
NoteTab(self.dbstate, self.uistate, self.track,
@@ -165,10 +179,6 @@ class EditSourceRef(EditReference):
self.enable_warnbox
))
# self.text_tab = self._add_tab(
# notebook_ref,
# TextTab(self.dbstate, self.uistate, self.track,self.source_ref))
self.comment_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,