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

Solves several problems following merge of PRs

Browse Source
This commit is contained in:
SNoiraud 2019-06-11 14:29:32 +02:00
parent 7b3c86a4f5
commit 1ef467c9e3
5 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/plugins/view/fanchart2wayview.py
View File

@ -108,9 +108,6 @@ class FanChart2WayView(fanchart2way.FanChart2WayGrampsGUI, NavigationView):
self.additional_uis.append(FanChartView.additional_ui) self.additional_uis.append(FanChartView.additional_ui)
self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())] self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())]
self.func_list.update({
'<PRIMARY>J' : self.jump,
})
self.uistate.connect('font-changed', self.font_changed) self.uistate.connect('font-changed', self.font_changed)
def font_changed(self): def font_changed(self):

3
gramps/plugins/view/fanchartdescview.py
View File

@ -103,9 +103,6 @@ class FanChartDescView(fanchartdesc.FanChartDescGrampsGUI, NavigationView):
self.additional_uis.append(FanChartView.additional_ui) self.additional_uis.append(FanChartView.additional_ui)
self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())] self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())]
self.func_list.update({
'<PRIMARY>J' : self.jump,
})
self.uistate.connect('font-changed', self.font_changed) self.uistate.connect('font-changed', self.font_changed)
def font_changed(self): def font_changed(self):

3
gramps/plugins/view/fanchartview.py
View File

@ -98,9 +98,6 @@ class FanChartView(fanchart.FanChartGrampsGUI, NavigationView):
self.additional_uis.append(self.additional_ui) self.additional_uis.append(self.additional_ui)
self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())] self.allfonts = [x for x in enumerate(SystemFonts().get_system_fonts())]
self.func_list.update({
'<PRIMARY>J' : self.jump,
})
self.uistate.connect('font-changed', self.font_changed) self.uistate.connect('font-changed', self.font_changed)
def font_changed(self): def font_changed(self):

6
gramps/plugins/view/pedigreeview.py
View File

@ -260,8 +260,6 @@ class PersonBoxWidgetCairo(_PersonWidgetBase):
alh = self.get_allocated_height() alh = self.get_allocated_height()
if not self.textlayout: if not self.textlayout:
self.textlayout = PangoCairo.create_layout(context) self.textlayout = PangoCairo.create_layout(context)
if is_quartz():
PangoCairo.context_set_resolution(self.textlayout.get_context(), 72)
# The following seems like it Should work, but it doesn't # The following seems like it Should work, but it doesn't
# font_desc = self.get_style_context().get_property( # font_desc = self.get_style_context().get_property(
# "font", Gtk.StateFlags.NORMAL) # "font", Gtk.StateFlags.NORMAL)
@ -571,10 +569,6 @@ class PedigreeView(NavigationView):
self.show_unknown_people = self._config.get( self.show_unknown_people = self._config.get(
'interface.pedview-show-unknown-people') 'interface.pedview-show-unknown-people')
self.func_list.update({
'<PRIMARY>J' : self.jump,
})
# use symbols # use symbols
self.symbols = Symbols() self.symbols = Symbols()
self.uistate.connect('font-changed', self.reload_symbols) self.uistate.connect('font-changed', self.reload_symbols)

2
gramps/plugins/webreport/narrativeweb.py
View File

@ -80,6 +80,7 @@ from gramps.gen.display.place import displayer as _pd
from gramps.gen.proxy import CacheProxyDb from gramps.gen.proxy import CacheProxyDb
from gramps.plugins.lib.libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS from gramps.plugins.lib.libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS
from gramps.gen.relationship import get_relationship_calculator from gramps.gen.relationship import get_relationship_calculator
from gramps.gen.filters import reload_custom_filters
#------------------------------------------------ #------------------------------------------------
# specific narrative web import # specific narrative web import
@ -2172,6 +2173,7 @@ class NavWebOptions(MenuReportOptions):
Update the filter list based on the selected person Update the filter list based on the selected person
""" """
gid = self.__pid.get_value() gid = self.__pid.get_value()
reload_custom_filters()
person = self.__db.get_person_from_gramps_id(gid) person = self.__db.get_person_from_gramps_id(gid)
filter_list = utils.get_person_filters(person, include_single=False) filter_list = utils.get_person_filters(person, include_single=False)
self.__filter.set_filters(filter_list) self.__filter.set_filters(filter_list)