Merge pull request #369 from prculley/bug9998

bug 9998 partial fix for Note editor Toolbar overflow icons missing
This commit is contained in:
Sam Manzi 2017-04-02 10:04:22 +10:00 committed by GitHub
commit 141cd18651

View File

@ -78,6 +78,8 @@ if has_display():
FORMAT_TOOLBAR = '''
<ui>
<toolbar name="ToolBar">
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
@ -86,8 +88,6 @@ FORMAT_TOOLBAR = '''
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="%d"/>
<toolitem action="spring"/>
<toolitem action="clear"/>
</toolbar>
@ -464,13 +464,14 @@ class StyledTextEditor(Gtk.TextView):
# ...then the normal actions, which have a ToolButton as proxy
format_actions = [
(str(StyledTextTagType.FONTCOLOR), 'gramps-font-color', None, None,
_('Font Color'), self._on_action_activate),
(str(StyledTextTagType.HIGHLIGHT), 'gramps-font-bgcolor', None,
None, _('Background Color'), self._on_action_activate),
(str(StyledTextTagType.LINK), 'go-jump', None, None,
(str(StyledTextTagType.FONTCOLOR), 'gramps-font-color',
_('Font Color'), None, _('Font Color'), self._on_action_activate),
(str(StyledTextTagType.HIGHLIGHT), 'gramps-font-bgcolor',
_('Background Color'), None, _('Background Color'),
self._on_action_activate),
(str(StyledTextTagType.LINK), 'go-jump', _('Link'), None,
_('Link'), self._on_link_activate),
('clear', 'edit-clear', None, None,
('clear', 'edit-clear', _('Clear Markup'), None,
_('Clear Markup'), self._format_clear_cb),
]