Add Unknown and Other gender avatars (#597)

* Add Unknown and Other gender avatars

* Lined avatars

* Update Custom avatar choosers

Author: DaveSch-gramps

GraphView/avatars.py

@@ -60,6 +60,7 @@ def __init__(self, config):
                        1: (_('Dark (default)'), 'dark'),
                        2: (_('Light'), 'light'),
                        3: (_('Cartoon'), 'cartoon'),
+                       4: (_('Modern'), 'modern'),
                       }
 
         self.style = 1
@@ -87,6 +88,10 @@ def get_avatar(self, gender):
                 avatar = self.config.get('interface.graphview-avatars-male')
             elif gender == Person.FEMALE:
                 avatar = self.config.get('interface.graphview-avatars-female')
+            elif gender == Person.UNKNOWN:
+                avatar = self.config.get('interface.graphview-avatars-unknown')
+            elif gender == Person.OTHER:
+                avatar = self.config.get('interface.graphview-avatars-other')
             if avatar:
                 return avatar
             else:
@@ -98,6 +103,10 @@ def get_avatar(self, gender):
             return os.path.join(self.path, style, 'person_male.png')
         if gender == Person.FEMALE:
             return os.path.join(self.path, style, 'person_female.png')
+        if gender == Person.UNKNOWN:
+            return os.path.join(self.path, style, 'person_unknown.png')
+        if gender == Person.OTHER:
+            return os.path.join(self.path, style, 'person_other.png')
 
     def get_styles_list(self):
         """
@@ -108,4 +117,3 @@ def get_styles_list(self):
         for key, item in self.styles.items():
             styles_list.append((key, item[0]))
         return styles_list
-

GraphView/avatars/modern/person_female.png

@@ -157,6 +157,8 @@ class GraphView(NavigationView):
         ('interface.graphview-avatars-style', 1),
         ('interface.graphview-avatars-male', ''),       # custom avatar
         ('interface.graphview-avatars-female', ''),     # custom avatar
+        ('interface.graphview-avatars-unknown', ''),    # custom avatar
+        ('interface.graphview-avatars-other', ''),      # custom avatar
         ('interface.graphview-show-full-dates', False),
         ('interface.graphview-show-places', False),
         ('interface.graphview-place-format', 0),
@@ -469,6 +471,22 @@ def cb_female_avatar_set(self, file_chooser_button):
                          file_chooser_button.get_filename())
         self.graph_widget.populate(self.get_active())
 
+    def cb_unknown_avatar_set(self, file_chooser_button):
+        """
+        Called when the configuration menu changes the unknown sex avatar.
+        """
+        self._config.set('interface.graphview-avatars-unknown',
+                         file_chooser_button.get_filename())
+        self.graph_widget.populate(self.get_active())
+
+    def cb_other_avatar_set(self, file_chooser_button):
+        """
+        Called when the configuration menu changes the other sex avatar.
+        """
+        self._config.set('interface.graphview-avatars-other',
+                         file_chooser_button.get_filename())
+        self.graph_widget.populate(self.get_active())
+
     def cb_update_show_full_dates(self, _client, _cnxn_id, entry, _data):
         """
         Called when the configuration menu changes the date setting.
@@ -836,6 +854,32 @@ def theme_config_panel(self, configdialog):
         grid.attach(FCB_female, 2, row, 1, 1)
         self.avatar_widgets.append(lbl)
         self.avatar_widgets.append(FCB_female)
+
+        row += 1
+        lbl = Gtk.Label(label=_('Unknown avatar:'), halign=Gtk.Align.END)
+        FCB_unknown = Gtk.FileChooserButton.new(_('Choose Unknown avatar'),
+                                             Gtk.FileChooserAction.OPEN)
+        FCB_unknown.add_filter(file_filter)
+        FCB_unknown.set_filename(
+            self._config.get('interface.graphview-avatars-unknown'))
+        FCB_unknown.connect('file-set', self.cb_unknown_avatar_set)
+        grid.attach(lbl, 1, row, 1, 1)
+        grid.attach(FCB_unknown, 2, row, 1, 1)
+        self.avatar_widgets.append(lbl)
+        self.avatar_widgets.append(FCB_unknown)
+
+        row += 1
+        lbl = Gtk.Label(label=_('Other avatar:'), halign=Gtk.Align.END)
+        FCB_other = Gtk.FileChooserButton.new(_('Choose Other avatar'),
+                                             Gtk.FileChooserAction.OPEN)
+        FCB_other.add_filter(file_filter)
+        FCB_other.set_filename(
+            self._config.get('interface.graphview-avatars-other'))
+        FCB_other.connect('file-set', self.cb_other_avatar_set)
+        grid.attach(lbl, 1, row, 1, 1)
+        grid.attach(FCB_other, 2, row, 1, 1)
+        self.avatar_widgets.append(lbl)
+        self.avatar_widgets.append(FCB_other)
         # ===================================================================
 
         row += 1