ibus-typing-booster December 2016

ibus-typing-booster@lists.fedorahosted.org

1 participants
20 discussions

How to install?
by Thomas Güttler 20 Jan '17

20 Jan '17

How to install ibus-typing-booster on Ubuntu 14.04 (LTS)? This page is unfortunately empty: http://typingbooster.org/howtoinstall/ Regards, Thomas Güttler PS: I have seen only commits on this list, not discussion. Am I wrong here? -- http://www.thomas-guettler.de/

2 1

[ibus-typing-booster] master: lsb_release only exists on Linux. Don't abort the tests on other platforms. (baecf30)
by mfabian＠fedoraproject.org 27 Dec '16

27 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit baecf30ee1a5d5f467092158c53a251c03aca825 Author: thierry-FreeBSD <thierry(a)FreeBSD.org> Date: Mon Dec 26 20:12:19 2016 +0100 lsb_release only exists on Linux. Don't abort the tests on other platforms. >--------------------------------------------------------------- tests/test_itb.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/test_itb.py b/tests/test_itb.py index 1bbc076..eca7231 100644 --- a/tests/test_itb.py +++ b/tests/test_itb.py @@ -23,6 +23,7 @@ This file implements the test cases for the unit tests of ibus-typing-booster ''' import sys +import platform import unicodedata import unittest import subprocess @@ -352,7 +353,7 @@ class ItbTestCase(unittest.TestCase): self.assertEqual(self.engine.mock_committed_text, '�� ') def test_korean(self): - if 'openSUSE' in str(subprocess.check_output(["lsb_release","-is"])): + if platform.system() == 'Linux' and 'openSUSE' in str(subprocess.check_output(["lsb_release","-is"])): # There is no Korean myspell dictionary on openSUSE # Therefore, this test cannot work and has to be skipped # when running on openSUSE.

1 0

[ibus-typing-booster] master: Fix wrong filename in comment of typing-booster.xml (3b34785)
by mfabian＠fedoraproject.org 27 Dec '16

27 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 3b34785ae58901f0e9bb5852b9d8951a93585f4b Author: Mike FABIAN <mfabian(a)redhat.com> Date: Wed Dec 21 13:44:09 2016 +0100 Fix wrong filename in comment of typing-booster.xml >--------------------------------------------------------------- engine/typing-booster.xml.in | 2 +- engine/typing-booster.xml.in.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/typing-booster.xml.in b/engine/typing-booster.xml.in index de687e3..2b70408 100644 --- a/engine/typing-booster.xml.in +++ b/engine/typing-booster.xml.in @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> - + <component> <name>org.freedesktop.IBus.IbusTypingBooster</name> <description>Table Component</description> diff --git a/engine/typing-booster.xml.in.in b/engine/typing-booster.xml.in.in index de687e3..2b70408 100755 --- a/engine/typing-booster.xml.in.in +++ b/engine/typing-booster.xml.in.in @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> - + <component> <name>org.freedesktop.IBus.IbusTypingBooster</name> <description>Table Component</description>

1 0

[ibus-typing-booster] master: Release 1.5.15 (7999066)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 79990663b214085ad2d1c63bf5b3d8b410ddd503 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Thu Dec 8 13:47:46 2016 +0100 Release 1.5.15 >--------------------------------------------------------------- ChangeLog | 8 ++++++++ configure.ac | 2 +- ibus-typing-booster.pc.in | 2 +- typing-booster.appdata.xml | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1069d6c..e678b2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ * Author: Mike FABIAN <mfabian(a)redhat.com> +* 08 Dec 2016 Released 1.5.15 version +* Default value for self._show_status_info_in_auxiliary_text should be True +* Don��t use keyword arguments when instantiating IBus.LookupTable() +* Add an option to choose the orientation of the lookup table +* Update translations from zanata (de, pl, and uk updated) +* Update emojione.json + +* Author: Mike FABIAN <mfabian(a)redhat.com> * 25 Nov 2016 Released 1.5.14 version * Reopen pre��dit not only on Backspace but also on Delete and arrow keys * Fix "delete whitespace when committing punctuation" problem in firefox (Resolves rhbz#1399192) diff --git a/configure.ac b/configure.ac index 6f377bf..f394bc7 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], [14]) +m4_define([ibus_micro_version], [15]) 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/ibus-typing-booster.pc.in b/ibus-typing-booster.pc.in index 428673e..fdd7f57 100755 --- a/ibus-typing-booster.pc.in +++ b/ibus-typing-booster.pc.in @@ -11,7 +11,7 @@ enginedir=/usr/share/ibus/engine Name: IBus-Typing-Booster Description: Table Based Input Method Framework for Intelligent Input Bus for Linux / Unix OS -Version: 1.5.14 +Version: 1.5.15 Requires: Libs: Cflags: diff --git a/typing-booster.appdata.xml b/typing-booster.appdata.xml index 6f16c5f..b9f1249 100644 --- a/typing-booster.appdata.xml +++ b/typing-booster.appdata.xml @@ -16,6 +16,29 @@ <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.15" date="2016-12-08" urgency="medium"> + <description> + <ul> + <li> + Default value for self._show_status_info_in_auxiliary_text + should be True + </li> + <li> + Don��t use keyword arguments when instantiating + IBus.LookupTable() + </li> + <li> + Add an option to choose the orientation of the lookup table + </li> + <li> + Update translations from zanata (de, pl, and uk updated) + </li> + <li> + Update emojione.json + </li> + </ul> + </description> + </release> <release version="1.5.14" date="2016-11-25" urgency="medium"> <description> <ul>

1 0

[ibus-typing-booster] master: Update emojione.json (c533c2c)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit c533c2c88fc86b7880db795938cb9593dab287c3 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Dec 13 10:31:01 2016 +0100 Update emojione.json >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^c533c2c88fc86b7880db795938cb9593dab287c3~1 c533c2c88fc86b7880db795938cb9593dab287c3

1 0

[ibus-typing-booster] master: Update .spec file to current Fedora 25 .spec file (a297413)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit a297413a1ea905622ed797bd5545ef84b2383ef2 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Fri Dec 9 16:05:46 2016 +0100 Update .spec file to current Fedora 25 .spec file >--------------------------------------------------------------- ibus-typing-booster.spec.in | 207 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 204 insertions(+), 3 deletions(-) diff --git a/ibus-typing-booster.spec.in b/ibus-typing-booster.spec.in index ebb8a34..d31fe4d 100644 --- a/ibus-typing-booster.spec.in +++ b/ibus-typing-booster.spec.in @@ -1,7 +1,7 @@ Name: ibus-typing-booster -Version: 1.5.1 +Version: 1.5.14 Release: 1%{?dist} -Summary: A typing booster engine for the IBus platform +Summary: A completion input method License: GPLv3+ Group: System Environment/Libraries URL: https://mike-fabian.github.io/ibus-typing-booster/ @@ -11,12 +11,25 @@ Requires: m17n-lib Requires: python3 >= 3.3 Requires: python3-dbus Requires: python3-enchant +# Recommend a reasonably good font which has most of the emoji: +Recommends: gdouros-symbola-fonts BuildRequires: ibus-devel BuildRequires: python3-devel +# for the unit tests +BuildRequires: m17n-lib +BuildRequires: m17n-db-extras +BuildRequires: python3-enchant +BuildRequires: hunspell-cs +BuildRequires: hunspell-de +BuildRequires: hunspell-en +BuildRequires: hunspell-es +BuildRequires: hunspell-it +BuildRequires: hunspell-ko BuildArch: noarch %description -The Typing Booster engine for IBus platform. +Ibus-typing-booster is a context sensitive completion +input method to speedup typing. %prep %setup -q @@ -35,8 +48,34 @@ gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json} %find_lang %{name} %check +export LC_ALL=en_US.UTF-8 desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-typing-booster.desktop +pushd engine + # run doctests + python3 hunspell_suggest.py + python3 m17n_translit.py + python3 itb_emoji.py + python3 itb_util.py +popd +eval $(dbus-launch --sh-syntax) +dconf dump / +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/offtherecord false +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/usedigitsasselectkeys true +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/tabenable false +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/inputmethod "'NoIme'" +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/adddirectinput false +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/rememberlastusedpreeditime true +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/mincharcomplete 1 +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/dictionary "'en_US'" +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/emojipredictions true +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/autocommitcharacters "''" +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/pagesize 6 +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/shownumberofcandidates true +dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/showstatusinfoinaux true +dconf dump / +ibus-daemon -drx +make check || cat ./tests/test-suite.log %post [ -x %{_bindir}/ibus ] && \ @@ -57,9 +96,171 @@ desktop-file-validate \ %{_datadir}/applications/ibus-setup-typing-booster.desktop %changelog +* Fri Nov 25 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.14-1 +- update to 1.5.14 +- Reopen pre��dit not only on Backspace but also on Delete and arrow keys +- Fix "delete whitespace when committing punctuation" problem in firefox + Resolves rhbz#1399192 +- Add pt_BR translations from zanata. Update uk, pl, and de translations from zanata. +- Add an option to show/hide the status information in the auxiliary text +- Use ballot box characters in front of the mode indicators in the auxiliary text + +* Mon Nov 21 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.13-1 +- update to 1.5.13 +- Update French translations from zanata + +* Sun Nov 20 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.12-1 +- update to 1.5.12 +- Display existing shortcuts and make it possible to delete them +- Update translations from zanata (de, pl, uk) + +* Thu Nov 17 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.11-1 +- update to 1.5.11 +- Add feature to define custom shortcuts +- Merge editor and tabengine classes + +* Wed Nov 09 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.10-1 +- update to 1.5.10 +- Make accent insensitive matching also work in the user database +- Add test cases for accent insensitive matching +- Add 'No' (Number, Other) to VALID_CATEGORIES to be able to + match �� U+00B9 SUPERSCRIPT ONE + +* Mon Oct 24 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.9-1 +- update to 1.5.9 +- Make it possible to use a database in different locations than the default +- Clear candidate list as well when clearing the lookup table +- Add missing CLDR xml files to tar ball +- Add unit tests + +* Mon Oct 10 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.8-1 +- update to 1.5.8 +- Pull translations from Zanata (uk and fr updated) +- Match many more Unicode characters in the emoji matcher +- Make it possible to match Unicode characters by typing the hexadecimal code point +- If one tries to set a non-existing input method, don��t crash, + only print an error in the debug log +- Add key and mouse bindings for ��Off the record�� mode to README + +* Mon Sep 19 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.7-1 +- update to 1.5.7 +- Pull translations from Zanata (de, pl, uk updated) +- Make the list of characters to auto commit configurable + (Empty list by default) +- Fix duplicates in the candidate list caused by overwriting + input_phrase with the NFC version +- Don��t show the special candidates for missing dictionaries for + Japanese and Chinese +- Implement do_cursor_up() and do_cursor_down() to make scrolling + the lookup table with the mouse wheel work (Needs also a patch in ibus) +- Add an ��Off the record mode�� (also gets a property menu) +- Tooltips don��t seem to work on sub-properties, remove the tooltips there +- Add a property menu for the emoji prediction mode +- Make triggering a commit with ��Left�� or ��Control+Left�� work + correctly in ��Tab enable mode �� again +- Down, Up, Page_Down, and Page_Up should trigger a commit and + be passed to the application if possible +- If �� Enable suggestions by Tab key�� is on make it possible + to close the lookup table with Escape but keep the pre��dit +- If �� Enable suggestions by Tab key�� is on, don��t autocommit digits +- Make autocommitting much more rare (for characters which are not + the first typed character) +- Don��t autocommit the first typed character unless absolutely necessary +- Even when �� Enable suggestions by Tab key�� is used, + don��t complete empty strings + +* Mon Sep 12 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.6-1 +- update to 1.5.6 +- Reduce the number of characters which cause immediate commits a lot +- Load CLDR data for *all* languages in the _expand_languages() list +- Currency symbols should neither be stripped from tokens nor + trigger an immediate commit +- Fix bidi reordering problem in the candidate list for + right-to-left candidates followed by comments +- Update emoji annotations from CLDR (de_CH and sr_Latn new, + the others updated) +- Remove category 'Pc' from categories to commit immediately + (allow _ to be typed into the pre��dit always) +- Remove button to install pyhunspell from the setup tool + (python3-enchant is preferred and even required by the Fedora rpm) +- Include more currency symbols and fullwidth symbols +- Add category from UnicodeData.txt to emoji dictionary + (For better results when looking up related characters) +- Add 'Sc', # Symbol, Currency to VALID_CATEGORIES + (to make the currency symbols work) +- Add list of valid characters (to include special characters + manually) +- Add mouse binding Alt+Mouse3 anywhere in the candidate list + to start the setup tool + +* Sat Sep 10 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.5-1 +- update to 1.5.5 +- Pull translations form Zanata (de, pl, and uk updated because of + the new ��About�� tab) +- If �� Enable suggestions by Tab key�� option is on, any pre��dit + change should hide the lookup table +- Make showing of similar emoji work even if emoji preditions are off +- Display whether emoji predictions are turned on in the auxiliary string +- Add key and mouse bindings to toggle the emoji predictions + (AltGr+F6 and Control+Mouse3 anywhere in the candidate list) +- Add AltGr+F10 key binding to open the setup tool +- Allow any amount of white space and '_' characters to seperate words + in an emoji query string +- Add an ��About�� tab to the setup tool and put links to home page and + online documentation there. +- Update README with latest key binding and mouse binding documentation + +* Thu Sep 08 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.4-1 +- update to 1.5.4 +- Accent insensitive matching +- Update pl.po from zanata +- Add cache for the suggestions from the hunspell dictionaries +- Make Control+MouseButton1 remove the clicked candidate from + the user database (was MouseButton2) +- Change key binding for looking up related candidates + from Alt+F12 to AltGr+F12 +- Change label of the emoji option to + �� Unicode symbols and emoji predictions�� + +* Sat Sep 03 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.3-1 +- update to 1.5.3 +- Pull translations from Zanata: updates for pl and uk. +- Fix behaviour of the option ��Minimum number of chars for completion�� + +* Fri Sep 02 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.2-1 +- update to 1.5.2 +- get_supported_imes(self) and def get_current_imes(self) should + return copies not the lists directly +- Resolves: rhbz#1372660 +- Update emojione.json, version from 2016-07-16 +- Pull translations from Zanata: Fixes for fr and pl. New: uk +- Changes in itb_emoji.py necessary because of the update of + the CLDR emoji annotations. +- Update emoji annotations from CLDR (be, bs, cy, eu, gl, zu + are new, the others updated). +- Shortcut keys which look up related candidates should enable + the candidate list +- Show �� HOURGLASS WITH FLOWING SAND in the auxiliary text when + the lookup table is being updated +- Fix bug when committing the pre��dit with Space when no + candidates are available +- Improve the behaviour of the ��Tab�� key +- Improve the behaviour of the ��Escape�� key. +- Make mouse clicks in the candidate list behave differently + depending on the mouse button +- Add hu-rovas-post.mim to hu_HU.conf + * Fri Aug 12 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.1-1 - update to 1.5.1 +- If the query string in EmojiMatcher.candidates() is an emoji + itself, match similar ones (useful when backspacing to an emoji + to correct it) - Data files should not be stored gzipped in the repository +- Change displayed input method name from ��Hunspell�� to ��Typing Booster�� +- Use Zanata to get more translations +- French translations added (100% translated) +- Polish translations added (100% translated) +- Add Recommends: gdouros-symbola-fonts * Thu Aug 11 2016 Mike FABIAN <mfabian(a)redhat.com> - 1.5.0-1 - update to 1.5.0

1 0

[ibus-typing-booster] master: Make unit tests work on SuSE (71f9ee6)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 71f9ee6b4dc818dd92df71c0177bd6f16e5db84f Author: Mike FABIAN <mfabian(a)redhat.com> Date: Thu Dec 8 13:15:59 2016 +0100 Make unit tests work on SuSE >--------------------------------------------------------------- engine/hunspell_suggest.py | 4 ++-- engine/itb_emoji.py | 3 --- tests/test_itb.py | 6 ++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/engine/hunspell_suggest.py b/engine/hunspell_suggest.py index 791f987..b42e9e2 100755 --- a/engine/hunspell_suggest.py +++ b/engine/hunspell_suggest.py @@ -255,8 +255,8 @@ class Hunspell: (Attention, the return values are in NORMALIZATION_FORM_INTERNAL ('NFD')) >>> h = Hunspell(['de_DE', 'cs_CZ']) - >>> h.suggest('Geschwindigkeitsubertre') - [('Geschwindigkeitsu��bertretungsverfahren', 0), ('Schreitgeschwindigkeit', -1), ('Geschwindigkeitsabha��ngig', -1), ('Geschwindigkeitsoptimiert', -1), ('Geschwindigkeitsabha��ngige', -1)] + >>> h.suggest('Geschwindigkeitsubertre')[0] + ('Geschwindigkeitsu��bertretungsverfahren', 0) >>> h.suggest('filosofictejsi') [('filosofic��te��js��i��', 0), ('filosofic��te��ji', -1)] diff --git a/engine/itb_emoji.py b/engine/itb_emoji.py index bcb080e..7987cba 100644 --- a/engine/itb_emoji.py +++ b/engine/itb_emoji.py @@ -825,9 +825,6 @@ class EmojiMatcher(): >>> mq.candidates('nature')[0][:2] ('��', 'blossom {nature}') - >>> mq.candidates('thankyou')[0][:2] - ('��', 'clinking beer mugs [thank you]') - >>> mq.candidates('travel')[0][:2] ('��', 'aerial tramway {travel}') diff --git a/tests/test_itb.py b/tests/test_itb.py index 73ba789..1bbc076 100644 --- a/tests/test_itb.py +++ b/tests/test_itb.py @@ -25,6 +25,7 @@ This file implements the test cases for the unit tests of ibus-typing-booster import sys import unicodedata import unittest +import subprocess from gi import require_version require_version('IBus', '1.0') @@ -351,6 +352,11 @@ class ItbTestCase(unittest.TestCase): self.assertEqual(self.engine.mock_committed_text, '�� ') def test_korean(self): + if 'openSUSE' in str(subprocess.check_output(["lsb_release","-is"])): + # There is no Korean myspell dictionary on openSUSE + # Therefore, this test cannot work and has to be skipped + # when running on openSUSE. + return self.engine.set_current_imes(['ko-romaja']) self.engine.set_dictionary_names(['ko_KR']) self.engine.do_process_key_event(IBus.KEY_a, 0, 0)

1 0

[ibus-typing-booster] master: Add .spec file for openSUSE (08a940e)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

1 0

[ibus-typing-booster] master: Update translations from zanata (de, pl, and uk updated) (4cebabf)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

1 0

[ibus-typing-booster] master: Add an option to choose the orientation of the lookup table (c69e2c9)
by mfabian＠fedoraproject.org 14 Dec '16

14 Dec '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit c69e2c9e6477dd7f19ad3deb077af0e0d1f605b7 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Thu Dec 8 08:46:40 2016 +0100 Add an option to choose the orientation of the lookup table >--------------------------------------------------------------- engine/hunspell_table.py | 47 +++++++++++++++++++++++++++++++++++++++++++++- setup/main.py | 43 +++++++++++++++++++++++++++++++++++++++++- setup/setup.glade | 47 +++++++++++++++++++++++++++++++++++++-------- tests/test_itb.py | 4 +++ 4 files changed, 130 insertions(+), 11 deletions(-) diff --git a/engine/hunspell_table.py b/engine/hunspell_table.py index 5824a79..7d9a43e 100644 --- a/engine/hunspell_table.py +++ b/engine/hunspell_table.py @@ -212,6 +212,13 @@ class TypingBoosterEngine(IBus.Engine): if self._page_size > 9: self._page_size = 9 # maximum page size supported + self._lookup_table_orientation = variant_to_value( + self._config.get_value( + self._config_section, + 'lookuptableorientation')) + if self._lookup_table_orientation is None: + self._lookup_table_orientation = IBus.Orientation.VERTICAL + self._show_number_of_candidates = variant_to_value( self._config.get_value( self._config_section, @@ -357,7 +364,7 @@ class TypingBoosterEngine(IBus.Engine): self._lookup_table = IBus.LookupTable() self._lookup_table.clear() self._lookup_table.set_page_size(self._page_size) - self._lookup_table.set_orientation(IBus.Orientation.VERTICAL) + self._lookup_table.set_orientation(self._lookup_table_orientation) self._lookup_table.set_cursor_visible(False) self.emoji_prediction_mode_properties = { @@ -2022,6 +2029,41 @@ class TypingBoosterEngine(IBus.Engine): ''' return self._page_size + def set_lookup_table_orientation(self, orientation, update_dconf=True): + '''Sets the page size of the lookup table + + :param orientation: The orientation of the lookup table + :type mode: integer >= 0 and <= 2 + :param update_dconf: Whether to write the change to dconf. + Set this to False if this method is + called because the dconf key changed + to avoid endless loops when the dconf + key is changed twice in a short time. + :type update_dconf: boolean + ''' + if DEBUG_LEVEL > 1: + sys.stderr.write( + "set_lookup_table_orientation(%s, update_dconf = %s)\n" + %(orientation, update_dconf)) + if orientation == self._lookup_table_orientation: + return + if orientation >= 0 and orientation <= 2: + self._lookup_table_orientation = orientation + self._lookup_table.set_orientation(self._lookup_table_orientation) + self.reset() + if update_dconf: + self._config.set_value( + self._config_section, + 'lookuptableorientation', + GLib.Variant.new_int32(page_size)) + + def get_lookup_table_orientation(self): + '''Returns the current orientation of the lookup table + + :rtype: integer + ''' + return self._lookup_table_orientation + def set_min_char_complete(self, min_char_complete, update_dconf=True): '''Sets the minimum number of characters to try completion @@ -2805,6 +2847,9 @@ class TypingBoosterEngine(IBus.Engine): if name == "pagesize": self.set_page_size(value, update_dconf=False) return + if name == "lookuptableorientation": + self.set_lookup_table_orientation(value, update_dconf=False) + return if name == "mincharcomplete": self.set_min_char_complete(value, update_dconf=False) return diff --git a/setup/main.py b/setup/main.py index 33522f9..ec7e1c6 100644 --- a/setup/main.py +++ b/setup/main.py @@ -340,6 +340,34 @@ class SetupUI: 'value-changed', event_handler.on_min_char_complete_adjustment_value_changed) + self.lookup_table_orientation_combobox = self.builder.get_object( + "lookup_table_orientation_combobox") + lookup_table_orientation_store = Gtk.ListStore(str, int) + lookup_table_orientation_store.append( + [_('Horizontal'), IBus.Orientation.HORIZONTAL]) + lookup_table_orientation_store.append( + [_('Vertical'), IBus.Orientation.VERTICAL]) + lookup_table_orientation_store.append( + [_('System default'), IBus.Orientation.SYSTEM]) + self.lookup_table_orientation_combobox.set_model( + lookup_table_orientation_store) + renderer_text = Gtk.CellRendererText() + self.lookup_table_orientation_combobox.pack_start( + renderer_text, True) + self.lookup_table_orientation_combobox.add_attribute( + renderer_text, "text", 0) + lookup_table_orientation = itb_util.variant_to_value( + self.config.get_value( + self.config_section, 'lookuptableorientation')) + if lookup_table_orientation is None: + lookup_table_orientation = IBus.Orientation.VERTICAL + for i, item in enumerate(lookup_table_orientation_store): + if lookup_table_orientation == item[1]: + self.lookup_table_orientation_combobox.set_active(i) + self.lookup_table_orientation_combobox.connect( + "changed", + event_handler.on_lookup_table_orientation_combobox_changed) + self.ime_combobox = self.builder.get_object("input_method_combobox") self.input_method_help_button = self.builder.get_object( "input_method_help_button") @@ -352,7 +380,6 @@ class SetupUI: ime_store.append([item.split(':')[0], item.split(':')[1]]) self.supported_imes.append(item.split(':')[1]) self.ime_combobox.set_model(ime_store) - renderer_text = Gtk.CellRendererText() self.ime_combobox.pack_start(renderer_text, True) self.ime_combobox.add_attribute(renderer_text, "text", 0) self.current_imes = [] @@ -835,6 +862,20 @@ class EventHandler: 'mincharcomplete', GLib.Variant.new_int32(min_char_complete)) + def on_lookup_table_orientation_combobox_changed(self, widget): + ''' + A change of the lookup table orientation has been requested + with the combobox + ''' + tree_iter = widget.get_active_iter() + if tree_iter != None: + model = widget.get_model() + orientation = model[tree_iter][1] + SETUP_UI.config.set_value( + SETUP_UI.config_section, + 'lookuptableorientation', + GLib.Variant.new_int32(orientation)) + def on_ime_combobox_changed(self, widget): ''' A change of the active input method has been requested diff --git a/setup/setup.glade b/setup/setup.glade index 606fe26..1085117 100644 --- a/setup/setup.glade +++ b/setup/setup.glade @@ -74,7 +74,7 @@ <object class="GtkTable" id="table4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">13</property> + <property name="n_rows">14</property> <property name="n_columns">2</property> <property name="column_spacing">8</property> <property name="row_spacing">4</property> @@ -147,8 +147,8 @@ <property name="xalign">0</property> </object> <packing> - <property name="top_attach">11</property> - <property name="bottom_attach">12</property> + <property name="top_attach">12</property> + <property name="bottom_attach">13</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -161,8 +161,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">11</property> - <property name="bottom_attach">12</property> + <property name="top_attach">12</property> + <property name="bottom_attach">13</property> <property name="y_options"/> </packing> </child> @@ -221,8 +221,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">10</property> - <property name="bottom_attach">11</property> + <property name="top_attach">11</property> + <property name="bottom_attach">12</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -237,8 +237,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">12</property> - <property name="bottom_attach">13</property> + <property name="top_attach">13</property> + <property name="bottom_attach">14</property> <property name="y_options"/> </packing> </child> @@ -380,6 +380,35 @@ <property name="y_options">GTK_FILL</property> </packing> </child> + <child> + <object class="GtkLabel" id="lookup_table_orientation_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Whether the candidate window should be drawn horizontally or vertically.</property> + <property name="vexpand">False</property> + <property name="label" translatable="yes">Candidate window orientation</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="top_attach">10</property> + <property name="bottom_attach">11</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkComboBox" id="lookup_table_orientation_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">10</property> + <property name="bottom_attach">11</property> + <property name="y_options"/> + </packing> + </child> </object> </child> </object> diff --git a/tests/test_itb.py b/tests/test_itb.py index d5b40a2..73ba789 100644 --- a/tests/test_itb.py +++ b/tests/test_itb.py @@ -67,6 +67,8 @@ class ItbTestCase(unittest.TestCase): self.engine.get_remember_last_used_preedit_ime()) self.orig_page_size = ( self.engine.get_page_size()) + self.orig_lookup_table_orientation = ( + self.engine.get_lookup_table_orientation()) self.orig_min_char_complete = ( self.engine.get_min_char_complete()) self.orig_show_number_of_candidates = ( @@ -95,6 +97,8 @@ class ItbTestCase(unittest.TestCase): self.orig_remember_last_used_preedit_ime) self.engine.set_page_size( self.orig_page_size) + self.engine.set_lookup_table_orientation( + self.orig_lookup_table_orientation) self.engine.set_min_char_complete( self.orig_min_char_complete) self.engine.set_show_number_of_candidates(

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster December 2016