ibus-typing-booster February 2017

ibus-typing-booster@lists.fedorahosted.org

1 participants
60 discussions

[ibus-typing-booster] master: Release 1.5.23 (d58fe1b)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit d58fe1b3bd54057bab5f44f15596589d937e8de3 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Feb 27 01:56:20 2017 +0100 Release 1.5.23 >--------------------------------------------------------------- ChangeLog | 19 +++++++++++++ configure.ac | 2 +- typing-booster.appdata.xml | 64 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0bd0f4..4608f48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,23 @@ * Author: Mike FABIAN <mfabian(a)redhat.com> +* 27 Feb 2017 Released 1.5.23 version +* Update translations from zanata (de, ja, pl, uk updated) +* emoji_picker.py: Add a menu button to change the font for the emoji +* emoji-picker: Make background colour of the flowbox listing the emoji white +* emoji-picker: Use ��Symbola�� as the default font +* Remember the font and the fontsize in a config file +* emoji_picker.py: Add a spin button to change the font size of the emoji +* Add option to the emoji-picker to load *all* Unicode characters +* UI redesign of the emoji-picker +* Return an empty list immediately if candidates() is called with an empty search string +* Make the fontsize for the names of the emoji in the search results smaller +* Make the search in emoji-picker a bit more responsive by using GLib.idle_add() +* Save the recently used emoji immediately, not only when the program quits +* Set default font size of emoji-picker to 24 instead of 16 +* Set the emoji font only for the emoji, not for its name in the search results +* Set WM_CLASS of emoji-picker and ibus-setup-typing-booster correctly +* Add ��Icon�� and ��Categories�� to emoji-picker.desktop + +* Author: Mike FABIAN <mfabian(a)redhat.com> * 21 Feb 2017 Released 1.5.22 version * Update translations from zanata (de, fr, pl, uk updated) * Add an emoji-picker diff --git a/configure.ac b/configure.ac index 2b73691..6e84d57 100755 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ m4_define([package_name], [ibus-typing-booster]) m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [5]) -m4_define([ibus_micro_version], [22]) +m4_define([ibus_micro_version], [23]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff --git a/typing-booster.appdata.xml b/typing-booster.appdata.xml index 256a2f2..8af3168 100644 --- a/typing-booster.appdata.xml +++ b/typing-booster.appdata.xml @@ -16,6 +16,70 @@ <url type="bugtracker">https://github.com/mike-fabian/ibus-typing-booster/issues</url> <url type="help">https://mike-fabian.github.io/ibus-typing-booster/documentation.html</url> <releases> + <release version="1.5.23" date="2017-02-27" urgency="medium"> + <description> + <ul> + <li> + Update translations from zanata (de, ja, pl, uk updated) + </li> + <li> + emoji_picker.py: Add a menu button to change the font for + the emoji + </li> + <li> + emoji-picker: Make background colour of the flowbox + listing the emoji white + </li> + <li> + emoji-picker: Use ��Symbola�� as the default font + </li> + <li> + Remember the font and the fontsize in a config file + </li> + <li> + emoji_picker.py: Add a spin button to change the font size + of the emoji + </li> + <li> + Add option to the emoji-picker to load *all* Unicode + characters + </li> + <li> + UI redesign of the emoji-picker + </li> + <li> + Return an empty list immediately if candidates() is called + with an empty search string + </li> + <li> + Make the fontsize for the names of the emoji in the search + results smaller + </li> + <li> + Make the search in emoji-picker a bit more responsive by + using GLib.idle_add() + </li> + <li> + Save the recently used emoji immediately, not only when + the program quits + </li> + <li> + Set default font size of emoji-picker to 24 instead of 16 + </li> + <li> + Set the emoji font only for the emoji, not for its name in + the search results + </li> + <li> + Set WM_CLASS of emoji-picker and ibus-setup-typing-booster + correctly + </li> + <li> + Add ��Icon�� and ��Categories�� to emoji-picker.desktop + </li> + </ul> + </description> + </release> <release version="1.5.22" date="2017-02-21" urgency="medium"> <description> <ul>

1 0

[ibus-typing-booster] master: Update translations from zanata (de, ja, pl, uk updated) (bd3ba0b)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit bd3ba0b948175ceaee600e0788f8caca1440a387 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sun Feb 26 03:10:04 2017 +0100 Update translations from zanata (de, ja, pl, uk updated) >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^bd3ba0b948175ceaee600e0788f8caca1440a387~1 bd3ba0b948175ceaee600e0788f8caca1440a387

1 0

[ibus-typing-booster] master: emoji_picker.py: Add a menu button to change the font for the emoji (a35c726)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit a35c726f4c740fa9c33a2e123716bb47320ab6d7 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Feb 27 12:39:43 2017 +0100 emoji_picker.py: Add a menu button to change the font for the emoji >--------------------------------------------------------------- engine/emoji_picker.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 0ed9fb4..17683ae 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -230,6 +230,16 @@ class EmojiPickerUI(Gtk.Window): self._toggle_search_button.connect( 'clicked', self.on_toggle_search_button_clicked) self._header_bar.pack_start(self._toggle_search_button) + self._font_button = Gtk.Button() + self._font_button.set_always_show_image(True) + self._font_button.set_image_position(Gtk.PositionType.LEFT) + self._font_button.set_image( + Gtk.Image.new_from_icon_name( + 'preferences-desktop-font', Gtk.IconSize.BUTTON)) + self._font_button.set_label(self._font) + self._font_button.connect( + 'clicked', self.on_font_button_clicked) + self._header_bar.pack_start(self._font_button) self._fontsize_spin_button = Gtk.SpinButton() self._fontsize_spin_button.set_numeric(True) self._fontsize_spin_button.set_can_focus(True) @@ -1145,6 +1155,8 @@ class EmojiPickerUI(Gtk.Window): def on_fontsize_adjustment_value_changed(self, adjustment): ''' + The fontsize adjustment in the header bar has been changed + :param adjustment: The adjustment used to change the fontsize :type adjustment: Gtk.Adjustment object ''' @@ -1158,6 +1170,127 @@ class EmojiPickerUI(Gtk.Window): self._busy_start() GLib.idle_add(self._change_flowbox_font) + def _list_font_names(self): + ''' + Returns a list of font names available on the system + + :rtype: List of strings + ''' + pango_context = self.get_pango_context() + families = pango_context.list_families() + names = [family.get_name() for family in families] + return names + + def _fill_listbox_font(self, filter_text): + if _ARGS.debug: + sys.stdout.write( + '_fill_listbox_font() filter_text = %s\n' + %filter_text) + for child in self._font_popover_scroll.get_children(): + self._font_popover_scroll.remove(child) + self._font_popover_listbox = Gtk.ListBox() + self._font_popover_scroll.add(self._font_popover_listbox) + self._font_popover_listbox.set_visible(True) + self._font_popover_listbox.set_vexpand(True) + self._font_popover_listbox.set_selection_mode(Gtk.SelectionMode.SINGLE) + self._font_popover_listbox.set_activate_on_single_click(True) + self._font_popover_listbox.connect( + 'row-selected', self.on_font_selected) + fonts = [''] + [ + font + for font in self._list_font_names() + if filter_text.replace(' ','').lower() + in font.replace(' ', '').lower()] + for font in fonts: + label = Gtk.Label(font) + label.set_xalign(0) + margin = 1 + label.set_margin_start(margin) + label.set_margin_end(margin) + label.set_margin_top(margin) + label.set_margin_bottom(margin) + self._font_popover_listbox.insert(label,-1) + self._font_popover.show_all() + + def on_font_search_entry_search_changed(self, search_entry): + ''' + Signal handler for changed text in the font search entry + + :param widget: The search entry + :type widget: Gtk.SearchEntry object + ''' + filter_text = search_entry.get_text() + if _ARGS.debug: + sys.stdout.write( + 'on_font_search_entry_search_changed() filter_text = %s\n' + %filter_text) + self._fill_listbox_font(filter_text) + + def on_font_selected(self, dummy_listbox, listbox_row): + ''' + Signal handler for selecting a font + + :param dummy_listbox: The list box used to select a font + :type dummy_listbox: Gtk.ListBox object + :param listbox_row: A row containing a font name + :type listbox_row: Gtk.ListBoxRow object + ''' + font = listbox_row.get_child().get_text() + if _ARGS.debug: + sys.stdout.write( + 'on_font_selected() font = %s\n' %repr(font)) + if GTK_VERSION >= (3, 22, 0): + self._font_popover.popdown() + self._font_popover.hide() + self._font = font + self._font_button.set_label(self._font) + self._save_options() + self._busy_start() + GLib.idle_add(self._change_flowbox_font) + + def on_font_button_clicked(self, button): + ''' + The font button in the header bar has been clicked + + :param button: The font button + :type button: Gtk.Button object + ''' + if _ARGS.debug: + sys.stdout.write( + 'on_font_button_clicked()\n') + self._font_popover = Gtk.Popover() + self._font_popover.set_relative_to(self._font_button) + self._font_popover.set_position(Gtk.PositionType.BOTTOM) + self._font_popover.set_vexpand(True) + font_popover_vbox = Gtk.VBox() + margin = 12 + font_popover_vbox.set_margin_start(margin) + font_popover_vbox.set_margin_end(margin) + font_popover_vbox.set_margin_top(margin) + font_popover_vbox.set_margin_bottom(margin) + font_popover_vbox.set_spacing(margin) + font_popover_label = Gtk.Label() + font_popover_label.set_text(_('Set Font')) + font_popover_label.set_visible(True) + font_popover_label.set_halign(Gtk.Align.FILL) + font_popover_vbox.pack_start(font_popover_label, False, False, 0) + font_popover_search_entry = Gtk.SearchEntry() + font_popover_search_entry.set_can_focus(True) + font_popover_search_entry.set_visible(True) + font_popover_search_entry.set_halign(Gtk.Align.FILL) + font_popover_search_entry.set_hexpand(False) + font_popover_search_entry.set_vexpand(False) + font_popover_search_entry.connect( + 'search_changed', self.on_font_search_entry_search_changed) + font_popover_vbox.pack_start(font_popover_search_entry, False, False, 0) + self._font_popover_scroll = Gtk.ScrolledWindow() + self._fill_listbox_font('') + font_popover_vbox.pack_start(self._font_popover_scroll, True, True, 0) + self._font_popover.add(font_popover_vbox) + if GTK_VERSION >= (3, 22, 0): + self._font_popover.popup() + self._font_popover.show_all() + def get_languages(): ''' Return the list of languages.

1 0

[ibus-typing-booster] master: Fix protected-access pylint warnings for _expand_languages and _is_invisible (4f8a443)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 4f8a4439f40f7b69a715bc195e0a36b23e3bc87d Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Feb 27 09:03:25 2017 +0100 Fix protected-access pylint warnings for _expand_languages and _is_invisible >--------------------------------------------------------------- engine/emoji_picker.py | 12 ++++++------ engine/itb_emoji.py | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 667eacb..0ed9fb4 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -168,7 +168,7 @@ class EmojiPickerUI(Gtk.Window): languages=self._languages, unicode_data_all=unicode_data_all) self._gettext_translations = {} - for language in itb_emoji._expand_languages(self._languages): + for language in itb_emoji.expand_languages(self._languages): mo_file = gettext.find(DOMAINNAME, languages=[language]) if (mo_file and @@ -311,7 +311,7 @@ class EmojiPickerUI(Gtk.Window): self._read_recently_used() self._emoji_by_label = self._emoji_matcher.emoji_by_label() - expanded_languages = itb_emoji._expand_languages(self._languages) + expanded_languages = itb_emoji.expand_languages(self._languages) first_language_with_categories = -1 number_of_empty_languages = 0 for language_index, language in enumerate(expanded_languages): @@ -355,7 +355,7 @@ class EmojiPickerUI(Gtk.Window): if _ARGS.debug: sys.stdout.write( 'expanded_languages = %s\n' - %itb_emoji._expand_languages(self._languages) + %itb_emoji.expand_languages(self._languages) + 'first_language_with_categories = %s\n' %first_language_with_categories + 'number_of_empty_languages = %s\n' @@ -467,7 +467,7 @@ class EmojiPickerUI(Gtk.Window): ''' description = ' '.join(['U+%X' %ord(character) for character in emoji]) description += '\n' - for language in itb_emoji._expand_languages(self._languages): + for language in itb_emoji.expand_languages(self._languages): name = self._emoji_matcher.name(emoji, language=language) if name: description += '%s (%s)\n' %(name, language) @@ -486,7 +486,7 @@ class EmojiPickerUI(Gtk.Window): :type label: Gtk.Label object ''' description = self._emoji_description(emoji) - if itb_emoji._is_invisible(emoji): + if itb_emoji.is_invisible(emoji): label.set_tooltip_text( description + '\n\n' + _('Click to copy')) else: @@ -555,7 +555,7 @@ class EmojiPickerUI(Gtk.Window): while Gtk.events_pending(): Gtk.main_iteration() label = Gtk.Label() - if itb_emoji._is_invisible(emoji): + if itb_emoji.is_invisible(emoji): description = self._emoji_description(emoji) label.set_text('%s' %emoji + description) else: diff --git a/engine/itb_emoji.py b/engine/itb_emoji.py index 38cf06b..3c9a6ed 100644 --- a/engine/itb_emoji.py +++ b/engine/itb_emoji.py @@ -165,7 +165,7 @@ VALID_CHARACTERS = { '��', # ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM } -def _is_invisible(text): +def is_invisible(text): '''Checks whether a text is invisible Returns True if the text is invisible, False if not. @@ -179,16 +179,16 @@ def _is_invisible(text): Examples: - >>> _is_invisible('a') + >>> is_invisible('a') False - >>> _is_invisible(' ') + >>> is_invisible(' ') True - >>> _is_invisible(' a') + >>> is_invisible(' a') False - >>> _is_invisible(' ') + >>> is_invisible(' ') True ''' invisible = True @@ -233,7 +233,7 @@ SPANISH_419_LOCALES = ( 'es_PA', 'es_PE', 'es_PR', 'es_PY', 'es_SV', 'es_US', 'es_UY', 'es_VE',) -def _expand_languages(languages): +def expand_languages(languages): '''Expands the given list of languages by including fallbacks. Returns a possibly longer list of languages by adding @@ -245,10 +245,10 @@ def _expand_languages(languages): Examples: - >>> _expand_languages(['es_MX', 'es_ES', 'ja_JP']) + >>> expand_languages(['es_MX', 'es_ES', 'ja_JP']) ['es_MX', 'es_419', 'es', 'es_ES', 'es', 'ja_JP', 'ja', 'en'] - >>> _expand_languages(['zh_Hant', 'zh_CN', 'zh_TW', 'zh_SG', 'zh_HK', 'zh_MO']) + >>> expand_languages(['zh_Hant', 'zh_CN', 'zh_TW', 'zh_SG', 'zh_HK', 'zh_MO']) ['zh_Hant', 'zh_CN', 'zh', 'zh_TW', 'zh_Hant', 'zh_SG', 'zh', 'zh_HK', 'zh_Hant', 'zh_MO', 'zh_Hant', 'en'] ''' expanded_languages = [] @@ -329,7 +329,7 @@ class EmojiMatcher(): ''' self._languages = languages self._gettext_translations = {} - for language in _expand_languages(self._languages): + for language in expand_languages(self._languages): mo_file = gettext.find(DOMAINNAME, languages=[language]) if (mo_file and @@ -384,7 +384,7 @@ class EmojiMatcher(): self._load_unicode_data() self._load_emojione_data() if cldr_data: - for language in _expand_languages(self._languages): + for language in expand_languages(self._languages): self._load_cldr_annotation_data(language) def get_languages(self): @@ -557,13 +557,13 @@ class EmojiMatcher(): ] if (IMPORT_PYKAKASI_SUCCESSFUL - and 'ja' in _expand_languages(self._languages)): + and 'ja' in expand_languages(self._languages)): KAKASI_INSTANCE.setMode('H', 'H') KAKASI_INSTANCE.setMode('K', 'H') KAKASI_INSTANCE.setMode('J', 'H') kakasi_converter = KAKASI_INSTANCE.getConverter() - for language in _expand_languages(self._languages): + for language in expand_languages(self._languages): if self._gettext_translations[language]: translated_categories = [] for category in categories: @@ -1235,7 +1235,7 @@ class EmojiMatcher(): else: display_name = self.name(emoji_key[0]) if (len(emoji_key[0]) == 1 - and _is_invisible(emoji_key[0])): + and is_invisible(emoji_key[0])): # Add the code point to the display name of # ��invisible�� characters: display_name = ('U+%X' %ord(emoji_key[0]) @@ -1350,7 +1350,7 @@ class EmojiMatcher(): return self._emoji_dict[(emoji_string, language)]['names'][0] else: return '' - for language in _expand_languages(self._languages): + for language in expand_languages(self._languages): if ((emoji_string, language) in self._emoji_dict and 'names' in self._emoji_dict[(emoji_string, language)]): return self._emoji_dict[(emoji_string, language)]['names'][0] @@ -1419,7 +1419,7 @@ class EmojiMatcher(): ''' candidate_scores = {} original_labels = {} - expanded_languages = _expand_languages(self._languages) + expanded_languages = expand_languages(self._languages) label_keys = ('ucategories', 'categories', 'keywords') for language in expanded_languages: original_labels[language] = set() @@ -1454,7 +1454,7 @@ class EmojiMatcher(): else: similar_name = self.name(similar_string) if (len(similar_string) == 1 - and _is_invisible(similar_string)): + and is_invisible(similar_string)): # Add the code point to the display name of # ��invisible�� characters: similar_name = ('U+%X' %ord(similar_string)

1 0

[ibus-typing-booster] master: Fix some pylint warnings (492a758)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 492a758d5b80f9273d470bdddd3ad0d665112683 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Feb 27 07:34:15 2017 +0100 Fix some pylint warnings >--------------------------------------------------------------- engine/emoji_picker.py | 152 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 125 insertions(+), 27 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index f9808d0..667eacb 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -102,7 +102,8 @@ def parse_args(): action='store_true', default=False, help=('Load all Unicode characters. ' - + 'Makes all Unicode characters accessible, even normal letters. ' + + 'Makes all Unicode characters accessible, ' + + 'even normal letters. ' + 'Slows the search down and is usually not needed. ' + 'default: %(default)s')) parser.add_argument( @@ -129,7 +130,8 @@ class EmojiPickerUI(Gtk.Window): self.set_name('EmojiPicker') style_provider = Gtk.CssProvider() - style_provider.load_from_data(b'#EmojiPicker { background-color: #FFFFFF; }') + style_provider.load_from_data( + b'#EmojiPicker { background-color: #FFFFFF; }') Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), style_provider, @@ -188,6 +190,7 @@ class EmojiPickerUI(Gtk.Window): self._currently_selected_label = None self._candidates_invalid = False self._query_string = '' + self._emoji_selected_popover = None self._main_container = Gtk.VBox() self.add(self._main_container) @@ -378,9 +381,9 @@ class EmojiPickerUI(Gtk.Window): self.show_all() - (minimum_width_search_entry, + (dummy_minimum_width_search_entry, natural_width_search_entry) = self._search_entry.get_preferred_width() - (minimum_width_search_bar, + (dummy_minimum_width_search_bar, natural_width_search_bar) = self._search_bar.get_preferred_width() if _ARGS.debug: sys.stdout.write( @@ -396,15 +399,24 @@ class EmojiPickerUI(Gtk.Window): Gdk.SELECTION_PRIMARY) def _busy_start(self): + ''' + Show that this program is busy + ''' self._spinner.start() # self.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH)) # Gdk.flush() def _busy_stop(self): + ''' + Stop showing that this program is busy + ''' self._spinner.stop() # self.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW)) def _browse_treeview_unselect_all(self): + ''' + Unselect everything in the treeview for browsing the categories + ''' self._browse_treeview.get_selection().unselect_all() self._currently_selected_label = None @@ -428,7 +440,7 @@ class EmojiPickerUI(Gtk.Window): language, label_key, label]) return True - def _sort_labels(self, labels, language): + def _sort_labels(self, labels, language): # pylint: disable=no-self-use return sorted( labels, key=lambda x: ( @@ -443,6 +455,16 @@ class EmojiPickerUI(Gtk.Window): x.lower())) def _emoji_description(self, emoji): + ''' + Return a description of the emoji + + The description shows the Unicode codpoint(s) of the emoji + and the names of the emoji in all languages used. + + :param emoji: The emoji + :type emoji: String + :rtype: String + ''' description = ' '.join(['U+%X' %ord(character) for character in emoji]) description += '\n' for language in itb_emoji._expand_languages(self._languages): @@ -455,6 +477,14 @@ class EmojiPickerUI(Gtk.Window): return description def _emoji_label_set_tooltip(self, emoji, label): + ''' + Set the tooltip for a label in the flowbox which shows an emoji + + :param emoji: The emoji + :type emoji: String + :param label: The label used to show the emoji + :type label: Gtk.Label object + ''' description = self._emoji_description(emoji) if itb_emoji._is_invisible(emoji): label.set_tooltip_text( @@ -468,6 +498,9 @@ class EmojiPickerUI(Gtk.Window): + html.escape(description + '\n\n' + _('Click to copy'))) def _clear_flowbox(self): + ''' + Clear the contents of the flowbox + ''' for child in self._flowbox_scroll.get_children(): self._flowbox_scroll.remove(child) self._flowbox = Gtk.FlowBox() @@ -485,10 +518,15 @@ class EmojiPickerUI(Gtk.Window): self._flowbox.connect('child-activated', self.on_emoji_selected) def _fill_flowbox_browse(self): + ''' + Fill the flowbox with content according to the currently + selected label in the browsing treeview. + ''' (language, label_key, label) = self._currently_selected_label if _ARGS.debug: sys.stdout.write( - '_fill_flowbox_browse() language = %s label_key = %s label = %s\n' + '_fill_flowbox_browse() ' + + 'language = %s label_key = %s label = %s\n' %(language, label_key, label)) emoji_list = [] if label == self._recently_used_label: @@ -577,11 +615,11 @@ class EmojiPickerUI(Gtk.Window): %options_dict) options_dict = {} if ('font' in options_dict - and isinstance(options_dict['font'], str)): + and isinstance(options_dict['font'], str)): self._font = options_dict['font'] if ('fontsize' in options_dict - and (isinstance(options_dict['fontsize'], int) - or isinstance(options_dict['fontsize'], float))): + and (isinstance(options_dict['fontsize'], int) + or isinstance(options_dict['fontsize'], float))): self._fontsize = options_dict['fontsize'] def _save_options(self): @@ -623,7 +661,8 @@ class EmojiPickerUI(Gtk.Window): if not isinstance(self._recently_used_emoji, dict): if _ARGS.debug: sys.stdout.write( - 'Not a dict: repr(self._recently_used_emoji) = %s\n' + 'Not a dict: ' + + 'repr(self._recently_used_emoji) = %s\n' %self._recently_used_emoji) self._recently_used_emoji = {} if not self._recently_used_emoji: @@ -637,21 +676,32 @@ class EmojiPickerUI(Gtk.Window): ''' if len(self._recently_used_emoji) > self._recently_used_emoji_maximum: for emoji in sorted( - self._recently_used_emoji, - key=lambda x: ( - - self._recently_used_emoji[x]['time'], - - self._recently_used_emoji[x]['count'], - ))[self._recently_used_emoji_maximum:]: + self._recently_used_emoji, + key=lambda x: ( + - self._recently_used_emoji[x]['time'], + - self._recently_used_emoji[x]['count'], + ))[self._recently_used_emoji_maximum:]: del self._recently_used_emoji[emoji] def _init_recently_used(self): + ''' + Initialize the recently used emoji + + - Make the the recently used emoji empty + - Save it to disk + - Clear the flowbox if it is currently showing the recently used + ''' self._recently_used_emoji = {} self._save_recently_used_emoji() if (self._currently_selected_label == - ('', '', self._recently_used_label)): + ('', '', self._recently_used_label)): self._clear_flowbox() - def on_clear_recently_used_button_clicked(self, button): + def on_clear_recently_used_button_clicked(self, dummy_button): + ''' + :param dummy_button: The ��Clear recently used�� button + :type dummy_button: Gtk.Button object + ''' if _ARGS.debug: sys.stdout.write('on_clear_recently_used_button_clicked()\n') if GTK_VERSION >= (3, 22, 0): @@ -701,9 +751,14 @@ class EmojiPickerUI(Gtk.Window): self._save_recently_used_emoji() Gtk.main_quit() - def on_main_window_key_press_event(self, window, event_key): + def on_main_window_key_press_event(self, dummy_window, event_key): ''' Some key has been typed into the main window + + :param dummy_window: The main window + :type dummy_window: Gtk.Window object + :param event_key: + :type event_key: Gdk.EventKey object ''' if _ARGS.debug: sys.stdout.write( @@ -760,10 +815,25 @@ class EmojiPickerUI(Gtk.Window): Gtk.main_iteration() self._search_bar.handle_event(event_key) - def on_close_aboutdialog(self, action, dummy_parameter): - action.destroy() + def on_close_aboutdialog( # pylint: disable=no-self-use + self, about_dialog, dummy_response): + ''' + The ��About�� dialog has been closed by the user + + :param about_dialog: The ��About�� dialog + :type about_dialog: GtkDialog object + :param dummy_response: The response when the ��About�� dialog was closed + :type dummy_response: Gtk.ResponseType enum + ''' + about_dialog.destroy() - def on_about_button_clicked(self, button): + def on_about_button_clicked(self, dummy_button): + ''' + The ��About�� button has been clicked + + :param dummy_button: The ��About�� button + :type dummy_button: Gtk.Button object + ''' if _ARGS.debug: sys.stdout.write('on_about_button_clicked()\n') if GTK_VERSION >= (3, 22, 0): @@ -820,6 +890,10 @@ class EmojiPickerUI(Gtk.Window): aboutdialog.show() def _fill_flowbox_with_search_results(self): + ''' + Get the emoji candidates for the current query string + and fill the flowbox with the results of the query. + ''' if _ARGS.debug: sys.stdout.write( '_fill_flowbox_with_search_results() query_string = %s\n' @@ -851,7 +925,7 @@ class EmojiPickerUI(Gtk.Window): # because self._candidates_invalid is True already. emoji = candidate[0] name = candidate[1] - score = candidate[2] + dummy_score = candidate[2] label = Gtk.Label() # Make font for emoji large using pango markup label.set_text( @@ -957,6 +1031,9 @@ class EmojiPickerUI(Gtk.Window): %(repr(treeview), repr(treepath), repr(column))) def _emoji_selected_popover_popdown(self): + ''' + Hide the popover again which was shown when an emoji was selected + ''' if self._emoji_selected_popover: if GTK_VERSION >= (3, 22, 0): self._emoji_selected_popover.popdown() @@ -986,7 +1063,8 @@ class EmojiPickerUI(Gtk.Window): if match: emoji = html.unescape(match.group('emoji')) if _ARGS.debug: - sys.stdout.write("on_emoji_selected() repr(emoji) = %s\n" %repr(emoji)) + sys.stdout.write( + 'on_emoji_selected() repr(emoji) = %s\n' %repr(emoji)) else: return self._selection_clipboard.set_text(emoji, -1) @@ -1008,20 +1086,36 @@ class EmojiPickerUI(Gtk.Window): self._emoji_selected_popover.show_all() GLib.timeout_add(500, self._emoji_selected_popover_popdown) - def on_main_menu_button_clicked(self, button): + def on_main_menu_button_clicked(self, dummy_button): + ''' + The main menu button has been clicked + + :param button: The main menu button + :type button: Gtk.Button object + ''' if _ARGS.debug: sys.stdout.write('on_main_menu_button_clicked()\n') if GTK_VERSION >= (3, 22, 0): self._main_menu_popover.popup() self._main_menu_popover.show_all() - def on_toggle_search_button_clicked(self, button): + def on_toggle_search_button_clicked(self, dummy_button): + ''' + The search button in the header bar has been clicked + + :param dummy_button: The search button + :type dummy_button: Gtk.Button object + ''' if _ARGS.debug: sys.stdout.write('on_toggle_search_button_clicked()\n') self._search_bar.set_search_mode( not self._search_bar.get_search_mode()) def _change_flowbox_font(self): + ''' + Update the font and fontsize used in the current content + of the flowbox. + ''' for flowbox_child in self._flowbox.get_children(): label = flowbox_child.get_child() text = label.get_label() @@ -1049,8 +1143,12 @@ class EmojiPickerUI(Gtk.Window): self.show_all() self._busy_stop() - def on_fontsize_adjustment_value_changed(self, dummy_widget): - value = self._fontsize_adjustment.get_value() + def on_fontsize_adjustment_value_changed(self, adjustment): + ''' + :param adjustment: The adjustment used to change the fontsize + :type adjustment: Gtk.Adjustment object + ''' + value = adjustment.get_value() if _ARGS.debug: sys.stdout.write( 'on_fontsize_adjustment_value_changed() value = %s\n'

1 0

[ibus-typing-booster] master: Remember the font and the fontsize in a config file (1a0723f)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 1a0723fd2e07c7dc81c8c66d3109c7d5ba7879f9 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sun Feb 26 23:01:59 2017 +0100 Remember the font and the fontsize in a config file - when the fontsize is changed in UI, this is now remembered - if command line options are used, they override the contents of the config file and the new values are saved to the config file >--------------------------------------------------------------- engine/emoji_picker.py | 140 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 105 insertions(+), 35 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 212d4ae..8bfed49 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -76,17 +76,20 @@ def parse_args(): nargs='?', type=str, action='store', - default='', + default=None, help=('Set a font to display emoji. ' - + 'If empty, the system settings are used. ' + + 'If not specified, the font is read from the config file. ' + + 'To use the system default font specify "". ' + 'default: "%(default)s"')) parser.add_argument( '-s', '--fontsize', nargs='?', type=float, action='store', - default=24, + default=None, help=('Set a fontsize to display emoji. ' + + 'If not specified, the fontsize is read from the config file. ' + + 'If that fails 24 is used as a fall back fontsize. ' + 'default: "%(default)s"')) parser.add_argument( '-m', '--modal', @@ -120,8 +123,8 @@ class EmojiPickerUI(Gtk.Window): languages=('en_US',), modal=False, unicode_data_all=False, - font='', - fontsize=24): + font=None, + fontsize=None): Gtk.Window.__init__(self, title='�� ' + _('Emoji Picker')) self.set_name('Emoji Picker') # https://tronche.com/gui/x/icccm/sec-4.html#WM_CLASS @@ -136,8 +139,17 @@ class EmojiPickerUI(Gtk.Window): self.set_default_size(700, 400) self._modal = modal self.set_modal(self._modal) - self._font = font - self._fontsize = fontsize + self._font = '' + self._fontsize = 24 + self._options_file = os.path.join( + xdg.BaseDirectory.save_data_path('emoji-picker'), + 'options') + self._read_options() + if not font is None: + self._font = font + if not fontsize is None: + self._fontsize = fontsize + self._save_options() self.connect('destroy-event', self.on_destroy_event) self.connect('delete-event', self.on_delete_event) self.connect('key-press-event', self.on_main_window_key_press_event) @@ -280,38 +292,12 @@ class EmojiPickerUI(Gtk.Window): None, [self._recently_used_label, '', '', self._recently_used_label]) + self._recently_used_emoji = {} self._recently_used_emoji_file = os.path.join( xdg.BaseDirectory.save_data_path('emoji-picker'), 'recently-used') self._recently_used_emoji_maximum = 100 - self._recently_used_emoji = {} - if os.path.isfile(self._recently_used_emoji_file): - try: - self._recently_used_emoji = eval(open( - self._recently_used_emoji_file, - mode='r', - encoding='UTF-8').read()) - except (PermissionError, SyntaxError, IndentationError): - import traceback - traceback.print_exc() - except Exception as exception: - import traceback - traceback.print_exc() - else: # no exception occured - if _ARGS.debug: - sys.stdout.write( - 'File %s has been read and evaluated.\n' - %self._recently_used_emoji_file) - finally: # executes always - if not isinstance(self._recently_used_emoji, dict): - if _ARGS.debug: - sys.stdout.write( - 'Not a dict: repr(self._recently_used_emoji) = %s\n' - %self._recently_used_emoji) - self._recently_used_emoji = {} - if not self._recently_used_emoji: - self._init_recently_used() - self._cleanup_recently_used() + self._read_recently_used() self._emoji_by_label = self._emoji_matcher.emoji_by_label() expanded_languages = itb_emoji._expand_languages(self._languages) @@ -553,6 +539,89 @@ class EmojiPickerUI(Gtk.Window): self.show_all() self._busy_stop() + def _read_options(self): + ''' + Read the options for 'font' and 'fontsize' from a file + ''' + options_dict = {} + if os.path.isfile(self._options_file): + try: + options_dict = eval(open( + self._options_file, + mode='r', + encoding='UTF-8').read()) + except (PermissionError, SyntaxError, IndentationError): + import traceback + traceback.print_exc() + except Exception as exception: + import traceback + traceback.print_exc() + else: # no exception occured + if _ARGS.debug: + sys.stdout.write( + 'File %s has been read and evaluated.\n' + %self._options_file) + finally: # executes always + if not isinstance(options_dict, dict): + if _ARGS.debug: + sys.stdout.write( + 'Not a dict: repr(options_dict) = %s\n' + %options_dict) + options_dict = {} + if ('font' in options_dict + and isinstance(options_dict['font'], str)): + self._font = options_dict['font'] + if ('fontsize' in options_dict + and (isinstance(options_dict['fontsize'], int) + or isinstance(options_dict['fontsize'], float))): + self._fontsize = options_dict['fontsize'] + + def _save_options(self): + ''' + Save the options for 'font' and 'fontsize' to a file + ''' + options_dict = { + 'font': self._font, + 'fontsize': self._fontsize, + } + with open(self._options_file, + mode='w', + encoding='UTF-8') as options_file: + options_file.write(repr(options_dict)) + options_file.write('\n') + + def _read_recently_used(self): + ''' + Read the recently use emoji from a file + ''' + if os.path.isfile(self._recently_used_emoji_file): + try: + self._recently_used_emoji = eval(open( + self._recently_used_emoji_file, + mode='r', + encoding='UTF-8').read()) + except (PermissionError, SyntaxError, IndentationError): + import traceback + traceback.print_exc() + except Exception as exception: + import traceback + traceback.print_exc() + else: # no exception occured + if _ARGS.debug: + sys.stdout.write( + 'File %s has been read and evaluated.\n' + %self._recently_used_emoji_file) + finally: # executes always + if not isinstance(self._recently_used_emoji, dict): + if _ARGS.debug: + sys.stdout.write( + 'Not a dict: repr(self._recently_used_emoji) = %s\n' + %self._recently_used_emoji) + self._recently_used_emoji = {} + if not self._recently_used_emoji: + self._init_recently_used() + self._cleanup_recently_used() + def _cleanup_recently_used(self): ''' Reduces the size of the recently used dictionary @@ -979,6 +1048,7 @@ class EmojiPickerUI(Gtk.Window): 'on_fontsize_adjustment_value_changed() value = %s\n' %value) self._fontsize = value + self._save_options() self._busy_start() GLib.idle_add(self._change_flowbox_font)

1 0

[ibus-typing-booster] master: emoji_picker.py: Add a spin button to change the font size of the emoji (b3cf549)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit b3cf5498913820e866bd4c07c0487f359e2b30e9 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sun Feb 26 21:42:59 2017 +0100 emoji_picker.py: Add a spin button to change the font size of the emoji >--------------------------------------------------------------- engine/emoji_picker.py | 96 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 74 insertions(+), 22 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 272b6c0..212d4ae 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -207,6 +207,18 @@ class EmojiPickerUI(Gtk.Window): self._toggle_search_button.connect( 'clicked', self.on_toggle_search_button_clicked) self._header_bar.pack_start(self._toggle_search_button) + self._fontsize_spin_button = Gtk.SpinButton() + self._fontsize_spin_button.set_numeric(True) + self._fontsize_spin_button.set_can_focus(True) + self._fontsize_adjustment = Gtk.Adjustment() + self._fontsize_adjustment.set_lower(1) + self._fontsize_adjustment.set_upper(10000) + self._fontsize_adjustment.set_value(self._fontsize) + self._fontsize_adjustment.set_step_increment(1) + self._fontsize_spin_button.set_adjustment(self._fontsize_adjustment) + self._fontsize_adjustment.connect( + 'value-changed', self.on_fontsize_adjustment_value_changed) + self._header_bar.pack_start(self._fontsize_spin_button) self._spinner = Gtk.Spinner() self._header_bar.pack_end(self._spinner) self._main_container.pack_start(self._header_bar, False, False, 0) @@ -448,6 +460,19 @@ class EmojiPickerUI(Gtk.Window): 'emoji_order = %s' %self._emoji_matcher.emoji_order(emoji)) return description + def _emoji_label_set_tooltip(self, emoji, label): + description = self._emoji_description(emoji) + if itb_emoji._is_invisible(emoji): + label.set_tooltip_text( + description + '\n\n' + _('Click to copy')) + else: + label.set_tooltip_markup( + '' + %(self._font, self._fontsize * 4) + + html.escape(emoji) + + '\n\n' + + html.escape(description + '\n\n' + _('Click to copy'))) + def _clear_flowbox(self): for child in self._flowbox_scroll.get_children(): self._flowbox_scroll.remove(child) @@ -497,9 +522,9 @@ class EmojiPickerUI(Gtk.Window): for emoji in emoji_list: while Gtk.events_pending(): Gtk.main_iteration() - description = self._emoji_description(emoji) label = Gtk.Label() if itb_emoji._is_invisible(emoji): + description = self._emoji_description(emoji) label.set_text('%s' %emoji + description) else: # Make font for emoji large using pango markup @@ -522,16 +547,7 @@ class EmojiPickerUI(Gtk.Window): label.set_margin_end(margin) label.set_margin_top(margin) label.set_margin_bottom(margin) - if itb_emoji._is_invisible(emoji): - label.set_tooltip_text( - description + '\n\n' + _('Click to copy')) - else: - label.set_tooltip_markup( - '' - %(self._font, self._fontsize * 4) - + html.escape(emoji) - + '\n\n' - + html.escape(description + '\n\n' + _('Click to copy'))) + self._emoji_label_set_tooltip(emoji, label) self._flowbox.insert(label, -1) self.show_all() @@ -617,6 +633,14 @@ class EmojiPickerUI(Gtk.Window): 'on_main_window_key_press_event() ' + 'keyval = %s\n' %event_key.keyval) + if self._fontsize_spin_button.has_focus(): + if _ARGS.debug: + sys.stdout.write( + 'on_main_window_key_press_event(): ' + + 'self._fontsize_spin_button has focus\n') + # if the fontsize spin button has focus, we do not want + # to take it away from there by popping up the search bar. + return # https://developer.gnome.org/gdk3/stable/gdk3-Event-Structures.html#GdkEvent… # See /usr/include/gtk-3.0/gdk/gdkkeysyms.h for a list # of Gdk keycodes @@ -751,7 +775,6 @@ class EmojiPickerUI(Gtk.Window): emoji = candidate[0] name = candidate[1] score = candidate[2] - description = self._emoji_description(emoji) label = Gtk.Label() # Make font for emoji large using pango markup label.set_text( @@ -777,16 +800,7 @@ class EmojiPickerUI(Gtk.Window): label.set_margin_end(margin) label.set_margin_top(margin) label.set_margin_bottom(margin) - if itb_emoji._is_invisible(emoji): - label.set_tooltip_text( - description + '\n\n' + _('Click to copy')) - else: - label.set_tooltip_markup( - '' - %(self._font, self._fontsize * 4) - + html.escape(emoji) - + '\n\n' - + html.escape(description + '\n\n' + _('Click to copy'))) + self._emoji_label_set_tooltip(emoji, label) self._flowbox.insert(label, -1) self.show_all() @@ -930,6 +944,44 @@ class EmojiPickerUI(Gtk.Window): self._search_bar.set_search_mode( not self._search_bar.get_search_mode()) + def _change_flowbox_font(self): + for flowbox_child in self._flowbox.get_children(): + label = flowbox_child.get_child() + text = label.get_label() + pattern = re.compile( + r'<span[^<]*?>(?P<emoji>[^<]+?)' + + r'(<span[^<]*?>(?P<name>[^<]+?))?') + match = pattern.match(text) + if match: + emoji = html.unescape(match.group('emoji')) + new_text = ( + '' + %(self._font, self._fontsize) + + html.escape(emoji) + + '') + if match.group('name'): + name = html.unescape(match.group('name')) + new_text += ( + '' + %(self._fontsize / 2) + + html.escape(name) + + '') + label.set_text(new_text) + label.set_use_markup(True) + self._emoji_label_set_tooltip(emoji, label) + self.show_all() + self._busy_stop() + + def on_fontsize_adjustment_value_changed(self, dummy_widget): + value = self._fontsize_adjustment.get_value() + if _ARGS.debug: + sys.stdout.write( + 'on_fontsize_adjustment_value_changed() value = %s\n' + %value) + self._fontsize = value + self._busy_start() + GLib.idle_add(self._change_flowbox_font) + def get_languages(): ''' Return the list of languages.

1 0

[ibus-typing-booster] master: UI redesign of the emoji-picker (7abd4a8)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 7abd4a8af45af9a4c33b082bccf121d4ede9ebd8 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Fri Feb 24 08:28:02 2017 +0100 UI redesign of the emoji-picker - Use a header bar with window manager buttons - add a menu in the header bar for ��Clear recently used��, ��About��, ��Quit�� - Show a search toogle button in the header bar - Don��t use a notebook: + Use an about dialog instead of the about tab + Use a search bar instead of the search tab (makes it also more responsive because the search bar introduces some extra delay) - Show a spinner when busy - Don��t put the flowbox into a viewport: self._flowbox.set_valign(Gtk.Align.START) positions the contents correctly in the flowbox without a viewport. The viewport breaks scrolling with the keyboard. - Add a ��Copied to clipboard!�� popover when clicking on an emoji. >--------------------------------------------------------------- engine/emoji_picker.py | 687 +++++++++++++++++++++++++++++------------------- 1 files changed, 413 insertions(+), 274 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 4dc32c2..0347b95 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -45,6 +45,10 @@ from gi.repository import GLib import itb_emoji import version +GTK_VERSION = (Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) + DOMAINNAME = 'ibus-typing-booster' _ = lambda a: gettext.dgettext(DOMAINNAME, a) N_ = lambda a: a @@ -121,11 +125,13 @@ class EmojiPickerUI(Gtk.Window): # gnome-shell in the top bar. self.set_wmclass('emoji-picker', 'Emoji Picker') self.set_default_size(700, 400) - self.set_modal(modal) + self._modal = modal + self.set_modal(self._modal) self._font = font self._fontsize = fontsize self.connect('destroy-event', self.on_destroy_event) self.connect('delete-event', self.on_delete_event) + self.connect('key-press-event', self.on_main_window_key_press_event) self._languages = languages self._emoji_matcher = itb_emoji.EmojiMatcher(languages=self._languages) self._gettext_translations = {} @@ -148,141 +154,109 @@ class EmojiPickerUI(Gtk.Window): else: self._gettext_translations[language] = None - self._currently_selected_label = ('', '', '') + self._currently_selected_label = None self._candidates_invalid = False self._query_string = '' - self._notebook = Gtk.Notebook() - self.add(self._notebook) - - self._page_browse = Gtk.Grid() + self._main_container = Gtk.VBox() + self.add(self._main_container) + self._header_bar = Gtk.HeaderBar() + self._header_bar.set_hexpand(True) + self._header_bar.set_vexpand(False) + self._header_bar.set_show_close_button(True) + self._header_bar.set_decoration_layout("menu:minimize,maximize,close") + self._main_menu_button = Gtk.Button.new_from_icon_name( + 'open-menu-symbolic', Gtk.IconSize.BUTTON) + self._header_bar.pack_start(self._main_menu_button) + self._main_menu_popover = Gtk.Popover() + self._main_menu_popover.set_relative_to(self._main_menu_button) + self._main_menu_popover.set_position(Gtk.PositionType.BOTTOM) + self._main_menu_popover_vbox = Gtk.VBox() + self._main_menu_clear_recently_used_button = Gtk.Button( + _('Clear recently used')) + self._main_menu_clear_recently_used_button.connect( + 'clicked', self.on_clear_recently_used_button_clicked) + self._main_menu_popover_vbox.pack_start( + self._main_menu_clear_recently_used_button, False, False, 0) + if not self._modal: + self._main_menu_about_button = Gtk.Button(_('About')) + self._main_menu_about_button.connect( + 'clicked', self.on_about_button_clicked) + self._main_menu_popover_vbox.pack_start( + self._main_menu_about_button, False, False, 0) + self._main_menu_quit_button = Gtk.Button(_('Quit')) + self._main_menu_quit_button.connect('clicked', self.on_delete_event) + self._main_menu_popover_vbox.pack_start( + self._main_menu_quit_button, False, False, 0) + self._main_menu_popover.add(self._main_menu_popover_vbox) + self._main_menu_button.connect( + 'clicked', self.on_main_menu_button_clicked) + self._toggle_search_button = Gtk.Button.new_from_icon_name( + 'edit-find-symbolic', Gtk.IconSize.BUTTON) + self._toggle_search_button.connect( + 'clicked', self.on_toggle_search_button_clicked) + self._header_bar.pack_start(self._toggle_search_button) + self._spinner = Gtk.Spinner() + self._header_bar.pack_end(self._spinner) + self._main_container.pack_start(self._header_bar, False, False, 0) + + self._search_entry = Gtk.SearchEntry() + self._search_entry.set_hexpand(False) + self._search_entry.set_vexpand(False) + self._search_entry.set_can_focus(True) + self._search_bar = Gtk.SearchBar() + self._search_bar.set_hexpand(False) + self._search_bar.set_vexpand(False) + self._search_bar.set_show_close_button(False) + self._search_bar.set_search_mode(False) # invisible by default + self._search_bar.add(self._search_entry) + self._search_bar.connect_entry(self._search_entry) + self._search_entry.connect( + 'search-changed', self.on_search_entry_search_changed) self._browse_paned = Gtk.HPaned() + self._main_container.pack_start(self._browse_paned, True, True, 0) self._browse_paned.set_wide_handle(True) self._browse_paned.set_hexpand(True) self._browse_paned.set_vexpand(True) - self._browse_paned.set_position(180) self._browse_treeview_scroll = Gtk.ScrolledWindow() self._browse_treeview = Gtk.TreeView() + self._browse_treeview.set_activate_on_single_click(True) + self._browse_treeview.set_vexpand(True) self._browse_treeview.get_selection().connect( 'changed', self.on_label_selected) self._browse_treeview.connect( 'row-activated', self.on_row_activated) self._browse_treeview_scroll.add(self._browse_treeview) - self._browse_flowbox_scroll = Gtk.ScrolledWindow() - self._browse_flowbox_scroll.set_hexpand(True) - self._browse_flowbox_scroll.set_vexpand(True) - self._browse_flowbox_viewport = Gtk.Viewport() - self._browse_flowbox_viewport.set_valign(Gtk.Align.START) - self._browse_flowbox = Gtk.FlowBox() - self._browse_flowbox_viewport.add(self._browse_flowbox) - self._browse_flowbox_scroll.add(self._browse_flowbox_viewport) + + self._flowbox_scroll = Gtk.ScrolledWindow() + self._flowbox_scroll.set_hexpand(True) + self._flowbox_scroll.set_vexpand(True) + self._flowbox = Gtk.FlowBox() + self._flowbox_scroll.add(self._flowbox) + + self._left_pane = Gtk.VBox() + self._left_pane.set_homogeneous(False) + self._left_pane.pack_start(self._search_bar, False, False, 0) + self._left_pane.pack_start(self._browse_treeview_scroll, True, True, 0) + + self._right_pane = Gtk.VBox() + self._right_pane.pack_start(self._flowbox_scroll, True, True, 0) self._browse_paned.pack1( - self._browse_treeview_scroll, resize=True, shrink=True) + self._left_pane, resize=True, shrink=True) self._browse_paned.pack2( - self._browse_flowbox_scroll, resize=True, shrink=True) - self._page_browse.add(self._browse_paned) - - self._notebook.append_page(self._page_browse, Gtk.Label(_('Browse'))) - - self._page_search = Gtk.Grid() - self._page_search.set_border_width(6) - self._page_search.set_row_spacing(6) - self._page_search.set_column_spacing(6) - self._notebook.append_page(self._page_search, Gtk.Label(_('Search'))) - self._search_entry = Gtk.Entry() - self._search_entry.set_hexpand(True) - self._search_entry.set_vexpand(False) - self._search_entry.set_can_focus(True) - self._page_search.add(self._search_entry) - self._search_treeview_scroll = Gtk.ScrolledWindow() - self._search_treeview_scroll.set_visible(True) - self._search_treeview_scroll.set_hexpand(True) - self._search_treeview_scroll.set_vexpand(True) - self._search_treeview = Gtk.TreeView() - self._search_treeview.set_visible(True) - self._search_treeview.set_hexpand(True) - self._search_treeview.set_vexpand(True) - self._search_treeview.get_selection().connect( - 'changed', self.on_candidate_selected) - self._search_treeview_scroll.add(self._search_treeview) - self._search_treeview_model = Gtk.ListStore(str, str) - self._search_treeview.set_model(self._search_treeview_model) - self._search_treeview.append_column(Gtk.TreeViewColumn( - 'Candidates', Gtk.CellRendererText(), markup=0)) - # If the headers in the search treeview are visible, they must - # be taken into account when calculating the index fo the - # tooltip in on_search_treeview_query_tooltip(). The header - # is not really useful anyway, better just don��t show it. - self._search_treeview.set_headers_visible(False) - self._search_treeview.set_property('has-tooltip', True) - self._page_search.attach(self._search_treeview_scroll, 0, 1, 1, 10) - self._search_entry.connect( - 'notify::text', self.on_search_entry_text_changed) - self._search_treeview.connect( - 'query-tooltip', self.on_search_treeview_query_tooltip) - self._notebook.connect('switch-page', self.on_switch_page) - - self._page_about = Gtk.VBox() - - self.about_emoji_label = Gtk.Label('��') - self.about_emoji_label.set_hexpand(True) - self.about_emoji_label.set_vexpand(True) - self.about_emoji_label.set_use_markup(True) - self._page_about.add(self.about_emoji_label) - - self.about_name_version_label = Gtk.Label() - self.about_name_version_label.set_hexpand(True) - self.about_name_version_label.set_vexpand(True) - self.about_name_version_label.set_use_markup(True) - self.about_name_version_label.set_markup( - 'ibus-typing-booster %s' - %version.get_version()) - self._page_about.add(self.about_name_version_label) - - self.about_long_description_label = Gtk.Label( - _('A completion input method to speedup typing.')) - self.about_name_version_label.set_hexpand(True) - self.about_name_version_label.set_vexpand(True) - self._page_about.add(self.about_long_description_label) - - self.about_home_page_label = Gtk.Label(_('Home page:')) - self.about_home_page_label.set_hexpand(True) - self.about_home_page_label.set_vexpand(True) - self.about_home_page_label.set_use_markup(True) - self._page_about.add(self.about_home_page_label) - - home_page_uri = 'http://mike-fabian.github.io/ibus-typing-booster' - self.about_home_page_link_button = Gtk.LinkButton(label=home_page_uri) - self.about_home_page_link_button.set_uri(home_page_uri) - self.about_home_page_link_button.set_hexpand(True) - self.about_home_page_link_button.set_vexpand(True) - self._page_about.add(self.about_home_page_link_button) - - self.about_documentation_link_label = Gtk.Label( - _('Online documentation:')) - self.about_documentation_link_label.set_hexpand(True) - self.about_documentation_link_label.set_vexpand(True) - self.about_documentation_link_label.set_use_markup(True) - self._page_about.add(self.about_documentation_link_label) - - documentation_uri = ( - 'http://mike-fabian.github.io/ibus-typing-booster/' - + 'documentation.html') - self.about_documentation_link_button = Gtk.LinkButton( - label=documentation_uri) - self.about_documentation_link_button.set_uri(documentation_uri) - self.about_documentation_link_button.set_hexpand(True) - self.about_documentation_link_button.set_vexpand(True) - self._page_about.add(self.about_documentation_link_button) - - self._notebook.append_page(self._page_about, Gtk.Label(_('About'))) + self._right_pane, resize=True, shrink=True) self._browse_treeview_model = Gtk.TreeStore(str, str, str, str) self._browse_treeview.set_model(self._browse_treeview_model) + self._recently_used_label = '�� ' + _('Recently used') + dummy_recent_iter = self._browse_treeview_model.append( + None, + [self._recently_used_label, '', '', self._recently_used_label]) + self._recently_used_emoji_file = os.path.join( xdg.BaseDirectory.save_data_path('emoji-picker'), 'recently-used') @@ -313,12 +287,9 @@ class EmojiPickerUI(Gtk.Window): %self._recently_used_emoji) self._recently_used_emoji = {} if not self._recently_used_emoji: - self._add_to_recently_used('��') + self._init_recently_used() self._cleanup_recently_used() - dummy_recent_iter = self._browse_treeview_model.append( - None, ['�� ' + _('Recently used'), 'dummy_language', '', '']) - self._emoji_by_label = self._emoji_matcher.emoji_by_label() expanded_languages = itb_emoji._expand_languages(self._languages) first_language_with_categories = -1 @@ -388,13 +359,38 @@ class EmojiPickerUI(Gtk.Window): self._browse_treeview.columns_autosize() - # self._fill_flowbox('en', 'categories', 'people') + self.show_all() + + (minimum_width_search_entry, + natural_width_search_entry) = self._search_entry.get_preferred_width() + (minimum_width_search_bar, + natural_width_search_bar) = self._search_bar.get_preferred_width() + if _ARGS.debug: + sys.stdout.write( + 'natural_width_search_entry = %s ' + %natural_width_search_entry + + 'natural_width_search_bar = %s\n' + %natural_width_search_bar) + self._browse_paned.set_position(natural_width_search_bar) self._selection_clipboard = Gtk.Clipboard.get( Gdk.SELECTION_CLIPBOARD) self._selection_primary = Gtk.Clipboard.get( Gdk.SELECTION_PRIMARY) + def _busy_start(self): + self._spinner.start() + # self.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH)) + # Gdk.flush() + + def _busy_stop(self): + self._spinner.stop() + # self.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW)) + + def _browse_treeview_unselect_all(self): + self._browse_treeview.get_selection().unselect_all() + self._currently_selected_label = None + def _add_label_key_to_model( self, label_key, label_key_display, language, language_iter): if not label_key in self._emoji_by_label[language]: @@ -441,13 +437,31 @@ class EmojiPickerUI(Gtk.Window): 'emoji_order = %s' %self._emoji_matcher.emoji_order(emoji)) return description - def _fill_flowbox(self, language, label_key, label): + def _clear_flowbox(self): + for child in self._flowbox_scroll.get_children(): + self._flowbox_scroll.remove(child) + self._flowbox = Gtk.FlowBox() + self._flowbox_scroll.add(self._flowbox) + self._flowbox.set_valign(Gtk.Align.START) + self._flowbox.set_min_children_per_line(1) + self._flowbox.set_max_children_per_line(100) + self._flowbox.set_row_spacing(0) + self._flowbox.set_column_spacing(0) + self._flowbox.set_activate_on_single_click(True) + self._flowbox.set_can_focus(True) + self._flowbox.set_homogeneous(False) + self._flowbox.set_hexpand(False) + self._flowbox.set_vexpand(False) + self._flowbox.connect('child-activated', self.on_emoji_selected) + + def _fill_flowbox_browse(self): + (language, label_key, label) = self._currently_selected_label if _ARGS.debug: sys.stdout.write( - '_fill_flowbox() language = %s label_key = %s label = %s\n' + '_fill_flowbox_browse() language = %s label_key = %s label = %s\n' %(language, label_key, label)) emoji_list = [] - if language == 'dummy_language': + if label == self._recently_used_label: emoji_list = sorted( self._recently_used_emoji, key=lambda x: ( @@ -458,28 +472,24 @@ class EmojiPickerUI(Gtk.Window): and label_key in self._emoji_by_label[language] and label in self._emoji_by_label[language][label_key]): emoji_list = self._emoji_by_label[language][label_key][label] + + self._header_bar.set_title(label) + if label: + self._header_bar.set_subtitle(str(len(emoji_list))) + else: + self._header_bar.set_subtitle('') + if not emoji_list: + self._busy_stop() return - for child in self._browse_flowbox_viewport.get_children(): - self._browse_flowbox_viewport.remove(child) - self._browse_flowbox = Gtk.FlowBox() - self._browse_flowbox_viewport.add(self._browse_flowbox) - self._browse_flowbox.set_min_children_per_line(1) - self._browse_flowbox.set_max_children_per_line(100) - self._browse_flowbox.set_row_spacing(0) - self._browse_flowbox.set_column_spacing(0) - self._browse_flowbox.set_activate_on_single_click(True) - self._browse_flowbox.set_can_focus(True) - self._browse_flowbox.set_homogeneous(True) - self._browse_flowbox.set_hexpand(False) - self._browse_flowbox.set_vexpand(False) - self._browse_flowbox.connect('child-activated', self.on_emoji_selected) for emoji in emoji_list: + while Gtk.events_pending(): + Gtk.main_iteration() description = self._emoji_description(emoji) label = Gtk.Label() if itb_emoji._is_invisible(emoji): - label.set_text(description) + label.set_text('%s' %emoji + description) else: # Make font for emoji large using pango markup label.set_text( @@ -496,7 +506,7 @@ class EmojiPickerUI(Gtk.Window): # Gtk.Align.CENTER, Gtk.Align.BASELINE label.set_halign(Gtk.Align.FILL) label.set_valign(Gtk.Align.FILL) - margin = 1 + margin = 0 label.set_margin_start(margin) label.set_margin_end(margin) label.set_margin_top(margin) @@ -511,10 +521,10 @@ class EmojiPickerUI(Gtk.Window): + html.escape(emoji) + '\n\n' + html.escape(description + '\n\n' + _('Click to copy'))) - self._browse_flowbox.insert(label, -1) + self._flowbox.insert(label, -1) self.show_all() - self.get_root_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW)) + self._busy_stop() def _cleanup_recently_used(self): ''' @@ -530,6 +540,21 @@ class EmojiPickerUI(Gtk.Window): ))[self._recently_used_emoji_maximum:]: del self._recently_used_emoji[emoji] + def _init_recently_used(self): + self._recently_used_emoji = {} + self._save_recently_used_emoji() + if (self._currently_selected_label == + ('', '', self._recently_used_label)): + self._clear_flowbox() + + def on_clear_recently_used_button_clicked(self, button): + if _ARGS.debug: + sys.stdout.write('on_clear_recently_used_button_clicked()\n') + if GTK_VERSION >= (3, 22, 0): + self._main_menu_popover.popdown() + self._main_menu_popover.hide() + self._init_recently_used() + def _add_to_recently_used(self, emoji): ''' Adds an emoji to the resently used dictionary. @@ -572,136 +597,219 @@ class EmojiPickerUI(Gtk.Window): self._save_recently_used_emoji() Gtk.main_quit() - def on_search_treeview_query_tooltip( - self, - dummy_treeview, mouse_x, mouse_y, dummy_keyboard_mode, tooltip): + def on_main_window_key_press_event(self, window, event_key): ''' - ��query-tooltip�� signal handler - - Returns True if the tooltip is to be shown, False if not. - - :param treeview: The search treeview - :type dummy_treeview: Gtk.TreeView object - :param mouse_x: The x coordinate of the mouse in the treeview - :type mouse_x: Integer - :param mouse_y: The y coordinate of the mouse in the treeview - :type mouse_y: Integer - :param dummy_keyboard_mode: I am not sure what this parameter means - :type dummy_keyboard_mode: Boolean - :param tooltip: The tooltip to be filled with content - :type tooltip: Gtk.Tooltip object + Some key has been typed into the main window ''' if _ARGS.debug: - sys.stdout.write('on_search_treeview_query_tooltip()\n') - path_at_pos = self._search_treeview.get_path_at_pos(mouse_x, mouse_y) - if not path_at_pos: - return False - path, dummy_column, dummy_cell_x, dummy_cell_y = path_at_pos - index = path.get_indices()[0] - emoji = self._search_treeview_model[index][1] - if _ARGS.debug: - sys.stdout.write('on_search_treeview_query_tooltip() index = %s\n' - %index) - description = self._emoji_description(emoji) - if itb_emoji._is_invisible(emoji): - tooltip.set_text( - description + '\n\n' + _('Click to copy')) - else: - tooltip.set_markup( - '' - %(self._font, self._fontsize * 4) - + html.escape(emoji) - + '\n\n' - + html.escape(description + '\n\n' + _('Click to copy'))) - return True - - def on_switch_page(self, dummy_notebook, dummy_page, page_number): - ''' - Signal handler for switching a page in the notebook - - :param dummy_notebook: The notebook - :type dummy_notebook: Gtk.Notebook object - :param dummy_page: The page switched to - :type dummy_page: Gtk.Widget object - :param page_number: The number of the page switched to - :type page_number: Integer - ''' + sys.stdout.write( + 'on_main_window_key_press_event() ' + + 'keyval = %s\n' + %event_key.keyval) + # https://developer.gnome.org/gdk3/stable/gdk3-Event-Structures.html#GdkEvent… + # See /usr/include/gtk-3.0/gdk/gdkkeysyms.h for a list + # of Gdk keycodes + if (event_key.keyval in ( + Gdk.KEY_Tab, + Gdk.KEY_Down, Gdk.KEY_KP_Down, + Gdk.KEY_Up, Gdk.KEY_KP_Up, + Gdk.KEY_Page_Down, Gdk.KEY_KP_Page_Down, + Gdk.KEY_Page_Up, Gdk.KEY_KP_Page_Up)): + self._search_bar.set_search_mode(False) + return + if not event_key.string: + return + self._search_bar.set_search_mode(True) + self._search_bar.show_all() + # The search entry needs to be realized to be able to + # handle a key event. If it is not realized yet when + # the key event arrives, one will get the message: + # + # Gtk-CRITICAL **: gtk_widget_event: + # assertion 'WIDGET_REALIZED_FOR_EVENT (widget, event)' failed + # + # and the typed key will not appear in the search entry. + # + # The self._search_bar.show_all() realizes the search + # entry, but only when the pending events are handled. + # So we need to call Gtk.main_iteration() while events + # are pending. + # + # But *only* if the search entry is not realized yet, + # i.e. only if self._search_entry.get_window() returns ��None��. + # After the first key press it is realized and we must not do + # this anymore. Continuing to handle the pending events here + # when the search entry is already realized makes the keys + # appear out of order in the search entry when typing + # fast. For example, when typing ��flow�� fast one may get + # ��flwo��. + if not self._search_entry.get_window(): + while Gtk.events_pending(): + Gtk.main_iteration() + self._search_bar.handle_event(event_key) + + def on_close_aboutdialog(self, action, dummy_parameter): + action.destroy() + + def on_about_button_clicked(self, button): if _ARGS.debug: - sys.stdout.write('on_switch_page() page_number = %s\n' - %page_number) - if page_number == 0: - # This is the ��Browse�� page - # The recently used emoji might have changed if we selected - # an emoji in the search page. Therefore, if we return to - # the ��Browse�� page and the ��Recently used�� label is selected, - # we need to update the flowbox for the recently used emoji: - if self._currently_selected_label == ('dummy_language', '', ''): - self._fill_flowbox('dummy_language', '', '') - if page_number == 1: - # This is the ��Search�� page - self._search_entry.connect('draw', self.on_search_entry_draw) - - def on_search_entry_show(self, entry): # pylint: disable=no-self-use - ''' - Signal handler for showing the search entry - - :param entry: The search entry - :type entry: Gtk.Entry object - ''' + sys.stdout.write('on_about_button_clicked()\n') + if GTK_VERSION >= (3, 22, 0): + self._main_menu_popover.popdown() + self._main_menu_popover.hide() + aboutdialog = Gtk.AboutDialog() + # An empty string in aboutdialog.set_logo_icon_name('') + # prevents an ugly default icon to be shown. We don��t yet + # have nice icons for ibus-typing-booster. + aboutdialog.set_logo_icon_name('') + aboutdialog.set_title( + '�� ibus-typing-booster %s' %version.get_version()) + aboutdialog.set_program_name( + '�� ibus-typing-booster') + aboutdialog.set_version(version.get_version()) + aboutdialog.set_comments( + 'A completion input method to speedup typing') + aboutdialog.set_copyright( + 'Copyright �� 2017 Mike FABIAN') + aboutdialog.set_authors([ + 'Mike FABIAN <maiku.fabian(a)gmail.com>', + 'Anish Patil <anish.developer(a)gmail.com>', + ]) + aboutdialog.set_translator_credits( + # Translators: put your names here, one name per line. + _('translator-credits')) + # aboutdialog.set_artists('') + aboutdialog.set_documenters([ + 'Mike FABIAN <maiku.fabian(a)gmail.com>', + ]) + aboutdialog.set_website( + 'http://mike-fabian.github.io/ibus-typing-booster') + aboutdialog.set_website_label( + 'http://mike-fabian.github.io/ibus-typing-booster') + aboutdialog.set_license(''' + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + ''') + aboutdialog.set_wrap_license(True) + # overrides the above .set_license() + aboutdialog.set_license_type(Gtk.License.GPL_3_0) + aboutdialog.connect('response', self.on_close_aboutdialog) + aboutdialog.set_transient_for(self) + aboutdialog.show() + + def _fill_flowbox_with_search_results(self): if _ARGS.debug: - sys.stdout.write('on_search_entry_show()\n') - entry.grab_focus_without_selecting() + sys.stdout.write( + '_fill_flowbox_with_search_results() query_string = %s\n' + %self._query_string) + candidates = self._emoji_matcher.candidates( + self._query_string, + match_limit=1000) + + self._browse_treeview_unselect_all() + self._header_bar.set_title(_('Search Results')) + self._header_bar.set_subtitle(str(len(candidates))) + + if not candidates: + self._candidates_invalid = False + self._busy_stop() + return - def on_search_entry_draw( # pylint: disable=no-self-use - self, entry, dummy_cairo_context): - ''' - Signal handler for drawing the search entry + for candidate in candidates: + # Do *not* do + # + # while Gtk.events_pending(): + # Gtk.main_iteration() + # + # here. Although this will keep the spinner turning, it + # will have the side effect that further key events maybe + # added to the query string while the flowbox is being + # filled. But then the on_search_entry_search_changed() + # callback will think that nothing needs to be done + # because self._candidates_invalid is True already. + emoji = candidate[0] + name = candidate[1] + score = candidate[2] + description = self._emoji_description(emoji) + label = Gtk.Label() + # Make font for emoji large using pango markup + label.set_text( + '' + %(self._font, self._fontsize) + + html.escape(emoji) + + '' + + '' + %(self._fontsize / 2) + + ' ' + html.escape(name) + + '') + label.set_use_markup(True) + label.set_hexpand(False) + label.set_vexpand(False) + label.set_xalign(0) + label.set_yalign(0.5) + # Gtk.Align.FILL, Gtk.Align.START, Gtk.Align.END, + # Gtk.Align.CENTER, Gtk.Align.BASELINE + label.set_halign(Gtk.Align.FILL) + label.set_valign(Gtk.Align.FILL) + margin = 0 + label.set_margin_start(margin) + label.set_margin_end(margin) + label.set_margin_top(margin) + label.set_margin_bottom(margin) + if itb_emoji._is_invisible(emoji): + label.set_tooltip_text( + description + '\n\n' + _('Click to copy')) + else: + label.set_tooltip_markup( + '' + %(self._font, self._fontsize * 4) + + html.escape(emoji) + + '\n\n' + + html.escape(description + '\n\n' + _('Click to copy'))) + self._flowbox.insert(label, -1) - :param entry: The search entry - :type entry: Gtk.Entry object - :param dummy_cairo_context: not used - :type dummy_cairo_context: cairo.Context object - ''' - if _ARGS.debug: - sys.stdout.write('on_search_entry_draw()\n') - entry.grab_focus_without_selecting() - - def _update_candidates(self): - for candidate in self._emoji_matcher.candidates(self._query_string): - self._search_treeview_model.append( - ('' - %(self._font, self._fontsize) - + html.escape(candidate[0]) - + '' - + '' - %(self._fontsize / 2) - + ' ' + html.escape(candidate[1]) - + '', - candidate[0])) + self.show_all() self._candidates_invalid = False + self._busy_stop() - def on_search_entry_text_changed(self, widget, dummy_property_spec): + def on_search_entry_search_changed(self, search_entry): ''' Signal handler for changed text in the search entry :param widget: The search entry - :type widget: Gtk.Entry object - :param dummy_property_spec: not used + :type widget: Gtk.SearchEntry object ''' - query_string = widget.get_text() + query_string = search_entry.get_text() if _ARGS.debug: sys.stdout.write( - 'on_search_entry_text_changed() query_string = %s\n' + 'on_search_entry_search_changed() query_string = %s\n' %query_string) - self._search_treeview_model = Gtk.ListStore(str, str) - self._search_treeview.set_model(self._search_treeview_model) - if not query_string: + if not self._search_bar.get_search_mode(): + # If the text in the search entry changes while + # the search bar is invisible, ignore it. return self._query_string = query_string if self._candidates_invalid: + if _ARGS.debug: + sys.stdout.write( + 'on_search_entry_search_changed() ' + + 'self._candidates_invalid = %s\n' + %self._candidates_invalid) return self._candidates_invalid = True - GLib.idle_add(self._update_candidates) + self._clear_flowbox() + self._busy_start() + GLib.idle_add(self._fill_flowbox_with_search_results) def on_label_selected(self, selection): ''' @@ -715,14 +823,20 @@ class EmojiPickerUI(Gtk.Window): return if _ARGS.debug: sys.stdout.write( - "on_label_selected(): model[iterator] = %s\n" - %model[iterator][:]) + 'on_label_selected(): model[iterator] = %s\n' + %model[iterator][:] + + 'self._currently_selected_label = %s\n' + %repr(self._currently_selected_label)) + self._search_bar.set_search_mode(False) + self._browse_treeview.grab_focus() language = model[iterator][1] label_key = model[iterator][2] label = model[iterator][3] if self._currently_selected_label != (language, label_key, label): self._currently_selected_label = (language, label_key, label) - self._fill_flowbox(language, label_key, label) + self._clear_flowbox() + self._busy_start() + GLib.idle_add(self._fill_flowbox_browse) def on_row_activated( # pylint: disable=no-self-use self, treeview, treepath, column): @@ -740,6 +854,14 @@ class EmojiPickerUI(Gtk.Window): 'on_row_activated() %s %s %s\n' %(repr(treeview), repr(treepath), repr(column))) + def _emoji_selected_popover_popdown(self): + if self._emoji_selected_popover: + if GTK_VERSION >= (3, 22, 0): + self._emoji_selected_popover.popdown() + self._emoji_selected_popover.hide() + self._emoji_selected_popover = None + return False + def on_emoji_selected(self, dummy_flowbox, flowbox_child): ''' Signal handler for selecting an emoji in the browser @@ -749,35 +871,53 @@ class EmojiPickerUI(Gtk.Window): :param flowbox_child: The child object containing the selected emoji :type flowbox_child: Gtk.FlowBoxChild object ''' - emoji = flowbox_child.get_child().get_text() - # The label might contain some markup, for example - # to change the font size for the emoji. Remove all - # markup to get only the emoji itself: - emoji = html.unescape(re.sub('<[^<]+?>', '', emoji)) + # Use .get_label() instead of .get_text() to fetch the text + # from the label widget including any embedded underlines + # indicating mnemonics and Pango markup. The emoji is in + # first ..., and we want fetch only the emoji + # here: + text = flowbox_child.get_child().get_label() if _ARGS.debug: - sys.stdout.write("on_emoji_selected() emoji = %s\n" %emoji) + sys.stdout.write("on_emoji_selected() text = %s\n" %text) + pattern = re.compile(r'<span[^<]*?>(?P<emoji>[^<]+?)') + match = pattern.match(text) + if match: + emoji = html.unescape(match.group('emoji')) + if _ARGS.debug: + sys.stdout.write("on_emoji_selected() repr(emoji) = %s\n" %repr(emoji)) + else: + return self._selection_clipboard.set_text(emoji, -1) self._selection_primary.set_text(emoji, -1) self._add_to_recently_used(emoji) + self._emoji_selected_popover = Gtk.Popover() + self._emoji_selected_popover.set_relative_to(flowbox_child.get_child()) + self._emoji_selected_popover.set_position(Gtk.PositionType.TOP) + rectangle = Gdk.Rectangle() + rectangle.x = 0 + rectangle.y = 0 + rectangle.width = self._fontsize * 1.5 + rectangle.height = self._fontsize * 1.5 + self._emoji_selected_popover.set_pointing_to(rectangle) + label = Gtk.Label(_('Copied to clipboard!')) + self._emoji_selected_popover.add(label) + if GTK_VERSION >= (3, 22, 0): + self._emoji_selected_popover.popup() + self._emoji_selected_popover.show_all() + GLib.timeout_add(500, self._emoji_selected_popover_popdown) + + def on_main_menu_button_clicked(self, button): + if _ARGS.debug: + sys.stdout.write('on_main_menu_button_clicked()\n') + if GTK_VERSION >= (3, 22, 0): + self._main_menu_popover.popup() + self._main_menu_popover.show_all() - def on_candidate_selected(self, selection): - ''' - Signal handler for selecting a emoji in the search results - - :param selection: The selected row in the search results treeview - :type selection: Gtk.TreeSelection object - ''' - (model, iterator) = selection.get_selected() - if not iterator: - return + def on_toggle_search_button_clicked(self, button): if _ARGS.debug: - sys.stdout.write( - 'on_candidate_activated() model[iterator] = %s\n' - %model[iterator][:]) - emoji = model[iterator][1] - self._selection_clipboard.set_text(emoji, -1) - self._selection_primary.set_text(emoji, -1) - self._add_to_recently_used(emoji) + sys.stdout.write('on_toggle_search_button_clicked()\n') + self._search_bar.set_search_mode( + not self._search_bar.get_search_mode()) def get_languages(): ''' @@ -835,5 +975,4 @@ if __name__ == '__main__': font=_ARGS.font, fontsize=_ARGS.fontsize, modal=_ARGS.modal) - EMOJI_PICKER_UI.show_all() Gtk.main()

1 0

[ibus-typing-booster] master: emoji-picker: Use ��Symbola�� as the default font (2334495)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 2334495f351fa99c70f1ea9d6a5d3ba3ebc1f977 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Feb 27 00:35:50 2017 +0100 emoji-picker: Use ��Symbola�� as the default font I.e. when no font is specified on the command line and no font is saved in the config file, try ��Symbola�� instead of just using the system default. If ��Symbola�� is not there, it will fall back to the system default anyway. >--------------------------------------------------------------- engine/emoji_picker.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/engine/emoji_picker.py b/engine/emoji_picker.py index 8bfed49..9bde44e 100644 --- a/engine/emoji_picker.py +++ b/engine/emoji_picker.py @@ -139,7 +139,7 @@ class EmojiPickerUI(Gtk.Window): self.set_default_size(700, 400) self._modal = modal self.set_modal(self._modal) - self._font = '' + self._font = 'Symbola' self._fontsize = 24 self._options_file = os.path.join( xdg.BaseDirectory.save_data_path('emoji-picker'),

1 0

[ibus-typing-booster] master: Add option to the emoji-picker to load *all* Unicode characters (f730c43)
by mfabian＠fedoraproject.org 27 Feb '17

27 Feb '17

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster February 2017