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 2

Browse Source 
svn: r12509
This commit is contained in:
Gerald Britton
2009-05-06 19:15:55 +00:00
parent 0440ca1c2a
commit 05d6302cdd
23 changed files with 4054 additions and 3197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Editors/_EditAttribute.py
View File

@@ -32,6 +32,7 @@ mechanism for the user to edit attribute 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 MonitoredEntry, PrivacyButton, MonitoredDataType
_GLADE_FILE = 'editattribute.glade'
#-------------------------------------------------------------------------
#
# EditAttribute class
@@ -79,28 +81,31 @@ class EditAttribute(EditSecondary):
def _local_init(self):
self.width_key = Config.ATTRIBUTE_WIDTH
self.height_key = Config.ATTRIBUTE_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "attr_edit","gramps")
self.set_window(self.top.get_widget("attr_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("attr_edit"),
self.top.get_object('title'),
_('Attribute Editor'))
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 _setup_fields(self):
self.value_field = MonitoredEntry(
self.top.get_widget("attr_value"),
self.top.get_object("attr_value"),
self.obj.set_value, self.obj.get_value,
self.db.readonly)
self.priv = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.obj, self.db.readonly)
self.type_selector = MonitoredDataType(
self.top.get_widget("attr_menu"),
self.top.get_object("attr_menu"),
self.obj.set_type,
self.obj.get_type,
self.db.readonly,
@@ -121,7 +126,7 @@ class EditAttribute(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, attrib):
if not attrib:

31
src/Editors/_EditChildRef.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
#-------------------------------------------------------------------------
#
@@ -66,6 +66,7 @@ _RETURN = gtk.gdk.keyval_from_name("Return")
_KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
_LEFT_BUTTON = 1
_RIGHT_BUTTON = 3
_GLADE_FILE = 'editchildref.glade'
#-------------------------------------------------------------------------
#
@@ -90,19 +91,23 @@ class EditChildRef(EditSecondary):
def _local_init(self):
self.width_key = Config.CHILD_REF_WIDTH
self.height_key = Config.CHILD_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "cref_edit","gramps")
self.set_window(self.top.get_widget("cref_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("cref_edit"),
self.top.get_object("title"),
self.name,
_('Child Reference Editor'))
self.ok_button = self.top.get_widget('ok')
self.edit_button = self.top.get_widget('edit')
self.name_label = self.top.get_widget('name')
self.ok_button = self.top.get_object('ok')
self.edit_button = self.top.get_object('edit')
self.name_label = self.top.get_object('name')
self.name_label.set_text(self.name)
def _setup_fields(self):
self.frel = MonitoredDataType(
self.top.get_widget('frel'),
self.top.get_object('frel'),
self.obj.set_father_relation,
self.obj.get_father_relation,
self.db.readonly,
@@ -110,7 +115,7 @@ class EditChildRef(EditSecondary):
)
self.mrel = MonitoredDataType(
self.top.get_widget('mrel'),
self.top.get_object('mrel'),
self.obj.set_mother_relation,
self.obj.get_mother_relation,
self.db.readonly,
@@ -118,13 +123,13 @@ class EditChildRef(EditSecondary):
)
self.priv = PrivacyButton(
self.top.get_widget("private"),
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_help_button(self.top.get_object('help'))
self.define_cancel_button(self.top.get_object('cancel'))
self.define_ok_button(self.ok_button, self.save)
self.edit_button.connect('button-press-event', self.edit_child)
self.edit_button.connect('key-press-event', self.edit_child)
@@ -149,7 +154,7 @@ class EditChildRef(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 _post_init(self):
self.ok_button.grab_focus()

66
src/Editors/_EditFamily.py
View File

@@ -30,6 +30,8 @@ from bsddb import db as bsddb_db
from gettext import gettext as _
from DdTargets import DdTargets
import pickle
import os
#-------------------------------------------------------------------------
#
# enable logging for error handling
@@ -44,7 +46,6 @@ log = logging.getLogger(".")
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
from gtk import gdk
import pango
@@ -79,6 +80,7 @@ _RETURN = gdk.keyval_from_name("Return")
_KP_ENTER = gdk.keyval_from_name("KP_Enter")
_LEFT_BUTTON = 1
_RIGHT_BUTTON = 3
_GLADE_FILE = 'editfamily.glade'
class ChildEmbedList(EmbeddedList):
"""
@@ -515,10 +517,12 @@ class EditFamily(EditPrimary):
def build_interface(self):
self.width_key = Config.FAMILY_WIDTH
self.height_key = Config.FAMILY_HEIGHT
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.top = glade.XML(const.GLADE_FILE, "family_editor", "gramps")
self.set_window(self.top.get_widget("family_editor"), None, self.get_menu_title())
self.set_window(self.top.get_object("family_editor"), None, self.get_menu_title())
# HACK: how to prevent hidden items from showing
# when you use show_all?
@@ -526,23 +530,23 @@ class EditFamily(EditPrimary):
# FIXME: remove if we can use show()
self.window.show_all = self.window.show
self.fbirth = self.top.get_widget('fbirth')
self.fdeath = self.top.get_widget('fdeath')
self.fbirth_label = self.top.get_widget('label578')
self.fdeath_label = self.top.get_widget('label579')
self.fbirth = self.top.get_object('fbirth')
self.fdeath = self.top.get_object('fdeath')
self.fbirth_label = self.top.get_object('label578')
self.fdeath_label = self.top.get_object('label579')
self.mbirth = self.top.get_widget('mbirth')
self.mdeath = self.top.get_widget('mdeath')
self.mbirth_label = self.top.get_widget('label567')
self.mdeath_label = self.top.get_widget('label568')
self.mbirth = self.top.get_object('mbirth')
self.mdeath = self.top.get_object('mdeath')
self.mbirth_label = self.top.get_object('label567')
self.mdeath_label = self.top.get_object('label568')
self.mname = self.top.get_widget('mname')
self.fname = self.top.get_widget('fname')
self.mname = self.top.get_object('mname')
self.fname = self.top.get_object('fname')
self.mbutton_index = self.top.get_widget('mbutton_index')
self.mbutton_add = self.top.get_widget('mbutton_add')
self.mbutton_del = self.top.get_widget('mbutton_del')
self.mbutton_edit = self.top.get_widget('mbutton_edit')
self.mbutton_index = self.top.get_object('mbutton_index')
self.mbutton_add = self.top.get_object('mbutton_add')
self.mbutton_del = self.top.get_object('mbutton_del')
self.mbutton_edit = self.top.get_object('mbutton_edit')
self.tooltips.set_tip(self.mbutton_index,
_("Select a person as the mother"))
@@ -557,10 +561,10 @@ class EditFamily(EditPrimary):
self.mbutton_del.connect('clicked', self.del_mother_clicked)
self.mbutton_add.connect('clicked', self.add_mother_clicked)
self.fbutton_index = self.top.get_widget('fbutton_index')
self.fbutton_add = self.top.get_widget('fbutton_add')
self.fbutton_del = self.top.get_widget('fbutton_del')
self.fbutton_edit = self.top.get_widget('fbutton_edit')
self.fbutton_index = self.top.get_object('fbutton_index')
self.fbutton_add = self.top.get_object('fbutton_add')
self.fbutton_del = self.top.get_object('fbutton_del')
self.fbutton_edit = self.top.get_object('fbutton_edit')
self.tooltips.set_tip(self.fbutton_index,
_("Select a person as the father"))
@@ -576,11 +580,11 @@ class EditFamily(EditPrimary):
self.fbutton_add.connect('clicked', self.add_father_clicked)
#allow for a context menu
self.set_contexteventbox(self.top.get_widget("eventboxtop"))
self.set_contexteventbox(self.top.get_object("eventboxtop"))
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_ok_button(self.top.get_object('ok'), self.save)
self.define_cancel_button(self.top.get_object('cancel'))
def _can_be_replaced(self):
pass
@@ -588,18 +592,18 @@ class EditFamily(EditPrimary):
def _setup_fields(self):
self.private = PrivacyButton(
self.top.get_widget('private'),
self.top.get_object('private'),
self.obj,
self.db.readonly)
self.gid = MonitoredEntry(
self.top.get_widget('gid'),
self.top.get_object('gid'),
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,
@@ -607,7 +611,7 @@ class EditFamily(EditPrimary):
)
self.data_type = MonitoredDataType(
self.top.get_widget('marriage_type'),
self.top.get_object('marriage_type'),
self.obj.set_relationship,
self.obj.get_relationship,
self.db.readonly,
@@ -685,8 +689,8 @@ class EditFamily(EditPrimary):
self._setup_notebook_tabs( notebook)
notebook.show_all()
self.hidden = (notebook, self.top.get_widget('info'))
self.top.get_widget('vbox').pack_start(notebook, True)
self.hidden = (notebook, self.top.get_object('info'))
self.top.get_object('vbox').pack_start(notebook, True)
def update_father(self, handle):
self.load_parent(handle, self.fname, self.fbirth, self.fbirth_label,

34
src/Editors/_EditLocation.py
View File

@@ -26,7 +26,8 @@
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
import os
#-------------------------------------------------------------------------
#
@@ -40,6 +41,8 @@ from _EditSecondary import EditSecondary
from widgets import MonitoredEntry
from gettext import gettext as _
_GLADE_FILE = 'editlocation.glade'
#-------------------------------------------------------------------------
#
# LocationEditor class
@@ -54,63 +57,66 @@ class EditLocation(EditSecondary):
def _local_init(self):
self.width_key = Config.LOCATION_WIDTH
self.height_key = Config.LOCATION_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "loc_edit","gramps")
self.set_window(self.top.get_widget("loc_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("loc_edit"), None,
_('Location Editor'))
def _setup_fields(self):
self.street = MonitoredEntry(
self.top.get_widget("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.top.get_object("city"),
self.obj.set_city,
self.obj.get_city,
self.db.readonly)
self.state = MonitoredEntry(
self.top.get_widget("state"),
self.top.get_object("state"),
self.obj.set_state,
self.obj.get_state,
self.db.readonly)
self.postal = MonitoredEntry(
self.top.get_widget("postal"),
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.top.get_object("phone"),
self.obj.set_phone,
self.obj.get_phone,
self.db.readonly)
self.parish = MonitoredEntry(
self.top.get_widget("parish"),
self.top.get_object("parish"),
self.obj.set_parish,
self.obj.get_parish,
self.db.readonly)
self.county = MonitoredEntry(
self.top.get_widget("county"),
self.top.get_object("county"),
self.obj.set_county,
self.obj.get_county,
self.db.readonly)
self.country = MonitoredEntry(
self.top.get_widget("country"),
self.top.get_object("country"),
self.obj.set_country,
self.obj.get_country,
self.db.readonly)
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('button119'))
self.define_ok_button(self.top.get_widget('button118'),self.save)
self.define_help_button(self.top.get_widget('button128'))
self.define_cancel_button(self.top.get_object('button119'))
self.define_ok_button(self.top.get_object('button118'),self.save)
self.define_help_button(self.top.get_object('button128'))
def save(self,*obj):
if self.callback:

128
src/Editors/_EditMediaRef.py
View File

@@ -28,6 +28,7 @@
#
#-------------------------------------------------------------------------
from TransUtils import sgettext as _
import os
#-------------------------------------------------------------------------
#
@@ -35,7 +36,6 @@ from TransUtils import sgettext as _
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@@ -54,6 +54,7 @@ from DisplayTabs import (SourceEmbedList, AttrEmbedList, MediaBackRefList,
from widgets import MonitoredSpinButton, MonitoredEntry, PrivacyButton
from _EditReference import RefTab, EditReference
from AddMedia import AddMediaObject
_GLADE_FILE = 'editmediaref.glade'
#-------------------------------------------------------------------------
#
@@ -73,24 +74,25 @@ class EditMediaRef(EditReference):
def _local_init(self):
self.width_key = Config.MEDIA_REF_WIDTH
self.height_key = Config.MEDIA_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE,
"change_description","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('change_description'),
self.top.get_widget('title'),
self.set_window(self.top.get_object('change_description'),
self.top.get_object('title'),
_('Media Reference Editor'))
self.define_warn_box(self.top.get_widget("warn_box"))
self.top.get_widget("label427").set_text(_("Y coordinate|Y"))
self.top.get_widget("label428").set_text(_("Y coordinate|Y"))
self.define_warn_box(self.top.get_object("warn_box"))
self.top.get_object("label427").set_text(_("Y coordinate|Y"))
self.top.get_object("label428").set_text(_("Y coordinate|Y"))
tblref = self.top.get_widget('table50')
notebook = self.top.get_widget('notebook_ref')
tblref = self.top.get_object('table50')
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('table2')
notebook = self.top.get_widget('notebook_shared')
tblref = self.top.get_object('table2')
notebook = self.top.get_object('notebook_shared')
#recreate start page as GrampsTab
notebook.remove_page(0)
self.primtab = RefTab(self.dbstate, self.uistate, self.track,
@@ -113,105 +115,99 @@ class EditMediaRef(EditReference):
self.subpixmap.set_from_pixbuf(self.subpix)
mt = Mime.get_description(self.mtype)
if mt:
self.top.get_widget("type").set_text(mt)
else:
self.top.get_widget("type").set_text("")
self.top.get_object("type").set_text(mt if mt else "")
def _setup_fields(self):
ebox_shared = self.top.get_widget('eventbox')
ebox_shared = self.top.get_object('eventbox')
ebox_shared.connect('button-press-event', self.button_press_event)
if not self.dbstate.db.readonly:
self.button_press_coords = (0, 0)
ebox_ref = self.top.get_widget('eventbox1')
ebox_ref = self.top.get_object('eventbox1')
ebox_ref.connect('button-press-event', self.button_press_event_ref)
ebox_ref.connect('button-release-event', self.button_release_event_ref)
ebox_ref.connect('button-release-event',
self.button_release_event_ref)
ebox_ref.add_events(gtk.gdk.BUTTON_PRESS_MASK)
ebox_ref.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
self.pixmap = self.top.get_widget("pixmap")
self.pixmap = self.top.get_object("pixmap")
coord = self.source_ref.get_rectangle()
#upgrade path: set invalid (from eg old db) to none
if coord is not None and coord in (
(None, None, None, None),
(None,)*4,
(0, 0, 100, 100),
(coord[0], coord[1], coord[0], coord[1])
(coord[0], coord[1])*2
):
coord = None
self.rectangle = coord
self.subpixmap = self.top.get_widget("subpixmap")
self.subpixmap = self.top.get_object("subpixmap")
self.draw_preview()
corners = ["corner1_x", "corner1_y", "corner2_x", "corner2_y"]
if coord and isinstance(coord, tuple):
self.top.get_widget("corner1_x").set_value(coord[0])
self.top.get_widget("corner1_y").set_value(coord[1])
self.top.get_widget("corner2_x").set_value(coord[2])
self.top.get_widget("corner2_y").set_value(coord[3])
for index, corner in enumerate(corners):
self.top.get_object(corner).set_value(coord[index])
else:
self.top.get_widget("corner1_x").set_value(0)
self.top.get_widget("corner1_y").set_value(0)
self.top.get_widget("corner2_x").set_value(100)
self.top.get_widget("corner2_y").set_value(100)
for corner, value in zip(corners, [0, 0, 100, 100]):
self.top.get_object(corner).set_value(value)
if self.dbstate.db.readonly:
self.top.get_widget("corner1_x").set_sensitive(False)
self.top.get_widget("corner1_y").set_sensitive(False)
self.top.get_widget("corner2_x").set_sensitive(False)
self.top.get_widget("corner2_y").set_sensitive(False)
for corner in corners:
self.top.get_object(corner).set_sensitive(False)
self.corner1_x_spinbutton = MonitoredSpinButton(
self.top.get_widget("corner1_x"),
self.top.get_object("corner1_x"),
self.set_corner1_x,
self.get_corner1_x,
self.db.readonly)
self.corner1_y_spinbutton = MonitoredSpinButton(
self.top.get_widget("corner1_y"),
self.top.get_object("corner1_y"),
self.set_corner1_y,
self.get_corner1_y,
self.db.readonly)
self.corner2_x_spinbutton = MonitoredSpinButton(
self.top.get_widget("corner2_x"),
self.top.get_object("corner2_x"),
self.set_corner2_x,
self.get_corner2_x,
self.db.readonly)
self.corner2_y_spinbutton = MonitoredSpinButton(
self.top.get_widget("corner2_y"),
self.top.get_object("corner2_y"),
self.set_corner2_y,
self.get_corner2_y,
self.db.readonly)
self.descr_window = MonitoredEntry(
self.top.get_widget("description"),
self.top.get_object("description"),
self.source.set_description,
self.source.get_description,
self.db.readonly)
self.ref_privacy = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.source_ref,
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)
self.privacy = PrivacyButton(
self.top.get_widget("privacy"),
self.top.get_object("privacy"),
self.source,
self.db.readonly)
self.path_obj = MonitoredEntry(
self.top.get_widget("path"),
self.top.get_object("path"),
self.source.set_path,
self.source.get_path,
self.db.readonly)
@@ -227,10 +223,7 @@ class EditMediaRef(EditReference):
if self.rectangle is None:
self.rectangle = (0,0,100,100)
self.rectangle = (value,
self.rectangle[1],
self.rectangle[2],
self.rectangle[3])
self.rectangle = (value,) + self.rectangle[1:]
self.update_subpixmap()
def set_corner1_y(self, value):
@@ -244,11 +237,8 @@ class EditMediaRef(EditReference):
if self.rectangle is None:
self.rectangle = (0,0,100,100)
self.rectangle = (self.rectangle[0],
value,
self.rectangle[2],
self.rectangle[3])
self.update_subpixmap()
self.rectangle = self.rectangle[:1] + (value,) + self.rectangle[2:]
def set_corner2_x(self, value):
"""
@@ -261,10 +251,7 @@ class EditMediaRef(EditReference):
if self.rectangle is None:
self.rectangle = (0,0,100,100)
self.rectangle = (self.rectangle[0],
self.rectangle[1],
value,
self.rectangle[3])
self.rectangle = self.rectangle[:2] + (value,) + self.rectangle[3:]
self.update_subpixmap()
def set_corner2_y(self, value):
@@ -278,10 +265,7 @@ class EditMediaRef(EditReference):
if self.rectangle is None:
self.rectangle = (0,0,100,100)
self.rectangle = (self.rectangle[0],
self.rectangle[1],
self.rectangle[2],
value)
self.rectangle = self.rectangle[:3] + (value,)
self.update_subpixmap()
def get_corner1_x(self):
@@ -491,16 +475,16 @@ class EditMediaRef(EditReference):
self.draw_preview()
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('button84'))
self.define_ok_button(self.top.get_widget('button82'),self.save)
self.define_cancel_button(self.top.get_object('button84'))
self.define_ok_button(self.top.get_object('button82'),self.save)
def _create_tabbed_pages(self):
"""
Create 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')
notebook_ref = self.top.get_object('notebook_ref')
notebook_src = self.top.get_object('notebook_shared')
self._add_tab(notebook_src, self.primtab)
self._add_tab(notebook_ref, self.reftab)
@@ -561,18 +545,18 @@ class EditMediaRef(EditReference):
#save reference object in memory
coord = (
self.top.get_widget("corner1_x").get_value_as_int(),
self.top.get_widget("corner1_y").get_value_as_int(),
self.top.get_widget("corner2_x").get_value_as_int(),
self.top.get_widget("corner2_y").get_value_as_int(),
self.top.get_object("corner1_x").get_value_as_int(),
self.top.get_object("corner1_y").get_value_as_int(),
self.top.get_object("corner2_x").get_value_as_int(),
self.top.get_object("corner2_y").get_value_as_int(),
)
#do not set unset or invalid coord
if coord is not None and coord in (
(None, None, None, None),
(None,)*4,
(0, 0, 100, 100),
(coord[0], coord[1], coord[0], coord[1])
(coord[0], coord[1])*2
):
coord = None

30
src/Editors/_EditPersonRef.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 widgets import MonitoredEntry, PrivacyButton
from DisplayTabs import SourceEmbedList, NoteTab
_GLADE_FILE = 'editpersonref.glade'
#-------------------------------------------------------------------------
#
# EditPersonRef class
@@ -76,11 +78,15 @@ class EditPersonRef(EditSecondary):
def _local_init(self):
self.width_key = Config.PERSON_REF_WIDTH
self.height_key = Config.PERSON_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "pref_edit","gramps")
self.set_window(self.top.get_widget("pref_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("pref_edit"),
self.top.get_object("title"),
_('Person Reference Editor'))
self.person_label = self.top.get_widget('person')
self.person_label = self.top.get_object('person')
def _setup_fields(self):
@@ -89,21 +95,21 @@ class EditPersonRef(EditSecondary):
self.person_label.set_text(name_displayer.display(p))
self.street = MonitoredEntry(
self.top.get_widget("relationship"),
self.top.get_object("relationship"),
self.obj.set_relation,
self.obj.get_relation,
self.db.readonly)
self.priv = PrivacyButton(
self.top.get_widget("private"),
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.top.get_widget('select').connect('clicked',self._select_person)
#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)
self.top.get_object('select').connect('clicked',self._select_person)
def _select_person(self, obj):
from Selectors import selector_factory
@@ -136,7 +142,7 @@ class EditPersonRef(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 (_('Person Reference'),_('Person Reference Editor'))

48
src/Editors/_EditRepoRef.py
View File

@@ -27,13 +27,14 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
#-------------------------------------------------------------------------
#
@@ -49,6 +50,8 @@ from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList
from widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
from _EditReference import RefTab, EditReference
_GLADE_FILE = 'editreporef.glade'
#-------------------------------------------------------------------------
#
# EditRepoRef class
@@ -65,63 +68,66 @@ class EditRepoRef(EditReference):
self.width_key = Config.REPO_REF_WIDTH
self.height_key = Config.REPO_REF_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "repository_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('repository_ref_edit'),
self.top.get_widget('repo_title'),
self.set_window(self.top.get_object('repository_ref_edit'),
self.top.get_object('repo_title'),
_('Repository 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('table70')
notebook = self.top.get_widget('notebook_ref')
tblref = self.top.get_object('table70')
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('table69')
notebook = self.top.get_widget('notebook_src')
tblref = self.top.get_object('table69')
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_ok_button(self.top.get_object('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_object('cancel'))
def _setup_fields(self):
self.callno = MonitoredEntry(
self.top.get_widget("call_number"),
self.top.get_object("call_number"),
self.source_ref.set_call_number,
self.source_ref.get_call_number,
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)
self.privacy = PrivacyButton(
self.top.get_widget("private"),
self.top.get_object("private"),
self.source,
self.db.readonly)
self.privacy = PrivacyButton(
self.top.get_widget("private_ref"),
self.top.get_object("private_ref"),
self.source_ref,
self.db.readonly)
self.title = MonitoredEntry(
self.top.get_widget('repo_name'),
self.top.get_object('repo_name'),
self.source.set_name,
self.source.get_name,
self.db.readonly)
self.type_selector = MonitoredDataType(
self.top.get_widget("media_type"),
self.top.get_object("media_type"),
self.source_ref.set_media_type,
self.source_ref.get_media_type,
self.db.readonly,
@@ -129,7 +135,7 @@ class EditRepoRef(EditReference):
)
self.media_type_selector = MonitoredDataType(
self.top.get_widget("repo_type"),
self.top.get_object("repo_type"),
self.source.set_type,
self.source.get_type,
self.db.readonly,
@@ -142,8 +148,8 @@ class EditRepoRef(EditReference):
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)

29
src/Editors/_EditRepository.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,8 @@ from DisplayTabs import AddrEmbedList, WebEmbedList, NoteTab, SourceBackRefList
from Editors._EditPrimary import EditPrimary
from QuestionDialog import ErrorDialog
_GLADE_FILE = 'editrepository.glade'
class EditRepository(EditPrimary):
def __init__(self, dbstate, uistate, track, repository):
@@ -75,9 +77,12 @@ class EditRepository(EditPrimary):
def _local_init(self):
self.width_key = Config.REPO_WIDTH
self.height_key = Config.REPO_HEIGHT
self.glade = glade.XML(const.GLADE_FILE, "repository_editor","gramps")
self.set_window(self.glade.get_widget("repository_editor"), None,
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("repository_editor"), None,
self.get_menu_title())
def build_menu_names(self, source):
@@ -85,22 +90,22 @@ class EditRepository(EditPrimary):
def _setup_fields(self):
self.name = MonitoredEntry(self.glade.get_widget("repository_name"),
self.name = MonitoredEntry(self.glade.get_object("repository_name"),
self.obj.set_name, self.obj.get_name,
self.db.readonly)
self.type = MonitoredDataType(self.glade.get_widget("repository_type"),
self.type = MonitoredDataType(self.glade.get_object("repository_type"),
self.obj.set_type, self.obj.get_type,
self.db.readonly,
self.db.get_repository_types(),
)
self.call_number = MonitoredEntry(self.glade.get_widget('gid'),
self.call_number = 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)
def _create_tabbed_pages(self):
@@ -140,12 +145,12 @@ class EditRepository(EditPrimary):
self._setup_notebook_tabs(notebook)
notebook.show_all()
self.glade.get_widget("vbox").pack_start(notebook, True, True)
self.glade.get_object("vbox").pack_start(notebook, True, True)
def _connect_signals(self):
self.define_help_button(self.glade.get_widget('help'))
self.define_cancel_button(self.glade.get_widget('cancel'))
self.define_ok_button(self.glade.get_widget('ok'), self.save)
self.define_help_button(self.glade.get_object('help'))
self.define_cancel_button(self.glade.get_object('cancel'))
self.define_ok_button(self.glade.get_object('ok'), self.save)
def save(self, *obj):
self.ok_button.set_sensitive(False)

31
src/Editors/_EditUrl.py
View File

@@ -27,13 +27,14 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
#-------------------------------------------------------------------------
#
# GTK/Gnome modules
#
#-------------------------------------------------------------------------
from gtk import glade
import gtk
#-------------------------------------------------------------------------
#
@@ -45,6 +46,8 @@ import Config
from _EditSecondary import EditSecondary
from widgets import MonitoredEntry, PrivacyButton, MonitoredDataType
_GLADE_FILE = 'editurl.glade'
#-------------------------------------------------------------------------
#
# EditUrl class
@@ -60,18 +63,22 @@ class EditUrl(EditSecondary):
def _local_init(self):
self.width_key = Config.URL_WIDTH
self.height_key = Config.URL_HEIGHT
self.top = glade.XML(const.GLADE_FILE, "url_edit", "gramps")
self.jump = self.top.get_widget('jump')
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.top = gtk.Builder()
self.top.add_from_file(glade_file)
self.jump = self.top.get_object('jump')
self.set_window(self.top.get_widget("url_edit"),
self.top.get_widget("title"),
self.set_window(self.top.get_object("url_edit"),
self.top.get_object("title"),
_('Internet Address Editor'))
def _connect_signals(self):
self.jump.connect('clicked', self.jump_to)
self.define_cancel_button(self.top.get_widget('button125'))
self.define_ok_button(self.top.get_widget('button124'), self.save)
self.define_help_button(self.top.get_widget('button130'))
self.define_cancel_button(self.top.get_object('button125'))
self.define_ok_button(self.top.get_object('button124'), self.save)
self.define_help_button(self.top.get_object('button130'))
def jump_to(self, obj):
if self.obj.get_path():
@@ -79,18 +86,18 @@ class EditUrl(EditSecondary):
GrampsDisplay.url(self.obj.get_path())
def _setup_fields(self):
self.des = MonitoredEntry(self.top.get_widget("url_des"),
self.des = MonitoredEntry(self.top.get_object("url_des"),
self.obj.set_description,
self.obj.get_description, self.db.readonly)
self.addr = MonitoredEntry(self.top.get_widget("url_addr"),
self.addr = MonitoredEntry(self.top.get_object("url_addr"),
self.obj.set_path, self.obj.get_path,
self.db.readonly)
self.priv = PrivacyButton(self.top.get_widget("priv"),
self.priv = PrivacyButton(self.top.get_object("priv"),
self.obj, self.db.readonly)
self.type_sel = MonitoredDataType(self.top.get_widget("type"),
self.type_sel = MonitoredDataType(self.top.get_object("type"),
self.obj.set_type,
self.obj.get_type, self.db.readonly)