diff --git a/gramps/gen/config.py b/gramps/gen/config.py
index b0920b5aa..68d6352f9 100644
--- a/gramps/gen/config.py
+++ b/gramps/gen/config.py
@@ -293,6 +293,7 @@ register('preferences.invalid-date-format', "%s")
register('preferences.iprefix', 'I%04d')
register('preferences.name-format', 1)
register('preferences.place-format', 0)
+register('preferences.place-title', False)
register('preferences.patronimic-surname', False)
register('preferences.no-given-text', "[%s]" % _("Missing Given Name"))
register('preferences.no-record-text', "[%s]" % _("Missing Record"))
diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py
index 842def5c7..ec3b7b2d4 100644
--- a/gramps/gui/configure.py
+++ b/gramps/gui/configure.py
@@ -1013,6 +1013,12 @@ class GrampsPreferences(ConfigureDialog):
grid.attach(obox, 1, row, 2, 1)
row += 1
+ # Legacy place title mode
+ self.add_checkbox(grid,
+ _("Display legacy place title field in editors"),
+ row, 'preferences.place-title', stop=3)
+ row += 1
+
# Age precision:
# precision=1 for "year", 2: "year, month" or 3: "year, month, days"
obox = Gtk.ComboBoxText()
diff --git a/gramps/gui/editors/editplace.py b/gramps/gui/editors/editplace.py
index 00486cf09..725a9d96a 100644
--- a/gramps/gui/editors/editplace.py
+++ b/gramps/gui/editors/editplace.py
@@ -55,6 +55,7 @@ from ..widgets import (MonitoredEntry, PrivacyButton, MonitoredTagList,
from gramps.gen.errors import ValidationError
from gramps.gen.utils.place import conv_lat_lon
from gramps.gen.display.place import displayer as place_displayer
+from gramps.gen.config import config
from ..dialog import ErrorDialog
from ..glade import Glade
@@ -105,9 +106,12 @@ class EditPlace(EditPrimary):
def _setup_fields(self):
- self.title = MonitoredEntry(self.top.get_object("place_title"),
- self.obj.set_title, self.obj.get_title,
- self.db.readonly)
+ if config.get('preferences.place-title'):
+ self.top.get_object("place_title").show()
+ self.top.get_object("place_title_label").show()
+ self.title = MonitoredEntry(self.top.get_object("place_title"),
+ self.obj.set_title, self.obj.get_title,
+ self.db.readonly)
self.name = MonitoredEntry(self.top.get_object("name_entry"),
self.obj.set_name, self.obj.get_name,
diff --git a/gramps/gui/editors/editplaceref.py b/gramps/gui/editors/editplaceref.py
index 6bd1dfd5c..011d534ab 100644
--- a/gramps/gui/editors/editplaceref.py
+++ b/gramps/gui/editors/editplaceref.py
@@ -35,6 +35,7 @@ from gramps.gen.lib import NoteType
from gramps.gen.db import DbTxn
from gramps.gen.errors import ValidationError
from gramps.gen.utils.place import conv_lat_lon
+from gramps.gen.config import config
from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext
@@ -102,9 +103,13 @@ class EditPlaceRef(EditReference):
self.uistate, self.track,
self.db.readonly)
- self.title = MonitoredEntry(self.top.get_object("place_title"),
- self.source.set_title, self.source.get_title,
- self.db.readonly)
+ if config.get('preferences.place-title'):
+ self.top.get_object("place_title").show()
+ self.top.get_object("place_title_label").show()
+ self.title = MonitoredEntry(self.top.get_object("place_title"),
+ self.source.set_title,
+ self.source.get_title,
+ self.db.readonly)
self.name = MonitoredEntry(self.top.get_object("name_entry"),
self.source.set_name, self.source.get_name,
diff --git a/gramps/gui/glade/editplace.glade b/gramps/gui/glade/editplace.glade
index 1d3ae4645..a7d400eee 100644
--- a/gramps/gui/glade/editplace.glade
+++ b/gramps/gui/glade/editplace.glade
@@ -83,14 +83,14 @@
4
6
-