[ibus-typing-booster] master: Update README (cab6587)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit cab6587a5e0a58ed214e94fae03685b7206d22dc
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Fri Apr 29 12:08:44 2016 +0200
Update README
- explain the currently used keybindings correctly
- add some information about the new multilingual input
>---------------------------------------------------------------
README | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 138 insertions(+), 36 deletions(-)
diff --git a/README b/README
index 5ef4795..3af274a 100644
--- a/README
+++ b/README
@@ -1,40 +1,142 @@
== Introduction ==
-IBus-Hunspell-Table is the IM Engine framework for table-based input methods, and is
-forked from ibus-table whose Project Owner & Developer is Yu Yuwei <acevery(a)gmail.com>,
-with contributions from Caius "kaio" Chance <cchance(a)redhat.com>.
-The aim of IBus-Hunspell-Table is to provide a table based boosted environment for using hunspell dictionaries
-https://fedorahosted.org/ibus-hunspell-table
-Definitly, it is far from perfect, so if you have any wish or any
-suggestion, please send me an email <anish.developer(a)gmail.com>, I would be very please to hear
-from you :)
+ibus-typing-booster is a completion input method to speedup typing.
+
+Originally it was forked from ibus-table whose Project Owner &
+Developer is Yu Yuwei <acevery(a)gmail.com>, with contributions from
+Caius "kaio" Chance <cchance(a)redhat.com>.
+
+Developers:
+
+Mike FABIAN <mfabian(a)redhat.com>
+Anish Patil <anish.developer(a)gmail.com>
== Key Bindings ==
- Notice: Ctrl is "Control Key", Shift_L is the left "Shift Key",
- Shift_R is the right "Shift Key", Alt is the "Alt Key",
- Arrow_Left is the "Arrow Key" point to left, Arrow_Right is
- the "Arrow Key" point to right, similarly as Arrow_Up and
- Arrow_Down.
- Cursor is the one in preedit string.
- [Num1~Num9] means one key in Num1, Num2, Num3, ... ,
- Num9
-
-Space commit inputted string.
-
-
-Arrow_Left move cursor one character left in preedit string.
-Arrow_Right move cursor one character right in preedit string.
-Backspace remove the last input key or last character in
- preeidt string.
-Delete remove one character after the cursor in preedit
- string.
-
-Arrow_Down mext candidate.
-Arrow_Up previous candidate.
-Esc reset the input method.
-Num1 ~ Num9 select the correspondent candidate and commit
- inputted string
-
-Page_Up/Page_Down page up/down the lookup table of candidates.
--/+ when not been used as valid input keys, the same as
- Page_Up and Page_Down.
+Space Commit the pre��dit and send a space to the application,
+ i.e. commit the typed string followed by a space.
+Return Commit the pre��dit and send a Return to the application.
+Enter Commit the pre��dit and send a Enter to the application.
+Tab If the option ���Enable suggestions by Tab key��� is
+ *not* set:
+ ���Tab��� behaves like ���Space���, i.e. it commits
+ the typed string followed by a space.
+ If the option ���Enable suggestions by Tab key��� is
+ set:
+ ���Tab��� toggles the display of the candidate list.
+ I.e. it shows the candidate list if it was
+ hidden and hides the candidate list if it was
+ shown.
+
+Escape Clear pre��dit and discard contents.
+
+Left (Arrow left) Move cursor one typed key left in the pre��dit text.
+ May trigger a commit if the left end of the pre��dit
+ is reached.
+Control+Left Move cursor to the left end of the pre��dit text.
+ If the cursor is already at the left end of the pre��dit
+ text, trigger a commit and send a Control+Left
+ to the application.
+Right (Arrow right) Move cursor one typed key right in pre��dit text.
+ May trigger a commit if the right end of the pre��dit
+ is reached.
+Control+Right Move cursor to the right end of the pre��dit text.
+ If the cursor is already at the right end of the pre��dit
+ text, trigger a commit and send a Control+Right
+ to the application.
+Backspace Remove the typed key to the left of the cursor in
+ the pre��dit text.
+Control+Backspace Remove everything to the left of the cursor in the
+ pre��dit text.
+Delete Remove the typed key to the right of the cursor in the
+ pre��dit text.
+Control+Delete Remove everything to the right of the cursor in the
+ pre��dit text.
+
+Down (Arrow down) Select the next candidate.
+Up (Arrow up) Select the previous candidate.
+Page_Up Show next page of candidates.
+Page_Down Show previous page of candidates.
+
+F1 Commit the candidate with the label ���1���
+F2 Commit the candidate with the label ���2���
+...
+F9 Commit the candidate with the label ���9���
+1-9 Same as F1-F9 if the option ���Use digits as select keys���
+ is enabled. This makes selecting candidates a bit easier
+ because the number keys 1-9 are closer to the fingers then
+ F1-F9 on most keyboards. On the other hand, it makes
+ completing when typing numbers impossible and it makes
+ typing strings which are combinations of letters and
+ numbers like ���A4��� more difficult. If digits are used as
+ select keys, numbers can only be typed when no candidate
+ list is shown. In most cases this means that numbers can
+ only be typed when nothing else has been typed yet and
+ the pre��dit is empty.
+
+When more than one input method at the same time is used:
+
+Control+Down Switch input method used for the pre��dit to the
+ next input method
+Control+Up Switch input method used for the pre��dit to the
+ previous input method.
+
+
+== Multilingual input ==
+
+ibus-typing-booster supports using more than one input
+method/transliteration at the same time.
+
+For example, if one uses the ibus-typing-booster engine "mr-IN",
+i.e. the engine for the Indian language Marathi, one can select one of
+the Marathi input methods mr-itrans, mr-phonetic, mr-inscript, and
+mr-inscript2 in the setup tool. Keys typed will be transliterated
+using the selected transliteration method and looked up in the mr_IN
+hunspell dictionary and the user database of previous input.
+
+To add English as a second language to use at the same time, one can
+use the checkbox option ���Add direct input��� in the setup tool. If that
+option is selected, direct keyboard input is added as a second input
+method and the en_GB (British English) dictionary is added as a second
+dictionary in addition to the mr_IN dictionary.
+
+If more than one input/transliteration method is enabled, the typed
+keys will will be transliterated with each transliteration
+method and each result will be looked up in the enabled dictionaries
+and in the user database of previous input.
+
+That way, to type English, one does not have to switch off the Marathi
+engine of ibus-typing-booster, one can just type and suitable English
+candidates will show up as well in the candidate list. After typing a
+few characters, Marathi input is unlikely to match English candidates
+and English input is unlikely to match Marathi candidates. This works
+even better after ibus-typing-booster has learned a while from the
+user input because ibus-typing-booster tries to complete the currently
+typed word by also using the last few words typed before as additional
+information. Therefore, if the user types a combination of words again
+he has already typed previously, the prediction for the currently
+typed word will be much better.
+
+Using the setup tool it is currently only possible to add British
+English as a second language to the main language of an
+ibus-typing-booster engine.
+
+But internally, ibus-typing-booser already supports any combination
+of input methods and dictionaries, only the setup tool is not
+yet able to set this up. It can be done by setting the
+appropriate dconf keys manually though.
+
+Example:
+
+Setting three input/transliteration methods:
+
+ $ dconf write /desktop/ibus/engine/typing-booster/typing-booster-mr-in/inputmethod '"mr-itrans,t-latn-post,NoIme"'
+
+sets the three transliteration methods, ���mr-itrans��� (Marathi Itrans),
+���t-latn-post��� (A postscript input method to type accented Latin
+characters, e.g. typing ���u"��� will produce ��������), and ���NoIme��� (direct
+keyboard input without any transliteration).
+
+Setting 3 dictionaries:
+
+ $ dconf write /desktop/ibus/engine/typing-booster/typing-booster-mr-in/dictionary='"mr_IN,en_GB,de_DE"'
+sets the Marathi, the British English,and the German dictionary.
8 years
[ibus-typing-booster] master: Release 1.4.3 (06c0e2e)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 06c0e2eae41ae553243fd306b530607f12a5df25
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Thu Apr 28 12:44:46 2016 +0200
Release 1.4.3
>---------------------------------------------------------------
ChangeLog | 4 ++++
configure.ac | 2 +-
ibus-typing-booster.pc.in | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5522a43..415f59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
* Author: Mike FABIAN <mfabian(a)redhat.com>
+* 28 Apr 2016 Released 1.4.3 version
+* Fix AttributeError: 'editor' object has no attribute 'trans (Resolves: rhbz#1331338)
+
+* Author: Mike FABIAN <mfabian(a)redhat.com>
* 27 Apr 2016 Released 1.4.2 version
* Fix mistyped variable name (Resolves: rhbz#1330461)
* Add option to remember the pre��dit input method used last
diff --git a/configure.ac b/configure.ac
index d3b9fbc..5d839f4 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], [4])
-m4_define([ibus_micro_version], [2])
+m4_define([ibus_micro_version], [3])
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 d724591..0184e39 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.4.2
+Version: 1.4.3
Requires:
Libs:
Cflags:
8 years
[ibus-typing-booster] master: Fix AttributeError: 'editor' object has no attribute 'trans' (89e2017)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 89e2017b5d70901864ebc8f7575fd4f672ba62d3
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Thu Apr 28 12:39:48 2016 +0200
Fix AttributeError: 'editor' object has no attribute 'trans'
Resolves: rhbz#1331338: [abrt] ibus-typing-booster: hunspell_table.py:1278:_process_key_event:AttributeError: 'editor' object has no attribute 'trans
See: https://bugzilla.redhat.com/show_bug.cgi?id=1331338
>---------------------------------------------------------------
engine/hunspell_table.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/engine/hunspell_table.py b/engine/hunspell_table.py
index 78837c9..4147a27 100644
--- a/engine/hunspell_table.py
+++ b/engine/hunspell_table.py
@@ -254,6 +254,9 @@ class editor(object):
+ "self._transliterated_strings=%s\n"
%self._transliterated_strings)
+ def get_transliterators(self):
+ return self._transliterators
+
def get_transliterated_strings(self):
return self._transliterated_strings
@@ -1275,7 +1278,7 @@ class tabengine (IBus.Engine):
# native digits. For example, with mr-inscript we
# want ���3��� to be converted to ���������. So we try
# to transliterate and commit the result:
- transliterated_digit = self._editor.trans[
+ transliterated_digit = self._editor.get_transliterators()[
self.get_current_imes()[0]
].transliterate([key.msymbol])
self.commit_string(
8 years
[ibus-typing-booster] master: Release 1.4.2 (42b8326)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 42b8326618c31982294f8ceb22026fbc6f16d98d
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Apr 27 09:40:50 2016 +0200
Release 1.4.2
>---------------------------------------------------------------
ChangeLog | 7 +++++++
configure.ac | 2 +-
ibus-typing-booster.pc.in | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3efe812..5522a43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
* Author: Mike FABIAN <mfabian(a)redhat.com>
+* 27 Apr 2016 Released 1.4.2 version
+* Fix mistyped variable name (Resolves: rhbz#1330461)
+* Add option to remember the pre��dit input method used last
+* Update German translations
+* The combobox in the setup tool should show the first supported ime from dconf
+
+* Author: Mike FABIAN <mfabian(a)redhat.com>
* 20 Apr 2016 Released 1.4.1 version
* Avoid unnessary initialization of transliterators when the set of input methods has not changed
* Add property menu to choose the current preedit input method
diff --git a/configure.ac b/configure.ac
index dd70ae9..d3b9fbc 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], [4])
-m4_define([ibus_micro_version], [1])
+m4_define([ibus_micro_version], [2])
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 de4d332..d724591 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.4.1
+Version: 1.4.2
Requires:
Libs:
Cflags:
8 years
[ibus-typing-booster] master: Some edits of .gitignore (561438b)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 561438bf63749759375086fe8a69c6b28a62ae81
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Apr 27 16:00:00 2016 +0200
Some edits of .gitignore
>---------------------------------------------------------------
.gitignore | 3 ++-
engine/.gitignore | 2 +-
m4/.gitignore | 23 +++++++++++++++++++++++
setup/.gitignore | 1 +
4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index bab516b..b09d3f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ Makefile.in
/configure
/ibus-typing-booster.pc
/autom4te.cache/
-/m4/
+compile
+ibus-typing-booster-*.tar.gz
diff --git a/engine/.gitignore b/engine/.gitignore
index 8f0ac15..5e498d9 100644
--- a/engine/.gitignore
+++ b/engine/.gitignore
@@ -1,3 +1,3 @@
*.pyc
ibus-engine-typing-booster
-
+typing-booster.xml
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..edf4452
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,23 @@
+codeset.m4
+glibc2.m4
+glibc21.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lock.m4
+longdouble.m4
+longlong.m4
+printf-posix.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
+
diff --git a/setup/.gitignore b/setup/.gitignore
index 03dab21..8b5a4f6 100644
--- a/setup/.gitignore
+++ b/setup/.gitignore
@@ -1,2 +1,3 @@
*.pyc
ibus-setup-typing-booster
+ibus-setup-typing-booster.desktop
8 years
[ibus-typing-booster] master: The combobox in the setup tool should show the first supported ime from dconf (2a19c8b)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 2a19c8bf19dedc008f700ee9cd095815c1e456de
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Apr 27 13:30:21 2016 +0200
The combobox in the setup tool should show the first supported ime from dconf
Before this fix, it showed the first ime from dconf which was not 'NoIme'.
Therefore, if for the de_DE engine the dconf key was
inputmethod='NoIme,t-latn-post'
the combobox incorrectly showed 't-latn-post' as the selected input
method although 'NoIme' is also a officially supported input method
for the de_DE engine.
And, if for the mr_IN engine the dconf key was
inputmethod='t-latn-post,NoIme,mr-itrans'
the combobox incorrectly showed mr-inscript2 as the selected input
method because 't-latn-post' was the first input method in dconf which
was not 'NoIme' and then 't-latn-post' was found as not supported by
mr-inscript2 so it showed the first of the supported input methods
which was mr-inscript2. Now, if finds that mr-itrans is the first
input method from dconf officially supported by the mr_IN engine and
the combobox displays 'mr-itrans', which seems more correct in this
case.
>---------------------------------------------------------------
ibus-typing-booster/setup/main.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ibus-typing-booster/setup/main.py b/ibus-typing-booster/setup/main.py
index b385fb6..cc8ebc4 100644
--- a/ibus-typing-booster/setup/main.py
+++ b/ibus-typing-booster/setup/main.py
@@ -274,7 +274,8 @@ class SetupUI:
if len(self.current_imes) == 1:
self.main_ime = self.current_imes[0]
else:
- self.main_ime = [x for x in self.current_imes if x != 'NoIme'][0]
+ self.main_ime = (
+ [x for x in self.current_imes if x in self.supported_imes][0])
combobox_has_ime = False
for i in range(len(ime_store)):
if ime_store[i][1] == self.main_ime:
8 years
[ibus-typing-booster] master: Update German translations (606722c)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 606722c622af88e64ec37ccf8ecf191516ff4630
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Apr 27 09:35:54 2016 +0200
Update German translations
>---------------------------------------------------------------
ibus-typing-booster/po/ca.po | 63 +++++++++++++---------
ibus-typing-booster/po/de.po | 70 +++++++++++++++---------
ibus-typing-booster/po/ibus-typing-booster.pot | 62 +++++++++++++---------
3 files changed, 119 insertions(+), 76 deletions(-)
diff --git a/ibus-typing-booster/po/ca.po b/ibus-typing-booster/po/ca.po
index 25e5a4f..77ef415 100644
--- a/ibus-typing-booster/po/ca.po
+++ b/ibus-typing-booster/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus-typing-booster 1.2.14\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2016-04-20 14:25+0200\n"
+"POT-Creation-Date: 2016-04-27 09:14+0200\n"
"PO-Revision-Date: 2015-10-11 20:54+0200\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj(a)fedoraproject.org>\n"
"Language-Team: Catalan\n"
@@ -14,25 +14,25 @@ msgstr ""
"X-Generator: Zanata 3.7.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: engine/hunspell_table.py:755
+#: engine/hunspell_table.py:792
#, python-format
msgid "Switch preedit input method to %(ime)s"
msgstr ""
-#: engine/hunspell_table.py:763
+#: engine/hunspell_table.py:800
#, fuzzy
msgid "Preedit input method"
msgstr "M��tode d'entrada:"
-#: engine/hunspell_table.py:764
+#: engine/hunspell_table.py:801
msgid "Switch preedit input method"
msgstr ""
-#: engine/hunspell_table.py:855
+#: engine/hunspell_table.py:892
msgid "Setup"
msgstr "Prefer��ncies"
-#: engine/hunspell_table.py:858
+#: engine/hunspell_table.py:895
#, python-format
msgid "Configure ibus-typing-booster ���%(name)s���"
msgstr "Prefer��ncies per a l'ibus-typing-booster ���%(name)s���"
@@ -64,29 +64,29 @@ msgstr "El fitxer de configuraci�� %(file)s no existeix."
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr "Prefer��ncies per a l'ibus-typing-booster \"%(symbol)s\""
-#: setup/main.py:300
+#: setup/main.py:312
msgid "Another instance of this app is already running."
msgstr "Ja s'est�� executant una altra inst��ncia d'aquesta aplicaci��."
-#: setup/main.py:395
+#: setup/main.py:407
msgid "Open File ..."
msgstr "Obre el fitxer..."
-#: setup/main.py:413
+#: setup/main.py:425
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "S'ha apr��s correctament del fitxer %(filename)s."
-#: setup/main.py:422
+#: setup/main.py:434
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "Ha fallat l'aprenentatge del fitxer %(filename)s."
-#: setup/main.py:431
+#: setup/main.py:443
msgid "Are you sure?"
msgstr "Esteu segur?"
-#: setup/main.py:438
+#: setup/main.py:450
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -94,7 +94,7 @@ msgstr ""
"Realment voleu eliminar totes les dades de l'idioma \n"
"que s'han apr��s de l'escriptura o la lectura de fitxers? "
-#: setup/main.py:607
+#: setup/main.py:633
msgid "ibus is not running."
msgstr "ibus no s'est�� executant."
@@ -171,57 +171,70 @@ msgid ""
"fingers."
msgstr ""
-#: setup/setup.glade:264
+#: setup/setup.glade:263
msgid "Add direct input"
msgstr ""
-#: setup/setup.glade:268
+#: setup/setup.glade:267
msgid ""
"This option adds British English as a second language to use in addition to "
"the main language of this input method."
msgstr ""
-#: setup/setup.glade:308
+#: setup/setup.glade:281
+#, fuzzy
+msgid "Remember last used preedit input method"
+msgstr "M��tode d'entrada:"
+
+#: setup/setup.glade:285
+msgid ""
+"If more then one input method is used at the same time, one of them is used "
+"for the preedit. Which input method is used for the preedit can be changed "
+"via the menu or via shortcut keys. If this option is enabled, such a change "
+"is remembered even if the session is restarted. "
+msgstr ""
+
+#: setup/setup.glade:324
msgid "Options"
msgstr "Opcions"
-#: setup/setup.glade:341
+#: setup/setup.glade:357
msgid "Install dictionary"
msgstr "Instal��la el diccionari"
-#: setup/setup.glade:355
+#: setup/setup.glade:371
msgid "Install pyhunspell"
msgstr "Instal��la pyhunspell"
-#: setup/setup.glade:371
+#: setup/setup.glade:387
msgid "Learn from text file"
msgstr "Apr��n del fitxer de text"
-#: setup/setup.glade:389
+#: setup/setup.glade:405
msgid "Install the dictionary package for this engine"
msgstr "Instal��la el paquet del diccionari per a aquest motor"
-#: setup/setup.glade:399
+#: setup/setup.glade:415
msgid "Install pyhunspell package to get spellchecking suggestions"
msgstr ""
"Instal��la el paquet pyhunspell per obtenir els suggeriments de la revisi�� "
"ortogr��fica"
-#: setup/setup.glade:413
+#: setup/setup.glade:429
msgid "Learn your style by reading a text file"
msgstr "Apr��n el vostre estil amb la lectura d'un fitxer de text"
-#: setup/setup.glade:427
+#: setup/setup.glade:443
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
"Elimina totes les dades de l'idioma personal que s'han apr��s de l'escriptura "
"o de la lectura de fitxers"
-#: setup/setup.glade:439
+#: setup/setup.glade:455
msgid "Delete learned data"
msgstr "Elimina les dades que s'han apr��s"
-#: setup/setup.glade:476
+#: setup/setup.glade:492
msgid "Dictionaries and personal data"
msgstr "Diccionaris i dades personals"
diff --git a/ibus-typing-booster/po/de.po b/ibus-typing-booster/po/de.po
index b604a3a..176c6c3 100644
--- a/ibus-typing-booster/po/de.po
+++ b/ibus-typing-booster/po/de.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus-typing-booster 0.0.16\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2016-04-20 14:25+0200\n"
-"PO-Revision-Date: 2016-04-20 14:44+0200\n"
+"POT-Creation-Date: 2016-04-27 09:14+0200\n"
+"PO-Revision-Date: 2016-04-27 09:35+0200\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: German <trans-de(a)lists.fedoraproject.org>\n"
"Language: de\n"
@@ -20,24 +20,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: engine/hunspell_table.py:755
+#: engine/hunspell_table.py:792
#, python-format
msgid "Switch preedit input method to %(ime)s"
msgstr "Umschalten der Preedit-Eingabemethode auf %(ime)s"
-#: engine/hunspell_table.py:763
+#: engine/hunspell_table.py:800
msgid "Preedit input method"
msgstr "Preedit-Eingabemethode:"
-#: engine/hunspell_table.py:764
+#: engine/hunspell_table.py:801
msgid "Switch preedit input method"
msgstr "Umschalten der Preedit-Eingabemethode"
-#: engine/hunspell_table.py:855
+#: engine/hunspell_table.py:892
msgid "Setup"
msgstr "Einstellungen"
-#: engine/hunspell_table.py:858
+#: engine/hunspell_table.py:895
#, python-format
msgid "Configure ibus-typing-booster ���%(name)s���"
msgstr "Ibus Typing Booster \"%(name)s\" Einstellungen"
@@ -69,29 +69,29 @@ msgstr "Die Konfigurationsdatei %(file)s existiert nicht."
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr "Ibus Typing Booster \"%(symbol)s\" Einstellungen"
-#: setup/main.py:300
+#: setup/main.py:312
msgid "Another instance of this app is already running."
msgstr "Eine Instanz dieses Programms l��uft schon."
-#: setup/main.py:395
+#: setup/main.py:407
msgid "Open File ..."
msgstr "��ffne Datei"
-#: setup/main.py:413
+#: setup/main.py:425
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "Das Lernen aus der Datei %(filename)s war erfolgreich."
-#: setup/main.py:422
+#: setup/main.py:434
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "Fehler beim Lernen aus der Datai %(filename)s."
-#: setup/main.py:431
+#: setup/main.py:443
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
-#: setup/main.py:438
+#: setup/main.py:450
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -99,7 +99,7 @@ msgstr ""
"Wollen Sie wirklich alle Sprachdaten l��schen, die aus den\n"
"Usereingaben oder aus Dateien gelernt wurden?"
-#: setup/main.py:607
+#: setup/main.py:633
msgid "ibus is not running."
msgstr "Ibus l��uft nicht."
@@ -193,11 +193,11 @@ msgstr ""
"1-9 etwas leichter als mit F1-F9 (geht immer), weil F1-F9 weiter von den "
"Fingern weg sind."
-#: setup/setup.glade:264
+#: setup/setup.glade:263
msgid "Add direct input"
msgstr "Direkte Eingabe hinzuf��gen"
-#: setup/setup.glade:268
+#: setup/setup.glade:267
msgid ""
"This option adds British English as a second language to use in addition to "
"the main language of this input method."
@@ -205,47 +205,65 @@ msgstr ""
"Diese Option f��gt britisches Englisch als zweite Sprache zus��tzlich zur "
"Hauptsprache dieser Eingabemethode hinzu."
-#: setup/setup.glade:308
+#: setup/setup.glade:281
+msgid "Remember last used preedit input method"
+msgstr "Merken der zuletzt benutzten Preedit-Eingabemethode"
+
+#: setup/setup.glade:285
+msgid ""
+"If more then one input method is used at the same time, one of them is used "
+"for the preedit. Which input method is used for the preedit can be changed "
+"via the menu or via shortcut keys. If this option is enabled, such a change "
+"is remembered even if the session is restarted. "
+msgstr ""
+"Wenn mehr als eine Inputmethode gleichzeitig benutzt wird, dann wird eine "
+"davon f��r das Preedit benutzt. Welche Inputmethode f��r das Preedit benutzt "
+"wird kann ��ber das Men�� oder ��ber Tastaturk��rzel gew��hlt werden. Wenn diese "
+"Option zum Merken eingeschaltet ist, wird ein Wechsel der Inputmethode f��r "
+"das Preedit abgespeichert, so da�� nach einem Neustart wieder die zuletzt "
+"benutzte Inputmethdoe f��r das Preedit benutzt wird."
+
+#: setup/setup.glade:324
msgid "Options"
msgstr "Optionen"
-#: setup/setup.glade:341
+#: setup/setup.glade:357
msgid "Install dictionary"
msgstr "Installiere W��rterbuch"
-#: setup/setup.glade:355
+#: setup/setup.glade:371
msgid "Install pyhunspell"
msgstr "pyhunspell installieren"
-#: setup/setup.glade:371
+#: setup/setup.glade:387
msgid "Learn from text file"
msgstr "Aus Textdatei lernen"
-#: setup/setup.glade:389
+#: setup/setup.glade:405
msgid "Install the dictionary package for this engine"
msgstr "Installiere das W��rterbuchpaket f��r diesen Engine"
-#: setup/setup.glade:399
+#: setup/setup.glade:415
msgid "Install pyhunspell package to get spellchecking suggestions"
msgstr ""
"Das pyhunspell Paket installieren um Tippfehlerkorrekturvorschl��ge zu "
"bekommen"
-#: setup/setup.glade:413
+#: setup/setup.glade:429
msgid "Learn your style by reading a text file"
msgstr "Ihren Stil aus einer Textdatei lernen"
-#: setup/setup.glade:427
+#: setup/setup.glade:443
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
"Alle Daten l��schen, die aus den Benutzereingaben oder aus Dateien gelernt "
"wurden"
-#: setup/setup.glade:439
+#: setup/setup.glade:455
msgid "Delete learned data"
msgstr "Gelernte Daten l��schen"
-#: setup/setup.glade:476
+#: setup/setup.glade:492
msgid "Dictionaries and personal data"
msgstr "W��rterb��cher und pers��nliche Daten"
diff --git a/ibus-typing-booster/po/ibus-typing-booster.pot b/ibus-typing-booster/po/ibus-typing-booster.pot
index 276c5be..713374a 100644
--- a/ibus-typing-booster/po/ibus-typing-booster.pot
+++ b/ibus-typing-booster/po/ibus-typing-booster.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2016-04-20 14:25+0200\n"
+"POT-Creation-Date: 2016-04-27 09:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -17,24 +17,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: engine/hunspell_table.py:755
+#: engine/hunspell_table.py:792
#, python-format
msgid "Switch preedit input method to %(ime)s"
msgstr ""
-#: engine/hunspell_table.py:763
+#: engine/hunspell_table.py:800
msgid "Preedit input method"
msgstr ""
-#: engine/hunspell_table.py:764
+#: engine/hunspell_table.py:801
msgid "Switch preedit input method"
msgstr ""
-#: engine/hunspell_table.py:855
+#: engine/hunspell_table.py:892
msgid "Setup"
msgstr ""
-#: engine/hunspell_table.py:858
+#: engine/hunspell_table.py:895
#, python-format
msgid "Configure ibus-typing-booster ���%(name)s���"
msgstr ""
@@ -64,35 +64,35 @@ msgstr ""
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr ""
-#: setup/main.py:300
+#: setup/main.py:312
msgid "Another instance of this app is already running."
msgstr ""
-#: setup/main.py:395
+#: setup/main.py:407
msgid "Open File ..."
msgstr ""
-#: setup/main.py:413
+#: setup/main.py:425
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr ""
-#: setup/main.py:422
+#: setup/main.py:434
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr ""
-#: setup/main.py:431
+#: setup/main.py:443
msgid "Are you sure?"
msgstr ""
-#: setup/main.py:438
+#: setup/main.py:450
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
msgstr ""
-#: setup/main.py:607
+#: setup/main.py:633
msgid "ibus is not running."
msgstr ""
@@ -169,53 +169,65 @@ msgid ""
"fingers."
msgstr ""
-#: setup/setup.glade:264
+#: setup/setup.glade:263
msgid "Add direct input"
msgstr ""
-#: setup/setup.glade:268
+#: setup/setup.glade:267
msgid ""
"This option adds British English as a second language to use in addition to "
"the main language of this input method."
msgstr ""
-#: setup/setup.glade:308
+#: setup/setup.glade:281
+msgid "Remember last used preedit input method"
+msgstr ""
+
+#: setup/setup.glade:285
+msgid ""
+"If more then one input method is used at the same time, one of them is used "
+"for the preedit. Which input method is used for the preedit can be changed "
+"via the menu or via shortcut keys. If this option is enabled, such a change "
+"is remembered even if the session is restarted. "
+msgstr ""
+
+#: setup/setup.glade:324
msgid "Options"
msgstr ""
-#: setup/setup.glade:341
+#: setup/setup.glade:357
msgid "Install dictionary"
msgstr ""
-#: setup/setup.glade:355
+#: setup/setup.glade:371
msgid "Install pyhunspell"
msgstr ""
-#: setup/setup.glade:371
+#: setup/setup.glade:387
msgid "Learn from text file"
msgstr ""
-#: setup/setup.glade:389
+#: setup/setup.glade:405
msgid "Install the dictionary package for this engine"
msgstr ""
-#: setup/setup.glade:399
+#: setup/setup.glade:415
msgid "Install pyhunspell package to get spellchecking suggestions"
msgstr ""
-#: setup/setup.glade:413
+#: setup/setup.glade:429
msgid "Learn your style by reading a text file"
msgstr ""
-#: setup/setup.glade:427
+#: setup/setup.glade:443
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
-#: setup/setup.glade:439
+#: setup/setup.glade:455
msgid "Delete learned data"
msgstr ""
-#: setup/setup.glade:476
+#: setup/setup.glade:492
msgid "Dictionaries and personal data"
msgstr ""
8 years
[ibus-typing-booster] master: Add option to remember the pre��dit input method used last (73f057d)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 73f057d59684f13e20b9a96d29e8932ebc17b82f
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Tue Apr 26 15:52:57 2016 +0200
Add option to remember the pre��dit input method used last
>---------------------------------------------------------------
ibus-typing-booster/engine/hunspell_table.py | 21 +++++++++++++
ibus-typing-booster/setup/main.py | 26 ++++++++++++++++
ibus-typing-booster/setup/setup.glade | 42 ++++++++++++++++++--------
3 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/ibus-typing-booster/engine/hunspell_table.py b/ibus-typing-booster/engine/hunspell_table.py
index e5d3977..78837c9 100644
--- a/ibus-typing-booster/engine/hunspell_table.py
+++ b/ibus-typing-booster/engine/hunspell_table.py
@@ -717,12 +717,22 @@ class tabengine (IBus.Engine):
cursor_pos = 0,
cursor_visible = False,
round = True))
+
self.is_lookup_table_enabled_by_tab = False
self._tab_enable = variant_to_value(self._config.get_value (
self._config_section,
"tabenable"))
if self._tab_enable == None:
self._tab_enable = False
+
+ self._remember_last_used_preedit_ime = False
+ self._remember_last_used_preedit_ime = variant_to_value(
+ self._config.get_value(
+ self._config_section,
+ "rememberlastusedpreeditime"))
+ if self._remember_last_used_preedit_ime == None:
+ self._remember_last_used_preedit_ime = False
+
self._commit_happened_after_focus_in = False
self._prop_dict = {}
@@ -756,6 +766,11 @@ class tabengine (IBus.Engine):
+ 'Trying to set: %s\n' %imes
+ 'Really setting: %s\n' %imes[:self.get_current_imes_max()])
imes = imes[:self.get_current_imes_max()]
+ if self._remember_last_used_preedit_ime:
+ self._config.set_value(
+ self._config_section,
+ 'inputmethod',
+ GLib.Variant.new_string(','.join(imes)))
self._editor.set_current_imes(imes)
self.update_preedit_ime_menu_dicts()
self._init_or_update_property_menu_preedit_ime(
@@ -1581,6 +1596,12 @@ class tabengine (IBus.Engine):
else:
self._tab_enable = False
return
+ if name == "rememberlastusedpreeditime":
+ if value == 1:
+ self._remember_last_used_preedit_ime = True
+ else:
+ self._remember_last_used_preedit_ime = False
+ return
if name == "pagesize":
if value >= 1 and value <= 9:
self._page_size = value
diff --git a/ibus-typing-booster/setup/main.py b/ibus-typing-booster/setup/main.py
index e60f036..b385fb6 100644
--- a/ibus-typing-booster/setup/main.py
+++ b/ibus-typing-booster/setup/main.py
@@ -206,6 +206,18 @@ class SetupUI:
add_direct_input_checkbox.connect(
'clicked', event_handler.onAddDirectInputCheckbox)
+ remember_last_used_preedit_ime_checkbox = self.builder.get_object(
+ "remember_last_used_preedit_ime_checkbox")
+ self.remember_last_used_predit_ime = self.variant_to_value(
+ self.config.get_value(
+ self.config_section, 'rememberlastusedpreeditime'))
+ if self.remember_last_used_predit_ime == None:
+ self.remember_last_used_predit_ime = False
+ if self.remember_last_used_predit_ime == True:
+ remember_last_used_preedit_ime_checkbox.set_active(True)
+ remember_last_used_preedit_ime_checkbox.connect(
+ 'clicked', event_handler.onRememberLastUsedPreeditImeCheckbox)
+
self.page_size_adjustment = self.builder.get_object(
"page_size_adjustment")
self.page_size = self.variant_to_value(self.config.get_value(
@@ -502,6 +514,20 @@ class EventHandler:
'adddirectinput',
GLib.Variant.new_boolean(False))
+ def onRememberLastUsedPreeditImeCheckbox(self, widget):
+ if widget.get_active():
+ SetupUi.remember_last_used_predit_ime = True
+ SetupUi.config.set_value(
+ SetupUi.config_section,
+ 'rememberlastusedpreeditime',
+ GLib.Variant.new_boolean(True))
+ else:
+ SetupUi.remember_last_used_predit_ime = False
+ SetupUi.config.set_value(
+ SetupUi.config_section,
+ 'rememberlastusedpreeditime',
+ 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 63e4615..118e02b 100644
--- a/ibus-typing-booster/setup/setup.glade
+++ b/ibus-typing-booster/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">8</property>
+ <property name="n_rows">9</property>
<property name="n_columns">2</property>
<property name="column_spacing">8</property>
<property name="row_spacing">4</property>
@@ -131,8 +131,8 @@
</object>
<packing>
<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="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -146,8 +146,8 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -160,8 +160,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="y_options"/>
</packing>
</child>
@@ -219,8 +219,8 @@
</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="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -235,8 +235,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="y_options"/>
</packing>
</child>
@@ -248,7 +248,6 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Use the regular digits 1-9 as select keys. If that option is on, numbers can only by typed while no suggestions are shown. Therefore, completions for numbers cannot be suggested. And typing words containing numbers, like ���A4��� is more difficult as typing ���4��� would select the 4th suggestion. On the other hand, selecting suggestions using 1-9 is easier then using the always enabled select keys F1-F9 as the latter keys are farther away from the fingers.</property>
<property name="xalign">0</property>
- <property name="yalign">0.51999998092651367</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -267,7 +266,6 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">This option adds British English as a second language to use in addition to the main language of this input method.</property>
<property name="xalign">0</property>
- <property name="yalign">0.51999998092651367</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -278,6 +276,24 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_last_used_preedit_ime_checkbox">
+ <property name="label" translatable="yes">Remember last used preedit input method</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">If more then one input method is used at the same time, one of them is used for the preedit. Which input method is used for the preedit can be changed via the menu or via shortcut keys. If this option is enabled, such a change is remembered even if the session is restarted. </property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</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>
+ </child>
</object>
</child>
</object>
8 years
