edit changes
svn: r5759
This commit is contained in:
Don Allingham
parent
fec1677a7e
commit
3bf46f706e
@ -55,19 +55,20 @@ import Spell
|
||||
import GrampsDisplay
|
||||
import RelLib
|
||||
import ReportUtils
|
||||
import DisplayTabs
|
||||
import AutoComp
|
||||
import GrampsWidgets
|
||||
|
||||
from DdTargets import DdTargets
|
||||
from WindowUtils import GladeIf
|
||||
from DisplayTabs import *
|
||||
from GrampsWidgets import *
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
class AttrEmbedList(DisplayTabs.EmbeddedList):
|
||||
class AttrEmbedList(EmbeddedList):
|
||||
|
||||
_HANDLE_COL = -1
|
||||
|
||||
@ -78,9 +79,8 @@ class AttrEmbedList(DisplayTabs.EmbeddedList):
|
||||
|
||||
def __init__(self,dbstate,uistate,track,data):
|
||||
self.data = data
|
||||
DisplayTabs.EmbeddedList.__init__(self, dbstate, uistate, track,
|
||||
_('Attributes'),
|
||||
DisplayTabs.FamilyAttrModel)
|
||||
EmbeddedList.__init__(self, dbstate, uistate, track,
|
||||
_('Attributes'), FamilyAttrModel)
|
||||
|
||||
def get_data(self):
|
||||
return self.data
|
||||
@ -88,7 +88,7 @@ class AttrEmbedList(DisplayTabs.EmbeddedList):
|
||||
def column_order(self):
|
||||
return ((1,0),(1,1))
|
||||
|
||||
class ChildEmbedList(DisplayTabs.EmbeddedList):
|
||||
class ChildEmbedList(EmbeddedList):
|
||||
|
||||
_HANDLE_COL = 8
|
||||
|
||||
@ -105,9 +105,8 @@ class ChildEmbedList(DisplayTabs.EmbeddedList):
|
||||
|
||||
def __init__(self,dbstate,uistate,track,family):
|
||||
self.family = family
|
||||
DisplayTabs.EmbeddedList.__init__(self, dbstate, uistate, track,
|
||||
_('Children'),
|
||||
DisplayTabs.ChildModel)
|
||||
EmbeddedList.__init__(self, dbstate, uistate, track,
|
||||
_('Children'), ChildModel)
|
||||
|
||||
def get_icon_name(self):
|
||||
return 'gramps-person'
|
||||
@ -166,6 +165,7 @@ class EditFamily(DisplayState.ManagedWindow):
|
||||
return id(self.family.handle)
|
||||
|
||||
def build_interface(self):
|
||||
|
||||
self.top = gtk.glade.XML(const.placesFile,"marriageEditor","gramps")
|
||||
self.gladeif = GladeIf(self.top)
|
||||
self.window = self.top.get_widget("marriageEditor")
|
||||
@ -217,14 +217,14 @@ class EditFamily(DisplayState.ManagedWindow):
|
||||
|
||||
self.child_list = ChildEmbedList(self.dbstate,self.uistate,
|
||||
self.track, self.family)
|
||||
self.event_list = DisplayTabs.EventEmbedList(self.dbstate,self.uistate,
|
||||
self.track,self.family)
|
||||
self.event_list = EventEmbedList(self.dbstate,self.uistate,
|
||||
self.track,self.family)
|
||||
self.attr_list = AttrEmbedList(self.dbstate, self.uistate, self.track,
|
||||
self.family.get_attribute_list())
|
||||
self.note_tab = DisplayTabs.NoteTab(self.dbstate, self.uistate, self.track,
|
||||
self.family.get_note_object())
|
||||
self.gallery_tab = DisplayTabs.GalleryTab(self.dbstate, self.uistate, self.track,
|
||||
self.family.get_media_list())
|
||||
self.note_tab = NoteTab(self.dbstate, self.uistate, self.track,
|
||||
self.family.get_note_object())
|
||||
self.gallery_tab = GalleryTab(self.dbstate, self.uistate, self.track,
|
||||
self.family.get_media_list())
|
||||
|
||||
self.notebook.insert_page(self.child_list)
|
||||
self.notebook.set_tab_label(self.child_list,self.child_list.get_tab_widget())
|
||||
|
||||
184
src/gramps.glade
184
src/gramps.glade
@ -2229,44 +2229,27 @@
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHSeparator" id="hseparator1">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTable" id="table10">
|
||||
<property name="border_width">6</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">3</property>
|
||||
<property name="n_columns">3</property>
|
||||
<property name="n_rows">2</property>
|
||||
<property name="n_columns">8</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">12</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label542">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Relationship Information</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label229">
|
||||
<property name="visible">True</property>
|
||||
@ -2296,6 +2279,28 @@
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="gid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">False</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label202">
|
||||
<property name="visible">True</property>
|
||||
@ -2315,10 +2320,10 @@
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
@ -2332,30 +2337,109 @@
|
||||
<property name="focus_on_click">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="left_attach">4</property>
|
||||
<property name="right_attach">5</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="gid">
|
||||
<widget class="GtkLabel" id="label590">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">False</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">*</property>
|
||||
<property name="activates_default">False</property>
|
||||
<property name="label" translatable="yes">Marker:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_CENTER</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="left_attach">5</property>
|
||||
<property name="right_attach">6</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkComboBoxEntry" id="marker">
|
||||
<property name="visible">True</property>
|
||||
<property name="add_tearoffs">False</property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">6</property>
|
||||
<property name="right_attach">7</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label542">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Relationship Information</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">8</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkToggleButton" id="togglebutton1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2672">
|
||||
<property name="visible">True</property>
|
||||
<property name="pixbuf">locked.png</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">7</property>
|
||||
<property name="right_attach">8</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user