ibus-typing-booster December 2015

ibus-typing-booster@lists.fedorahosted.org

1 participants
53 discussions

[ibus-typing-booster] release-1.3.0: Improve code to handle the left and right arrow keys (26c36bf)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Use Msymbols instead of just characters when transliterating and storing the typed input (e7c0aed)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Add an is_ascii() utility function (a2f95b5)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Don��t use MOD1 (left Alt key) to select a candidate to delete anymore (9e3c953)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Add ��Renganathan:ta-lk-renganathan�� input method option to ta_IN.conf (27c7f2e)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Add an option to disable whether the digits 1-9 are used as selection keys (f71a842)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : release-1.3.0 >--------------------------------------------------------------- commit f71a8425013e26cc34f0a0c4e5b3a4b7c98db51a Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Dec 15 15:31:36 2015 +0100 Add an option to disable whether the digits 1-9 are used as selection keys Using the digits 1-9 as keys to select a candidate to commit or to delete the candidate makes it impossible to use these digits as normal input. This make typing numbers more difficult, they can only be typed while the pre��dit is empty then. Therefore, numbers can not use completion when they are needed as select keys. But the F1-F9 keys are also always available as selection keys. So it is not an absolute requirment to make the digits 1-9 behave as selection keys as well. It may be convenient though because the distance between the 1-9 keys and the fingers is shorter than the distance between the F1-F9 keys and the fingers. Therefore, I added this options so the user can decide what is more important, having the 1-9 keys behave as selection keys or using them to input numbers. >--------------------------------------------------------------- ibus-typing-booster/engine/hunspell_table.py | 35 +++++++++++-- ibus-typing-booster/setup/main.py | 25 ++++++++++ ibus-typing-booster/setup/setup.glade | 65 +++++++++++++++++--------- 3 files changed, 96 insertions(+), 29 deletions(-) diff --git a/ibus-typing-booster/engine/hunspell_table.py b/ibus-typing-booster/engine/hunspell_table.py index a77321f..ca727ec 100644 --- a/ibus-typing-booster/engine/hunspell_table.py +++ b/ibus-typing-booster/engine/hunspell_table.py @@ -579,6 +579,13 @@ class tabengine (IBus.Engine): if self._show_number_of_candidates == None: self._show_number_of_candidates = False + self._use_digits_as_select_keys = variant_to_value( + self._config.get_value( + self._config_section, + 'usedigitsasselectkeys')) + if self._use_digits_as_select_keys == None: + self._use_digits_as_select_keys = True + self._icon_dir = '%s%s%s%s' % ( os.getenv('IBUS_HUNSPELL_TABLE_LOCATION'), os.path.sep, 'icons', os.path.sep) @@ -969,8 +976,16 @@ class tabengine (IBus.Engine): self._editor.insert_string_at_cursor(list(typed_character)) self._update_ui() return True - if (typed_character - and unicodedata.digit(typed_character, -1) != -1): + if (self._use_digits_as_select_keys + and typed_character + in ('1', '2', '3', '4', '5', '6', '7', '8', '9')): + # If digits are used as keys to select candidates + # it is not possibly to type them while the pre��dit + # is non-empty and candidates are displayed. + # In that case we have to make it possible to + # type digits here where the pre��dit is still empty. + # If digits are not used to select candidates, they + # can be treated just like any other input keys. if not self._editor.trans_m17n_mode: # If a digit has been typed and no transliteration # is used, we can pass it through @@ -1052,10 +1067,11 @@ class tabengine (IBus.Engine): # Commit or remove a candidate: if self._editor.get_candidates(): index = -1 - if key.val >= IBus.KEY_1 and key.val <= IBus.KEY_9: - index = key.val - IBus.KEY_1 - if key.val >= IBus.KEY_KP_1 and key.val <= IBus.KEY_KP_9: - index = key.val - IBus.KEY_KP_1 + if self._use_digits_as_select_keys: + if key.val >= IBus.KEY_1 and key.val <= IBus.KEY_9: + index = key.val - IBus.KEY_1 + if key.val >= IBus.KEY_KP_1 and key.val <= IBus.KEY_KP_9: + index = key.val - IBus.KEY_KP_1 if key.val >= IBus.KEY_F1 and key.val <= IBus.KEY_F9: index = key.val - IBus.KEY_F1 if index >= 0 and index < self._page_size: @@ -1297,6 +1313,13 @@ class tabengine (IBus.Engine): self._show_number_of_candidates = False self.reset() return + if name == "usedigitsasselectkeys": + if value == True: + self._use_digits_as_select_keys = True + else: + self._use_digits_as_select_keys = False + self.reset() + return if name == "inputmethod": if value in self._editor.get_supported_imes(): self._editor.set_current_ime(value) diff --git a/ibus-typing-booster/setup/main.py b/ibus-typing-booster/setup/main.py index 0d661b5..f659ef1 100644 --- a/ibus-typing-booster/setup/main.py +++ b/ibus-typing-booster/setup/main.py @@ -181,6 +181,17 @@ class SetupUI: show_number_of_candidates_checkbox.set_active(True) show_number_of_candidates_checkbox.connect( 'clicked', event_handler.onShowNumberOfCandidatesCheckbox) + use_digits_as_select_keys_checkbox = self.builder.get_object( + "use_digits_as_select_keys_checkbox") + self.use_digits_as_select_keys = self.variant_to_value( + self.config.get_value( + self.config_section, 'usedigitsasselectkeys')) + if self.use_digits_as_select_keys == None: + self.use_digits_as_select_keys = True + if self.use_digits_as_select_keys == True: + use_digits_as_select_keys_checkbox.set_active(True) + use_digits_as_select_keys_checkbox.connect( + 'clicked', event_handler.onUseDigitsAsSelectKeysCheckbox) self.page_size_adjustment = self.builder.get_object( "page_size_adjustment") self.page_size = self.variant_to_value(self.config.get_value( @@ -436,6 +447,20 @@ class EventHandler: 'shownumberofcandidates', GLib.Variant.new_boolean(False)) + def onUseDigitsAsSelectKeysCheckbox(self, widget): + if widget.get_active(): + SetupUi.use_digits_as_select_keys = True + SetupUi.config.set_value( + SetupUi.config_section, + 'usedigitsasselectkeys', + GLib.Variant.new_boolean(True)) + else: + SetupUi.use_digits_as_select_keys = False + SetupUi.config.set_value( + SetupUi.config_section, + 'usedigitsasselectkeys', + GLib.Variant.new_boolean(False)) + def onPageSizeAdjustmentValueChanged(self, widget): self.page_size = SetupUi.page_size_adjustment.get_value() SetupUi.config.set_value( diff --git a/ibus-typing-booster/setup/setup.glade b/ibus-typing-booster/setup/setup.glade index 5533b57..9a584f2 100644 --- a/ibus-typing-booster/setup/setup.glade +++ b/ibus-typing-booster/setup/setup.glade @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="min_char_complete_adjustment"> <property name="lower">1</property> <property name="upper">9</property> <property name="step_increment">1</property> </object> + <object class="GtkAdjustment" id="page_size_adjustment"> + <property name="lower">1</property> + <property name="upper">9</property> + <property name="step_increment">1</property> + </object> <object class="GtkDialog" id="main_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -68,7 +74,7 @@ <object class="GtkTable" id="table4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">8</property> <property name="row_spacing">4</property> @@ -97,8 +103,8 @@ <object class="GtkLabel" id="page_size_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Candidate window page size:</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -123,8 +129,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -133,12 +139,12 @@ <object class="GtkLabel" id="input_method_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Input Method:</property> + <property name="xalign">0</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -151,8 +157,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"/> </packing> </child> @@ -208,8 +214,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -223,11 +229,29 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="y_options"/> </packing> </child> + <child> + <object class="GtkCheckButton" id="use_digits_as_select_keys_checkbox"> + <property name="label" translatable="yes">Use digits as select keys</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="yalign">0.51999998092651367</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </object> </child> </object> @@ -336,20 +360,20 @@ <object class="GtkLabel" id="install_dictionary_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Install the dictionary package for this engine</property> <property name="wrap">True</property> <property name="width_chars">20</property> + <property name="xalign">0</property> </object> </child> <child> <object class="GtkLabel" id="install_pyhunspell_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Install pyhunspell package to get spellchecking suggestions</property> <property name="wrap">True</property> <property name="width_chars">20</property> + <property name="xalign">0</property> </object> <packing> <property name="top_attach">1</property> @@ -360,10 +384,10 @@ <object class="GtkLabel" id="learn_from_file_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Learn your style by reading a text file</property> <property name="wrap">True</property> <property name="width_chars">20</property> + <property name="xalign">0</property> </object> <packing> <property name="top_attach">2</property> @@ -374,10 +398,10 @@ <object class="GtkLabel" id="delete_learned_data_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Delete all personal language data learned from typing or from reading files</property> <property name="wrap">True</property> <property name="width_chars">20</property> + <property name="xalign">0</property> </object> <packing> <property name="top_attach">3</property> @@ -452,9 +476,4 @@ <action-widget response="0">close_button</action-widget> </action-widgets> </object> - <object class="GtkAdjustment" id="page_size_adjustment"> - <property name="lower">1</property> - <property name="upper">9</property> - <property name="step_increment">1</property> - </object> </interface>

1 0

[ibus-typing-booster] release-1.3.0: Add another test case to m17n_translit.py (3e46d58)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Some more debug prints to see the modifiers (c2abb0b)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Remove some Python2 compatibility stuff (13a9adf)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

[ibus-typing-booster] release-1.3.0: Remove member variables for page up/down keys, these keys are fix anyway (66d44a6)
by mfabian＠fedoraproject.org 16 Dec '15

16 Dec '15

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster December 2015