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

8488: Use place displayer for headings

Browse Source
This commit is contained in:
Nick Hall 2015-05-28 19:21:59 +01:00
parent 8d188effac
commit a21dff8bf7
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gramps/gui/glade/mergeplace.glade
View File

@ -102,20 +102,21 @@ primary data for the merged place.</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButtonBox" id="vbuttonbox1"> <object class="GtkBox" id="vbox3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkRadioButton" id="handle_btn1"> <object class="GtkRadioButton" id="handle_btn1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<child> <child>
<object class="GtkLabel" id="label_handle_btn1"> <object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -133,12 +134,10 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">handle_btn1</property> <property name="group">handle_btn1</property>
<child> <child>
<object class="GtkLabel" id="label_handle_btn2"> <object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -155,7 +154,6 @@ primary data for the merged place.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
@ -206,11 +204,11 @@ primary data for the merged place.</property>
<child> <child>
<object class="GtkRadioButton" id="title_btn1"> <object class="GtkRadioButton" id="title_btn1">
<property name="label" translatable="yes">Title:</property> <property name="label" translatable="yes">Title:</property>
<property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
@ -221,11 +219,11 @@ primary data for the merged place.</property>
<child> <child>
<object class="GtkRadioButton" id="title_btn2"> <object class="GtkRadioButton" id="title_btn2">
<property name="label" translatable="yes">Title:</property> <property name="label" translatable="yes">Title:</property>
<property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">title_btn1</property> <property name="group">title_btn1</property>
</object> </object>
@ -240,8 +238,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
@ -255,8 +253,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">lat_btn1</property> <property name="group">lat_btn1</property>
</object> </object>
@ -271,8 +269,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
@ -286,8 +284,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">long_btn1</property> <property name="group">long_btn1</property>
</object> </object>
@ -302,8 +300,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
@ -317,8 +315,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">gramps_btn1</property> <property name="group">gramps_btn1</property>
</object> </object>
@ -329,8 +327,8 @@ primary data for the merged place.</property>
</child> </child>
<child> <child>
<object class="GtkEntry" id="title1"> <object class="GtkEntry" id="title1">
<property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="editable">False</property> <property name="editable">False</property>
</object> </object>
@ -341,8 +339,8 @@ primary data for the merged place.</property>
</child> </child>
<child> <child>
<object class="GtkEntry" id="title2"> <object class="GtkEntry" id="title2">
<property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="editable">False</property> <property name="editable">False</property>
</object> </object>
@ -425,13 +423,13 @@ primary data for the merged place.</property>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="name_btn1"> <object class="GtkRadioButton" id="name_btn1">
<property name="label" translatable="yes">place|Name:</property> <property name="label" translatable="yes" context="place">Name:</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">half</property> <property name="relief">half</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">start</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -442,13 +440,13 @@ primary data for the merged place.</property>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="name_btn2"> <object class="GtkRadioButton" id="name_btn2">
<property name="label" translatable="yes">place|Name:</property> <property name="label" translatable="yes" context="place">Name:</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">half</property> <property name="relief">half</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">name_btn1</property> <property name="group">name_btn1</property>
</object> </object>
@ -489,9 +487,9 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">half</property> <property name="relief">half</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">start</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -506,9 +504,9 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">half</property> <property name="relief">half</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">start</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">type_btn1</property> <property name="group">type_btn1</property>
</object> </object>
@ -549,9 +547,9 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">half</property> <property name="relief">half</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">start</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -566,8 +564,8 @@ primary data for the merged place.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">code_btn1</property> <property name="group">code_btn1</property>
</object> </object>
@ -619,7 +617,7 @@ primary data for the merged place.</property>
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Alternate locations, sources, urls, media objects and notes of both places will be combined.</property> <property name="label" translatable="yes">Alternative names, sources, urls, media objects and notes of both places will be combined.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
</object> </object>
<packing> <packing>

27
gramps/gui/merge/mergeplace.py
View File

@ -41,6 +41,8 @@ from gramps.gen.const import URL_MANUAL_PAGE
from ..display import display_help from ..display import display_help
from ..managedwindow import ManagedWindow from ..managedwindow import ManagedWindow
from gramps.gen.merge import MergePlaceQuery from gramps.gen.merge import MergePlaceQuery
from gramps.gen.display.place import displayer as place_displayer
from gramps.gen.config import config
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -76,15 +78,20 @@ class MergePlace(ManagedWindow):
_("Merge Places")) _("Merge Places"))
# Detailed selection widgets # Detailed selection widgets
title1 = self.pl1.get_title() if config.get('preferences.place-title'):
title2 = self.pl2.get_title() title1 = self.pl1.get_title()
entry1 = self.get_widget("title1") title2 = self.pl2.get_title()
entry2 = self.get_widget("title2") entry1 = self.get_widget("title1")
entry1.set_text(title1) entry2 = self.get_widget("title2")
entry2.set_text(title2) entry1.set_text(title1)
if entry1.get_text() == entry2.get_text(): entry2.set_text(title2)
for widget_name in ('title1', 'title2', 'title_btn1', 'title_btn2'): if entry1.get_text() == entry2.get_text():
self.get_widget(widget_name).set_sensitive(False) for widget_name in ('title1', 'title2',
'title_btn1', 'title_btn2'):
self.get_widget(widget_name).set_sensitive(False)
for widget_name in ('title1', 'title2',
'title_btn1', 'title_btn2'):
self.get_widget(widget_name).show()
for widget_name in ('name_btn1', 'name_btn2'): for widget_name in ('name_btn1', 'name_btn2'):
self.get_widget(widget_name).set_label(PLACE_NAME) self.get_widget(widget_name).set_label(PLACE_NAME)
@ -140,6 +147,8 @@ class MergePlace(ManagedWindow):
self.get_widget(widget_name).set_sensitive(False) self.get_widget(widget_name).set_sensitive(False)
# Main window widgets that determine which handle survives # Main window widgets that determine which handle survives
title1 = place_displayer.display(database, self.pl1)
title2 = place_displayer.display(database, self.pl2)
rbutton1 = self.get_widget("handle_btn1") rbutton1 = self.get_widget("handle_btn1")
rbutton_label1 = self.get_widget("label_handle_btn1") rbutton_label1 = self.get_widget("label_handle_btn1")
rbutton_label2 = self.get_widget("label_handle_btn2") rbutton_label2 = self.get_widget("label_handle_btn2")