diff --git a/gramps/src/Marriage.py b/gramps/src/Marriage.py index 43a2fa333..cf8b986c4 100644 --- a/gramps/src/Marriage.py +++ b/gramps/src/Marriage.py @@ -120,8 +120,10 @@ class Marriage: self.attr_list = self.get_widget("attr_list") self.attr_type = self.get_widget("attr_type") self.attr_value = self.get_widget("attr_value") - self.event_details = self.get_widget("event_details") - self.attr_details_field = self.get_widget("attr_details") + self.event_src_field = self.get_widget("event_srcinfo") + self.event_conf_field = self.get_widget("event_conf") + self.attr_src_field = self.get_widget("attr_srcinfo") + self.attr_conf_field = self.get_widget("attr_conf") self.lds_date = self.get_widget("lds_date") self.lds_temple = self.get_widget("lds_temple") self.lds_status = self.get_widget("lds_status") @@ -467,7 +469,13 @@ class Marriage: self.place_field.set_text(event.getPlaceName()) self.cause_field.set_text(event.getCause()) self.name_field.set_label(const.display_fevent(event.getName())) - self.event_details.set_text(Utils.get_detail_text(event)) + if len(event.getSourceRefList()) > 0: + psrc = event.getSourceRefList()[0] + self.event_src_field.set_text(psrc.getBase().getTitle()) + self.event_conf_field.set_text(const.confidence[psrc.getConfidence()]) + else: + self.event_src_field.set_text('') + self.event_conf_field.set_text('') self.descr_field.set_text(event.getDescription()) def on_attr_list_select_row(self,obj,row,b,c): @@ -475,7 +483,13 @@ class Marriage: self.attr_type.set_label(const.display_fattr(attr.getType())) self.attr_value.set_text(attr.getValue()) - self.attr_details_field.set_text(Utils.get_detail_text(attr)) + if len(attr.getSourceRefList()) > 0: + psrc = attr.getSourceRefList()[0] + self.attr_src_field.set_text(psrc.getBase().getTitle()) + self.attr_conf_field.set_text(const.confidence[psrc.getConfidence()]) + else: + self.attr_src_field.set_text('') + self.attr_conf_field.set_text('') def on_update_attr_clicked(self,obj): import AttrEdit diff --git a/gramps/src/marriage.glade b/gramps/src/marriage.glade index 6b4ac5c46..429edebe5 100644 --- a/gramps/src/marriage.glade +++ b/gramps/src/marriage.glade @@ -338,7 +338,7 @@ GtkTable table8 5 - 3 + 6 False 0 0 @@ -421,88 +421,10 @@ - - GtkLabel - marriageDate - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 - 3 - True - False - False - False - True - False - - - - - GtkLabel - marriagePlace - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 - 3 - True - False - False - False - True - False - - - - - GtkLabel - marriageDescription - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 - 3 - 3 - True - False - False - False - True - False - - - GtkLabel label218 - + GTK_JUSTIFY_CENTER False 1 @@ -527,7 +449,7 @@ GtkLabel - event_details + event_srcinfo GTK_JUSTIFY_CENTER False @@ -707,6 +629,58 @@ + + GtkLabel + marriageDate + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + marriagePlace + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + GtkLabel marriageCause @@ -719,7 +693,7 @@ 0 2 - 3 + 6 2 3 0 @@ -732,6 +706,110 @@ False + + + GtkLabel + marriageDescription + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 3 + 4 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label239 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 4 + 5 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label240 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 3 + 4 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + event_conf + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 5 + 6 + 4 + 5 + 3 + 3 + True + False + False + False + True + False + + @@ -988,7 +1066,7 @@ GtkTable table9 2 - 3 + 6 False 0 0 @@ -1019,36 +1097,10 @@ - - GtkLabel - attr_value - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 0 - 1 - 3 - 3 - True - False - False - False - True - False - - - GtkLabel label222 - + GTK_JUSTIFY_CENTER False 1 @@ -1071,32 +1123,6 @@ - - GtkLabel - attr_details - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 2 - 3 - 1 - 2 - 3 - 3 - False - False - False - False - True - False - - - GtkLabel label227 @@ -1148,6 +1174,136 @@ False + + + GtkLabel + label242 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 4 + 5 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_value + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 6 + 0 + 1 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + label243 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 3 + 4 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + attr_srcinfo + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + + + + + GtkLabel + attr_conf + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 5 + 6 + 1 + 2 + 3 + 3 + True + False + False + False + True + False + +