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

Bug 2888: gramps.glade: convert from liglade to gtkbuilder -- part 3

Browse Source 
svn: r12512
This commit is contained in:
Gerald Britton
2009-05-07 20:08:27 +00:00
parent 29d55c10d0
commit e5794d4999
21 changed files with 3628 additions and 4134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Editors/_EditAddress.py
View File

@ -32,6 +32,7 @@ mechanism for the user to edit address information.
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
@ -39,7 +40,6 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@ -54,6 +54,8 @@ from gen.lib import NoteType
from DisplayTabs import SourceEmbedList, NoteTab
from widgets import MonitoredDate, MonitoredEntry, PrivacyButton
_GLADE_FILE = 'editaddress.glade'
#-------------------------------------------------------------------------
#
# EditAddress class
@ -77,51 +79,55 @@ class EditAddress(EditSecondary):
def _local_init(self):
self.width_key = Config.ADDRESS_WIDTH
self.height_key = Config.ADDRESS_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "addr_edit","gramps")
self.set_window(self.top.get_widget("addr_edit"),
self.top.get_widget("title"),
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_object("addr_edit"),
self.top.get_object("title"),
_('Address Editor'))
def _setup_fields(self):
self.addr_start = MonitoredDate(
self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.obj.get_date_object(),
self.uistate,
self.track,
self.db.readonly)
self.street = MonitoredEntry(
self.top.get_widget("street"), self.obj.set_street,
self.top.get_object("street"), self.obj.set_street,
self.obj.get_street, self.db.readonly)
self.city = MonitoredEntry(
self.top.get_widget("city"), self.obj.set_city,
self.top.get_object("city"), self.obj.set_city,
self.obj.get_city, self.db.readonly)
self.state = MonitoredEntry(
self.top.get_widget("state"), self.obj.set_state,
self.top.get_object("state"), self.obj.set_state,
self.obj.get_state, self.db.readonly)
self.country = MonitoredEntry(
self.top.get_widget("country"), self.obj.set_country,
self.top.get_object("country"), self.obj.set_country,
self.obj.get_country, self.db.readonly)
self.postal = MonitoredEntry(
self.top.get_widget("postal"), self.obj.set_postal_code,
self.top.get_object("postal"), self.obj.set_postal_code,
self.obj.get_postal_code, self.db.readonly)
self.phone = MonitoredEntry(
self.top.get_widget("phone"), self.obj.set_phone,
self.top.get_object("phone"), self.obj.set_phone,
self.obj.get_phone, self.db.readonly)
self.priv = PrivacyButton(self.top.get_widget("private"),
self.priv = PrivacyButton(self.top.get_object("private"),
self.obj, self.db.readonly)
def _connect_signals(self):
self.define_help_button(self.top.get_widget('help'))
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
self.define_help_button(self.top.get_object('help'))
self.define_cancel_button(self.top.get_object('cancel'))
self.define_ok_button(self.top.get_object('ok'),self.save)
def _create_tabbed_pages(self):
"""
@ -143,7 +149,7 @@ class EditAddress(EditSecondary):
self._setup_notebook_tabs( notebook)
notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook,True)
self.top.get_object('vbox').pack_start(notebook,True)
def build_menu_names(self, obj):
return (_('Address'),_('Address Editor'))

40
src/Editors/_EditEvent.py
View File

@ -27,13 +27,14 @@
#
#-------------------------------------------------------------------------
from TransUtils import sgettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@ -60,6 +61,8 @@ from widgets import (MonitoredEntry, PrivacyButton,
#-------------------------------------------------------------------------
WIKI_HELP_PAGE = '%s_-_Entering_and_Editing_Data:_Detailed_-_part_2' % const.URL_MANUAL_PAGE
WIKI_HELP_SEC = _('manual|Editing_Information_About_Events')
_GLADE_FILE = 'editevent.glade'
#-------------------------------------------------------------------------
#
# EditEvent class
@ -99,19 +102,22 @@ class EditEvent(EditPrimary):
self.width_key = Config.EVENT_WIDTH
self.height_key = Config.EVENT_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "event_edit","gramps")
self.set_window(self.top.get_widget("event_edit"), None,
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_object("event_edit"), None,
self.get_menu_title())
self.place = self.top.get_widget('place')
self.share_btn = self.top.get_widget('select_place')
self.add_del_btn = self.top.get_widget('add_del_place')
self.place = self.top.get_object('place')
self.share_btn = self.top.get_object('select_place')
self.add_del_btn = self.top.get_object('add_del_place')
def _connect_signals(self):
self.top.get_widget('button111').connect('clicked', self.close)
self.top.get_widget('button126').connect('clicked', self.help_clicked)
self.top.get_object('button111').connect('clicked', self.close)
self.top.get_object('button126').connect('clicked', self.help_clicked)
self.ok_button = self.top.get_widget('ok')
self.ok_button = self.top.get_object('ok')
self.ok_button.set_sensitive(not self.db.readonly)
self.ok_button.connect('clicked', self.save)
@ -120,30 +126,30 @@ class EditEvent(EditPrimary):
# place, select_place, add_del_place
self.place_field = PlaceEntry(self.dbstate, self.uistate, self.track,
self.top.get_widget("place"),
self.top.get_object("place"),
self.obj.set_place_handle,
self.obj.get_place_handle,
self.add_del_btn, self.share_btn)
self.descr_field = MonitoredEntry(self.top.get_widget("event_description"),
self.descr_field = MonitoredEntry(self.top.get_object("event_description"),
self.obj.set_description,
self.obj.get_description,
self.db.readonly)
self.gid = MonitoredEntry(self.top.get_widget("gid"),
self.gid = MonitoredEntry(self.top.get_object("gid"),
self.obj.set_gramps_id,
self.obj.get_gramps_id, self.db.readonly)
self.priv = PrivacyButton( self.top.get_widget("private"),
self.priv = PrivacyButton( self.top.get_object("private"),
self.obj, self.db.readonly)
self.event_menu = MonitoredDataType(self.top.get_widget("personal_events"),
self.event_menu = MonitoredDataType(self.top.get_object("personal_events"),
self.obj.set_type,
self.obj.get_type,
custom_values=self.get_custom_events())
self.date_field = MonitoredDate(self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.date_field = MonitoredDate(self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.obj.get_date_object(),
self.uistate, self.track,
self.db.readonly)
@ -191,7 +197,7 @@ class EditEvent(EditPrimary):
self._setup_notebook_tabs(notebook)
notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook, True)
self.top.get_object('vbox').pack_start(notebook, True)
self.track_ref_for_deletion("source_list")
self.track_ref_for_deletion("note_list")

59
src/Editors/_EditEventRef.py
View File

@ -27,13 +27,14 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
#-------------------------------------------------------------------------
#
@ -58,6 +59,7 @@ from ObjectEntries import PlaceEntry
#
#-------------------------------------------------------------------------
_GLADE_FILE = 'editeventref.glade'
#-------------------------------------------------------------------------
#
@ -74,24 +76,27 @@ class EditEventRef(EditReference):
def _local_init(self):
self.width_key = Config.EVENT_REF_WIDTH
self.height_key = Config.EVENT_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "event_eref_edit","gramps")
self.set_window(self.top.get_widget('event_eref_edit'),
self.top.get_widget('eer_title'),
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_object('event_eref_edit'),
self.top.get_object('eer_title'),
_('Event Reference Editor'))
self.define_warn_box(self.top.get_widget("eer_warning"))
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')
self.define_warn_box(self.top.get_object("eer_warning"))
self.define_expander(self.top.get_object("eer_expander"))
self.share_btn = self.top.get_object('share_place')
self.add_del_btn = self.top.get_object('add_del_place')
tblref = self.top.get_widget('table64')
notebook = self.top.get_widget('notebook_ref')
tblref = self.top.get_object('table64')
notebook = self.top.get_object('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')
tblref = self.top.get_object('table62')
notebook = self.top.get_object('notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
@ -105,25 +110,25 @@ class EditEventRef(EditReference):
return self.db.get_person_event_types()
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'))
self.define_ok_button(self.top.get_object('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_object('cancel'))
# FIXME: activate when help page is available
#self.define_help_button(self.top.get_widget('help'))
#self.define_help_button(self.top.get_object('help'))
def _setup_fields(self):
self.ref_privacy = PrivacyButton(
self.top.get_widget('eer_ref_priv'),
self.top.get_object('eer_ref_priv'),
self.source_ref, self.db.readonly)
self.descr_field = MonitoredEntry(
self.top.get_widget("eer_description"),
self.top.get_object("eer_description"),
self.source.set_description,
self.source.get_description,
self.db.readonly)
self.gid = MonitoredEntry(
self.top.get_widget("gid"),
self.top.get_object("gid"),
self.source.set_gramps_id,
self.source.get_gramps_id,
self.db.readonly)
@ -132,18 +137,18 @@ class EditEventRef(EditReference):
self.dbstate,
self.uistate,
self.track,
self.top.get_widget("eer_place"),
self.top.get_object("eer_place"),
self.source.set_place_handle,
self.source.get_place_handle,
self.share_btn,
self.add_del_btn)
self.ev_privacy = PrivacyButton(
self.top.get_widget("eer_ev_priv"),
self.top.get_object("eer_ev_priv"),
self.source, self.db.readonly)
self.role_selector = MonitoredDataType(
self.top.get_widget('eer_role_combo'),
self.top.get_object('eer_role_combo'),
self.source_ref.set_role,
self.source_ref.get_role,
self.db.readonly,
@ -151,15 +156,15 @@ class EditEventRef(EditReference):
)
self.event_menu = MonitoredDataType(
self.top.get_widget("eer_type_combo"),
self.top.get_object("eer_type_combo"),
self.source.set_type,
self.source.get_type,
self.db.readonly,
custom_values=self.get_custom_events())
self.date_check = MonitoredDate(
self.top.get_widget("eer_date_entry"),
self.top.get_widget("eer_date_stat"),
self.top.get_object("eer_date_entry"),
self.top.get_object("eer_date_stat"),
self.source.get_date_object(),
self.uistate,
self.track,
@ -171,8 +176,8 @@ class EditEventRef(EditReference):
window.
"""
notebook = self.top.get_widget('notebook')
notebook_ref = self.top.get_widget('notebook_ref')
notebook = self.top.get_object('notebook')
notebook_ref = self.top.get_object('notebook_ref')
self._add_tab(notebook, self.primtab)
self._add_tab(notebook_ref, self.reftab)

85
src/Editors/_EditLdsOrd.py
View File

@ -18,8 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
import gtk
# $Id$
"""
@ -33,13 +31,14 @@ mechanism for the user to edit personal LDS information.
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
#-------------------------------------------------------------------------
#
@ -121,6 +120,8 @@ _DATA_MAP = {
gen.lib.LdsOrd.STATUS_UNCLEARED,
],
}
_GLADE_FILE = 'editldsord.glade'
#-------------------------------------------------------------------------
#
@ -146,18 +147,22 @@ class EditLdsOrd(EditSecondary):
def _local_init(self):
self.width_key = Config.LDS_WIDTH
self.height_key = Config.LDS_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "lds_person_edit","gramps")
self.set_window(self.top.get_widget("lds_person_edit"),
self.top.get_widget('title'),
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_object("lds_person_edit"),
self.top.get_object('title'),
_('LDS Ordinance Editor'))
self.share_btn = self.top.get_widget('share_place')
self.add_del_btn = self.top.get_widget('add_del_place')
self.share_btn = self.top.get_object('share_place')
self.add_del_btn = self.top.get_object('add_del_place')
def _connect_signals(self):
self.parents_select.connect('clicked',self.select_parents_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
self.define_cancel_button(self.top.get_object('cancel'))
self.define_help_button(self.top.get_object('help'))
self.define_ok_button(self.top.get_object('ok'),self.save)
def _get_types(self):
return (gen.lib.LdsOrd.BAPTISM,
@ -167,17 +172,17 @@ class EditLdsOrd(EditSecondary):
def _setup_fields(self):
self.parents_label = self.top.get_widget('parents_label')
self.parents = self.top.get_widget('parents')
self.parents_select = self.top.get_widget('parents_select')
self.parents_label = self.top.get_object('parents_label')
self.parents = self.top.get_object('parents')
self.parents_select = self.top.get_object('parents_select')
self.priv = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.obj, self.db.readonly)
self.date_field = MonitoredDate(
self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.obj.get_date_object(),
self.uistate,
self.track,
@ -187,14 +192,14 @@ class EditLdsOrd(EditSecondary):
self.dbstate,
self.uistate,
self.track,
self.top.get_widget("place"),
self.top.get_object("place"),
self.obj.set_place_handle,
self.obj.get_place_handle,
self.add_del_btn,
self.share_btn)
self.type_menu = MonitoredMenu(
self.top.get_widget('type'),
self.top.get_object('type'),
self.obj.set_type,
self.obj.get_type,
[(item[1],item[0]) for item in gen.lib.LdsOrd._TYPE_MAP
@ -203,14 +208,14 @@ class EditLdsOrd(EditSecondary):
changed=self.ord_type_changed)
self.temple_menu = MonitoredStrMenu(
self.top.get_widget('temple'),
self.top.get_object('temple'),
self.obj.set_temple,
self.obj.get_temple,
LdsUtils.TEMPLES.name_code_data(),
self.db.readonly)
self.status_menu = MonitoredMenu(
self.top.get_widget('status'),
self.top.get_object('status'),
self.obj.set_status,
self.obj.get_status,
[(item[1],item[0]) for item in gen.lib.LdsOrd._STATUS_MAP
@ -251,7 +256,7 @@ class EditLdsOrd(EditSecondary):
self._setup_notebook_tabs( notebook)
notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook,True)
self.top.get_object('vbox').pack_start(notebook,True)
def select_parents_clicked(self, obj):
from Selectors import selector_factory
@ -333,33 +338,33 @@ class EditFamilyLdsOrd(EditSecondary):
def _local_init(self):
self.top = glade.XML(const.GLADE_FILE, "lds_person_edit","gramps")
self.set_window(self.top.get_widget("lds_person_edit"),
self.top.get_widget('title'),
self.set_window(self.top.get_object("lds_person_edit"),
self.top.get_object('title'),
_('LDS Ordinance Editor'))
self.share_btn = self.top.get_widget('share_place')
self.add_del_btn = self.top.get_widget('add_del_place')
self.share_btn = self.top.get_object('share_place')
self.add_del_btn = self.top.get_object('add_del_place')
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
self.define_cancel_button(self.top.get_object('cancel'))
self.define_help_button(self.top.get_object('help'))
self.define_ok_button(self.top.get_object('ok'),self.save)
def _get_types(self):
return (gen.lib.LdsOrd.SEAL_TO_SPOUSE,)
def _setup_fields(self):
self.parents_label = self.top.get_widget('parents_label')
self.parents = self.top.get_widget('parents')
self.parents_select = self.top.get_widget('parents_select')
self.parents_label = self.top.get_object('parents_label')
self.parents = self.top.get_object('parents')
self.parents_select = self.top.get_object('parents_select')
self.priv = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.obj, self.db.readonly)
self.date_field = MonitoredDate(
self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.obj.get_date_object(),
self.uistate,
self.track,
@ -369,14 +374,14 @@ class EditFamilyLdsOrd(EditSecondary):
self.dbstate,
self.uistate,
self.track,
self.top.get_widget("place"),
self.top.get_object("place"),
self.obj.set_place_handle,
self.obj.get_place_handle,
self.add_del_btn,
self.share_btn)
self.type_menu = MonitoredMenu(
self.top.get_widget('type'),
self.top.get_object('type'),
self.obj.set_type,
self.obj.get_type,
[(item[1],item[0]) for item in gen.lib.LdsOrd._TYPE_MAP
@ -384,14 +389,14 @@ class EditFamilyLdsOrd(EditSecondary):
self.db.readonly)
self.temple_menu = MonitoredStrMenu(
self.top.get_widget('temple'),
self.top.get_object('temple'),
self.obj.set_temple,
self.obj.get_temple,
LdsUtils.TEMPLES.name_code_data(),
self.db.readonly)
self.status_menu = MonitoredMenu(
self.top.get_widget('status'),
self.top.get_object('status'),
self.obj.set_status,
self.obj.get_status,
[(item[1],item[0]) for item in gen.lib.LdsOrd._STATUS_MAP
@ -411,7 +416,7 @@ class EditFamilyLdsOrd(EditSecondary):
notetype=gen.lib.NoteType.LDS))
notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook,True)
self.top.get_object('vbox').pack_start(notebook,True)
def build_menu_names(self, attrib):
label = _("LDS Ordinance")

46
src/Editors/_EditMedia.py
View File

@ -27,6 +27,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
@ -34,7 +35,6 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@ -53,6 +53,9 @@ from DisplayTabs import (SourceEmbedList, AttrEmbedList, NoteTab,
MediaBackRefList)
from Editors.AddMedia import AddMediaObject
from QuestionDialog import ErrorDialog
_GLADE_FILE = 'editmedia.glade'
#-------------------------------------------------------------------------
#
# EditMedia
@ -91,41 +94,43 @@ class EditMedia(EditPrimary):
assert(self.obj)
self.width_key = Config.MEDIA_WIDTH
self.height_key = Config.MEDIA_HEIGHT
self.glade = glade.XML(const.GLADE_FILE,
"change_global","gramps")
self.set_window(self.glade.get_widget('change_global'),
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.glade = gtk.Builder()
self.glade.add_from_file(glade_file)
self.set_window(self.glade.get_object('change_global'),
None, self.get_menu_title())
def _connect_signals(self):
self.define_cancel_button(self.glade.get_widget('button91'))
self.define_ok_button(self.glade.get_widget('ok'), self.save)
self.define_help_button(self.glade.get_widget('button102'))
self.define_cancel_button(self.glade.get_object('button91'))
self.define_ok_button(self.glade.get_object('ok'), self.save)
self.define_help_button(self.glade.get_object('button102'))
def _setup_fields(self):
self.date_field = MonitoredDate(self.glade.get_widget("date_entry"),
self.glade.get_widget("date_edit"),
self.date_field = MonitoredDate(self.glade.get_object("date_entry"),
self.glade.get_object("date_edit"),
self.obj.get_date_object(),
self.uistate, self.track,
self.db.readonly)
self.descr_window = MonitoredEntry(self.glade.get_widget("description"),
self.descr_window = MonitoredEntry(self.glade.get_object("description"),
self.obj.set_description,
self.obj.get_description,
self.db.readonly)
self.gid = MonitoredEntry(self.glade.get_widget("gid"),
self.gid = MonitoredEntry(self.glade.get_object("gid"),
self.obj.set_gramps_id,
self.obj.get_gramps_id, self.db.readonly)
self.privacy = PrivacyButton(self.glade.get_widget("private"),
self.privacy = PrivacyButton(self.glade.get_object("private"),
self.obj, self.db.readonly)
self.pixmap = self.glade.get_widget("pixmap")
ebox = self.glade.get_widget('eventbox')
self.pixmap = self.glade.get_object("pixmap")
ebox = self.glade.get_object('eventbox')
ebox.connect('button-press-event', self.button_press_event)
self.mimetext = self.glade.get_widget("type")
self.mimetext = self.glade.get_object("type")
self.setup_filepath()
self.determine_mime()
self.draw_preview()
@ -153,7 +158,8 @@ class EditMedia(EditPrimary):
def draw_preview(self):
mtype = self.obj.get_mime_type()
if mtype:
pb = ThumbNails.get_thumbnail_image(Utils.media_path_full(self.db, self.obj.get_path()),
pb = ThumbNails.get_thumbnail_image(
Utils.media_path_full(self.db, self.obj.get_path()),
mtype)
self.pixmap.set_from_pixbuf(pb)
else:
@ -161,8 +167,8 @@ class EditMedia(EditPrimary):
self.pixmap.set_from_pixbuf(pb)
def setup_filepath(self):
self.select = self.glade.get_widget('file_select')
self.file_path = self.glade.get_widget("path")
self.select = self.glade.get_object('file_select')
self.file_path = self.glade.get_object("path")
fname = self.obj.get_path()
self.file_path.set_text(fname)
@ -203,7 +209,7 @@ class EditMedia(EditPrimary):
self._setup_notebook_tabs( notebook)
notebook.show_all()
self.glade.get_widget('vbox').pack_start(notebook, True)
self.glade.get_object('vbox').pack_start(notebook, True)
def build_menu_names(self, person):
return (_('Edit Media Object'), self.get_menu_title())

54
src/Editors/_EditName.py
View File

@ -27,6 +27,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
@ -34,7 +35,6 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@ -50,6 +50,7 @@ from DisplayTabs import GrampsTab,SourceEmbedList,NoteTab
from widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate,
MonitoredDataType, PrivacyButton)
_GLADE_FILE = 'editname.glade'
#-------------------------------------------------------------------------
#
@ -110,13 +111,16 @@ class EditName(EditSecondary):
self.width_key = Config.NAME_WIDTH
self.height_key = Config.NAME_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "name_edit","gramps")
self.set_window(self.top.get_widget("name_edit"),
self.top.get_widget("title"),
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_object("name_edit"),
self.top.get_object("title"),
_("Name Editor"))
tblgnam = self.top.get_widget('table23')
notebook = self.top.get_widget('notebook')
tblgnam = self.top.get_object('table23')
notebook = self.top.get_object('notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.gennam = GeneralNameTab(self.dbstate, self.uistate, self.track,
@ -127,7 +131,7 @@ class EditName(EditSecondary):
srn = self.obj.get_surname()
self._get_global_grouping(srn)
self.group_over = self.top.get_widget('group_over')
self.group_over = self.top.get_object('group_over')
self.group_over.connect('toggled',self.on_group_over_toggled)
self.group_over.set_sensitive(not self.db.readonly)
@ -140,13 +144,13 @@ class EditName(EditSecondary):
self.group_over.set_active(True)
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('button119'))
self.define_help_button(self.top.get_widget('button131'))
self.define_ok_button(self.top.get_widget('button118'),self.save)
self.define_cancel_button(self.top.get_object('button119'))
self.define_help_button(self.top.get_object('button131'))
self.define_ok_button(self.top.get_object('button118'),self.save)
def _setup_fields(self):
self.group_as = MonitoredEntry(
self.top.get_widget("group_as"),
self.top.get_object("group_as"),
self.obj.set_group_as,
self.obj.get_group_as,
self.db.readonly)
@ -161,51 +165,51 @@ class EditName(EditSecondary):
in name_displayer.get_name_format(also_default=True)]
self.sort_as = MonitoredMenu(
self.top.get_widget('sort_as'),
self.top.get_object('sort_as'),
self.obj.set_sort_as,
self.obj.get_sort_as,
format_list,
self.db.readonly)
self.display_as = MonitoredMenu(
self.top.get_widget('display_as'),
self.top.get_object('display_as'),
self.obj.set_display_as,
self.obj.get_display_as,
format_list,
self.db.readonly)
self.given_field = MonitoredEntry(
self.top.get_widget("alt_given"),
self.top.get_object("alt_given"),
self.obj.set_first_name,
self.obj.get_first_name,
self.db.readonly)
self.call_field = MonitoredEntry(
self.top.get_widget("call"),
self.top.get_object("call"),
self.obj.set_call_name,
self.obj.get_call_name,
self.db.readonly)
self.title_field = MonitoredEntry(
self.top.get_widget("alt_title"),
self.top.get_object("alt_title"),
self.obj.set_title,
self.obj.get_title,
self.db.readonly)
self.suffix_field = MonitoredEntry(
self.top.get_widget("alt_suffix"),
self.top.get_object("alt_suffix"),
self.obj.set_suffix,
self.obj.get_suffix,
self.db.readonly)
self.patronymic_field = MonitoredEntry(
self.top.get_widget("patronymic"),
self.top.get_object("patronymic"),
self.obj.set_patronymic,
self.obj.get_patronymic,
self.db.readonly)
self.surname_field = MonitoredEntry(
self.top.get_widget("alt_surname"),
self.top.get_object("alt_surname"),
self.obj.set_surname,
self.obj.get_surname,
self.db.readonly,
@ -213,21 +217,21 @@ class EditName(EditSecondary):
changed=self.update_group_as)
self.prefix_field = MonitoredEntry(
self.top.get_widget("alt_prefix"),
self.top.get_object("alt_prefix"),
self.obj.set_surname_prefix,
self.obj.get_surname_prefix,
self.db.readonly)
self.date = MonitoredDate(
self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.obj.get_date_object(),
self.uistate,
self.track,
self.db.readonly)
self.obj_combo = MonitoredDataType(
self.top.get_widget("name_type"),
self.top.get_object("name_type"),
self.obj.set_type,
self.obj.get_type,
self.db.readonly,
@ -235,12 +239,12 @@ class EditName(EditSecondary):
)
self.privacy = PrivacyButton(
self.top.get_widget("priv"), self.obj,
self.top.get_object("priv"), self.obj,
self.db.readonly)
def _create_tabbed_pages(self):
notebook = self.top.get_widget("notebook")
notebook = self.top.get_object("notebook")
self._add_tab(notebook, self.gennam)

40
src/Editors/_EditNote.py
View File

@ -28,6 +28,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
import logging
_LOG = logging.getLogger(".Editors.EditNote")
@ -38,7 +39,6 @@ _LOG = logging.getLogger(".Editors.EditNote")
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
import gobject
import pango
@ -48,7 +48,7 @@ import pango
#
#-------------------------------------------------------------------------
import Config
from const import GLADE_FILE
import const
from widgets import StyledTextEditor
from Editors._EditPrimary import EditPrimary
from DisplayTabs import GrampsTab, NoteBackRefList
@ -57,6 +57,8 @@ from widgets import (MonitoredDataType, MonitoredCheckbox,
from gen.lib import Note
from QuestionDialog import ErrorDialog
_GLADE_FILE = 'editnote.glade'
#-------------------------------------------------------------------------
#
# NoteTab
@ -167,13 +169,17 @@ class EditNote(EditPrimary):
"""
self.width_key = Config.NOTE_WIDTH
self.height_key = Config.NOTE_HEIGHT
self.top = glade.XML(GLADE_FILE, "edit_note", "gramps")
win = self.top.get_widget("edit_note")
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
win = self.top.get_object("edit_note")
self.set_window(win, None, self.get_menu_title())
vboxnote = self.top.get_widget('vbox131')
notebook = self.top.get_widget('note_notebook')
vboxnote = self.top.get_object('vbox131')
notebook = self.top.get_object('note_notebook')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.ntab = NoteTab(self.dbstate, self.uistate, self.track,
@ -185,7 +191,7 @@ class EditNote(EditPrimary):
def _setup_fields(self):
"""Get control widgets and attach them to Note's attributes."""
self.type_selector = MonitoredDataType(
self.top.get_widget('type'),
self.top.get_object('type'),
self.obj.set_type,
self.obj.get_type,
self.db.readonly,
@ -194,26 +200,26 @@ class EditNote(EditPrimary):
self.check = MonitoredCheckbox(
self.obj,
self.top.get_widget('format'),
self.top.get_object('format'),
self.obj.set_format,
self.obj.get_format,
readonly = self.db.readonly)
self.gid = MonitoredEntry(
self.top.get_widget('id'),
self.top.get_object('id'),
self.obj.set_gramps_id,
self.obj.get_gramps_id,
self.db.readonly)
self.marker = MonitoredDataType(
self.top.get_widget('marker'),
self.top.get_object('marker'),
self.obj.set_marker,
self.obj.get_marker,
self.db.readonly,
self.db.get_marker_types())
self.priv = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.obj, self.db.readonly)
def _connect_signals(self):
@ -222,13 +228,13 @@ class EditNote(EditPrimary):
Called by the init routine of the base class L{EditPrimary}.
"""
self.define_ok_button(self.top.get_widget('ok'), self.save)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_object('ok'), self.save)
self.define_cancel_button(self.top.get_object('cancel'))
self.define_help_button(self.top.get_object('help'))
def _create_tabbed_pages(self):
"""Create the notebook tabs and inserts them into the main window."""
notebook = self.top.get_widget("note_notebook")
notebook = self.top.get_object("note_notebook")
self._add_tab(notebook, self.ntab)
@ -244,13 +250,13 @@ class EditNote(EditPrimary):
self._setup_notebook_tabs(notebook)
def build_interface(self):
self.texteditor = self.top.get_widget('texteditor')
self.texteditor = self.top.get_object('texteditor')
self.texteditor.set_editable(not self.dbstate.db.readonly)
self.texteditor.set_wrap_mode(gtk.WRAP_WORD)
# create a formatting toolbar
if not self.dbstate.db.readonly:
vbox = self.top.get_widget('container')
vbox = self.top.get_object('container')
vbox.pack_start(self.texteditor.get_toolbar(),
expand=False, fill=False)

53
src/Editors/_EditPlace.py
View File

@ -27,6 +27,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
import logging
log = logging.getLogger(".")
@ -37,7 +38,6 @@ log = logging.getLogger(".")
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@ -55,6 +55,8 @@ from Errors import ValidationError
from PlaceUtils import conv_lat_lon
from QuestionDialog import ErrorDialog
_GLADE_FILE = 'editplace.glade'
#-------------------------------------------------------------------------
#
# Classes
@ -116,12 +118,15 @@ class EditPlace(EditPrimary):
def _local_init(self):
self.width_key = Config.PLACE_WIDTH
self.height_key = Config.PLACE_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "place_editor","gramps")
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_widget("place_editor"), None,
self.set_window(self.top.get_object("place_editor"), None,
self.get_menu_title())
tblmloc = self.top.get_widget('table19')
notebook = self.top.get_widget('notebook3')
tblmloc = self.top.get_object('table19')
notebook = self.top.get_object('notebook3')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.mloc = MainLocTab(self.dbstate, self.uistate, self.track,
@ -138,71 +143,71 @@ class EditPlace(EditPrimary):
return dialog_title
def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'), self.save)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_object('ok'), self.save)
self.define_cancel_button(self.top.get_object('cancel'))
self.define_help_button(self.top.get_object('help'))
def _setup_fields(self):
mloc = self.obj.get_main_location()
self.title = MonitoredEntry(self.top.get_widget("place_title"),
self.title = MonitoredEntry(self.top.get_object("place_title"),
self.obj.set_title, self.obj.get_title,
self.db.readonly)
self.street = MonitoredEntry(self.top.get_widget("street"),
self.street = MonitoredEntry(self.top.get_object("street"),
mloc.set_street, mloc.get_street,
self.db.readonly)
self.city = MonitoredEntry(self.top.get_widget("city"),
self.city = MonitoredEntry(self.top.get_object("city"),
mloc.set_city, mloc.get_city,
self.db.readonly)
self.gid = MonitoredEntry(self.top.get_widget("gid"),
self.gid = MonitoredEntry(self.top.get_object("gid"),
self.obj.set_gramps_id,
self.obj.get_gramps_id, self.db.readonly)
self.privacy = PrivacyButton(self.top.get_widget("private"), self.obj,
self.privacy = PrivacyButton(self.top.get_object("private"), self.obj,
self.db.readonly)
self.parish = MonitoredEntry(self.top.get_widget("parish"),
self.parish = MonitoredEntry(self.top.get_object("parish"),
mloc.set_parish, mloc.get_parish,
self.db.readonly)
self.county = MonitoredEntry(self.top.get_widget("county"),
self.county = MonitoredEntry(self.top.get_object("county"),
mloc.set_county, mloc.get_county,
self.db.readonly)
self.state = MonitoredEntry(self.top.get_widget("state"),
self.state = MonitoredEntry(self.top.get_object("state"),
mloc.set_state, mloc.get_state,
self.db.readonly)
self.phone = MonitoredEntry(self.top.get_widget("phone"),
self.phone = MonitoredEntry(self.top.get_object("phone"),
mloc.set_phone, mloc.get_phone,
self.db.readonly)
self.postal = MonitoredEntry(self.top.get_widget("postal"),
self.postal = MonitoredEntry(self.top.get_object("postal"),
mloc.set_postal_code,
mloc.get_postal_code, self.db.readonly)
self.country = MonitoredEntry(self.top.get_widget("country"),
self.country = MonitoredEntry(self.top.get_object("country"),
mloc.set_country, mloc.get_country,
self.db.readonly)
self.longitude = MonitoredEntry(
self.top.get_widget("lon_entry"),
self.top.get_object("lon_entry"),
self.obj.set_longitude, self.obj.get_longitude,
self.db.readonly)
self.longitude.connect("validate", self._validate_coordinate, "lon")
#force validation now with initial entry
self.top.get_widget("lon_entry").validate(force=True)
self.top.get_object("lon_entry").validate(force=True)
self.latitude = MonitoredEntry(
self.top.get_widget("lat_entry"),
self.top.get_object("lat_entry"),
self.obj.set_latitude, self.obj.get_latitude,
self.db.readonly)
self.latitude.connect("validate", self._validate_coordinate, "lat")
#force validation now with initial entry
self.top.get_widget("lat_entry").validate(force=True)
self.top.get_object("lat_entry").validate(force=True)
def _validate_coordinate(self, widget, text, typedeg):
if (typedeg == 'lat') and not conv_lat_lon(text, "0", "ISO-D"):
@ -221,7 +226,7 @@ class EditPlace(EditPrimary):
window.
"""
notebook = self.top.get_widget('notebook3')
notebook = self.top.get_object('notebook3')
self._add_tab(notebook, self.mloc)

57
src/Editors/_EditSourceRef.py
View File

@ -27,13 +27,14 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
#-------------------------------------------------------------------------
#
@ -50,6 +51,8 @@ from widgets import (PrivacyButton, MonitoredEntry, MonitoredMenu,
MonitoredDate)
from _EditReference import RefTab, EditReference
_GLADE_FILE = 'editsourceref.glade'
#-------------------------------------------------------------------------
#
# EditSourceRef class
@ -66,69 +69,71 @@ class EditSourceRef(EditReference):
self.width_key = Config.EVENT_REF_WIDTH
self.height_key = Config.EVENT_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "source_ref_edit","gramps")
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.set_window(self.top.get_widget('source_ref_edit'),
self.top.get_widget('source_title'),
self.set_window(self.top.get_object('source_ref_edit'),
self.top.get_object('source_title'),
_('Source Reference Editor'))
self.define_warn_box(self.top.get_widget("warn_box"))
self.define_expander(self.top.get_widget("src_expander"))
self.define_warn_box(self.top.get_object("warn_box"))
self.define_expander(self.top.get_object("src_expander"))
tblref = self.top.get_widget('table67')
notebook = self.top.get_widget('notebook_ref')
tblref = self.top.get_object('table67')
notebook = self.top.get_object('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')
tblref = self.top.get_object('table68')
notebook = self.top.get_object('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'))
self.define_help_button(self.top.get_widget("help"))
self.define_ok_button(self.top.get_object('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_object('cancel'))
self.define_help_button(self.top.get_object("help"))
def _setup_fields(self):
self.ref_privacy = PrivacyButton(
self.top.get_widget('privacy'), self.source_ref, self.db.readonly)
self.top.get_object('privacy'), self.source_ref, self.db.readonly)
self.volume = MonitoredEntry(
self.top.get_widget("volume"), self.source_ref.set_page,
self.top.get_object("volume"), self.source_ref.set_page,
self.source_ref.get_page, self.db.readonly)
self.gid = MonitoredEntry(
self.top.get_widget('gid'), self.source.set_gramps_id,
self.top.get_object('gid'), self.source.set_gramps_id,
self.source.get_gramps_id,self.db.readonly)
self.source_privacy = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.source, self.db.readonly)
self.title = MonitoredEntry(
self.top.get_widget('title'),
self.top.get_object('title'),
self.source.set_title,
self.source.get_title,
self.db.readonly)
self.abbrev = MonitoredEntry(
self.top.get_widget('abbrev'), self.source.set_abbreviation,
self.top.get_object('abbrev'), self.source.set_abbreviation,
self.source.get_abbreviation,self.db.readonly)
self.author = MonitoredEntry(
self.top.get_widget('author'), self.source.set_author,
self.top.get_object('author'), self.source.set_author,
self.source.get_author,self.db.readonly)
self.pubinfo = MonitoredEntry(
self.top.get_widget('pub_info'), self.source.set_publication_info,
self.top.get_object('pub_info'), self.source.set_publication_info,
self.source.get_publication_info,self.db.readonly)
self.type_mon = MonitoredMenu(
self.top.get_widget('confidence'),
self.top.get_object('confidence'),
self.source_ref.set_confidence_level,
self.source_ref.get_confidence_level, [
(_('Very Low'), gen.lib.SourceRef.CONF_VERY_LOW),
@ -139,8 +144,8 @@ class EditSourceRef(EditReference):
self.db.readonly)
self.date = MonitoredDate(
self.top.get_widget("date_entry"),
self.top.get_widget("date_stat"),
self.top.get_object("date_entry"),
self.top.get_object("date_stat"),
self.source_ref.get_date_object(),
self.uistate,
self.track,
@ -151,8 +156,8 @@ class EditSourceRef(EditReference):
Create 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')
notebook_src = self.top.get_object('notebook_src')
notebook_ref = self.top.get_object('notebook_ref')
self._add_tab(notebook_src, self.primtab)
self._add_tab(notebook_ref, self.reftab)