[ibus-typing-booster] master: Release 1.5.13 (4e6cfe1)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 4e6cfe16bb42085eabd978f9d46b60c94a3864a6
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Mon Nov 21 08:27:34 2016 +0100
Release 1.5.13
>---------------------------------------------------------------
ChangeLog | 4 ++++
configure.ac | 2 +-
ibus-typing-booster.pc.in | 2 +-
typing-booster.appdata.xml | 9 +++++++++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 33a326e..4ffe69f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
* Author: Mike FABIAN <mfabian(a)redhat.com>
+* 20 Nov 2016 Released 1.5.13 version
+* Update French translations from zanata
+
+* Author: Mike FABIAN <mfabian(a)redhat.com>
* 19 Nov 2016 Released 1.5.12 version
* Display existing shortcuts and make it possible to delete them
* Update translations from zanata (de, pl, uk)
diff --git a/configure.ac b/configure.ac
index 6bc77e5..62e022d 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], [12])
+m4_define([ibus_micro_version], [13])
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 8996b2f..34604c7 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.12
+Version: 1.5.13
Requires:
Libs:
Cflags:
diff --git a/typing-booster.appdata.xml b/typing-booster.appdata.xml
index 7530366..3d9d7fb 100644
--- a/typing-booster.appdata.xml
+++ b/typing-booster.appdata.xml
@@ -16,6 +16,15 @@
<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.13" date="2016-11-20" urgency="medium">
+ <description>
+ <ul>
+ <li>
+ Update French translation from zanata
+ </li>
+ </ul>
+ </description>
+ </release>
<release version="1.5.12" date="2016-11-19" urgency="medium">
<description>
<ul>
7 years, 7 months
[ibus-typing-booster] master: Update French translations from zanata (383e3ff)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 383e3ff631554390f0acfcc3cdd3a77a27927f73
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Mon Nov 21 08:24:36 2016 +0100
Update French translations from zanata
>---------------------------------------------------------------
po/fr.po | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index df5313b..70299b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-10-14 05:28-0400\n"
-"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
+"PO-Revision-Date: 2016-11-21 01:50-0500\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste(a)holcroft.fr>\n"
"Language-Team: French\n"
"Language: fr\n"
"X-Generator: Zanata 3.9.6\n"
@@ -84,12 +84,12 @@ msgstr "Pr��f��rences pour ibus-typing-booster �� %(symbol)s ��"
#. Translators: Column heading of the table listing the existing shortcuts
#: setup/main.py:183
msgid "Shortcut"
-msgstr ""
+msgstr "Raccourci"
#. Translators: Column heading of the table listing the existing shortcuts
#: setup/main.py:189
msgid "Shortcut expansion"
-msgstr ""
+msgstr "Expansion du raccourci"
#: setup/main.py:401
msgid "Another instance of this app is already running."
@@ -317,27 +317,27 @@ msgstr "Options"
#: setup/setup.glade:412
msgid "Clear input"
-msgstr ""
+msgstr "Vide la sortie"
#: setup/setup.glade:426
msgid "Add shortcut"
-msgstr ""
+msgstr "Ajouter un raccourci"
#: setup/setup.glade:443
msgid "Enter shortcut here:"
-msgstr ""
+msgstr "Saisissez votre raccourci ici :"
#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
-msgstr ""
+msgstr "Saisissez l'expansion du raccourci ici :"
#: setup/setup.glade:514
msgid "Delete shortcut"
-msgstr ""
+msgstr "Supprimer le raccourci"
#: setup/setup.glade:534
msgid "Custom shortcuts"
-msgstr ""
+msgstr "Raccourcis personnalis��s"
#: setup/setup.glade:568
msgid "Install dictionary"
7 years, 7 months
[ibus-typing-booster] master: Release 1.5.12 (773dd9c)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 773dd9c9f9244faa57d56267d5fcdc59be9f20f8
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Sat Nov 19 16:42:44 2016 +0100
Release 1.5.12
>---------------------------------------------------------------
ChangeLog | 5 +++++
configure.ac | 2 +-
ibus-typing-booster.pc.in | 2 +-
typing-booster.appdata.xml | 12 ++++++++++++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 22fedb5..33a326e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
* Author: Mike FABIAN <mfabian(a)redhat.com>
+* 19 Nov 2016 Released 1.5.12 version
+* Display existing shortcuts and make it possible to delete them
+* Update translations from zanata (de, pl, uk)
+
+* Author: Mike FABIAN <mfabian(a)redhat.com>
* 17 Nov 2016 Released 1.5.11 version
* Add feature to define custom shortcuts
* Merge editor and tabengine classes
diff --git a/configure.ac b/configure.ac
index f22b99f..6bc77e5 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], [11])
+m4_define([ibus_micro_version], [12])
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 7bef9f4..8996b2f 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.11
+Version: 1.5.12
Requires:
Libs:
Cflags:
diff --git a/typing-booster.appdata.xml b/typing-booster.appdata.xml
index 20506bf..7530366 100644
--- a/typing-booster.appdata.xml
+++ b/typing-booster.appdata.xml
@@ -16,6 +16,18 @@
<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.12" date="2016-11-19" urgency="medium">
+ <description>
+ <ul>
+ <li>
+ Display existing shortcuts and make it possible to delete them
+ </li>
+ <li>
+ Update translations from zanata (de, pl, uk)
+ </li>
+ </ul>
+ </description>
+ </release>
<release version="1.5.11" date="2016-11-11" urgency="medium">
<description>
<ul>
7 years, 7 months
[ibus-typing-booster] master: Update translations from zanata (de, pl, uk) (f9c5f80)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit f9c5f807f008d06e0ca432a4ba1e66228eaf8946
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Sat Nov 19 20:37:15 2016 +0100
Update translations from zanata (de, pl, uk)
>---------------------------------------------------------------
po/ca.po | 66 ++++++++++++++++++++++--------------
po/de.po | 68 +++++++++++++++++++++++---------------
po/fr.po | 66 ++++++++++++++++++++++--------------
po/ibus-typing-booster.pot | 66 ++++++++++++++++++++++--------------
po/pl.po | 78 ++++++++++++++++++++++++++------------------
po/uk.po | 78 ++++++++++++++++++++++++++------------------
6 files changed, 253 insertions(+), 169 deletions(-)
diff --git a/po/ca.po b/po/ca.po
index b2ff7b6..f90a406 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -78,29 +78,39 @@ 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:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr ""
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr ""
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr "Ja s'est�� executant una altra inst��ncia d'aquesta aplicaci��."
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr "Obre el fitxer..."
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "S'ha apr��s correctament del fitxer %(filename)s."
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "Ha fallat l'aprenentatge del fitxer %(filename)s."
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr "Esteu segur?"
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -108,7 +118,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:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr "ibus no s'est�� executant."
@@ -247,77 +257,81 @@ msgstr ""
msgid "Auto commit characters:"
msgstr ""
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr "Opcions"
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
msgstr ""
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
msgstr ""
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
msgstr ""
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
msgstr ""
-#: setup/setup.glade:491
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr ""
+
+#: setup/setup.glade:534
msgid "Custom shortcuts"
msgstr ""
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr "Instal��la el diccionari"
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr "Apr��n del fitxer de text"
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr "Instal��la el paquet del diccionari per a aquest motor"
-#: setup/setup.glade:567
+#: setup/setup.glade:610
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:581
+#: setup/setup.glade:624
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:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr "Elimina les dades que s'han apr��s"
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr "Diccionaris i dades personals"
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr ""
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr ""
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr ""
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr ""
@@ -337,6 +351,6 @@ msgid ""
"word from a list of suggestions and improve one���s typing speed and spelling."
msgstr ""
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr ""
diff --git a/po/de.po b/po/de.po
index dfe18e4..0e2f214 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,11 +11,11 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-11-17 01:47-0500\n"
+"PO-Revision-Date: 2016-11-19 02:31-0500\n"
"Last-Translator: Mike FABIAN <mfabian(a)redhat.com>\n"
"Language-Team: German <trans-de(a)lists.fedoraproject.org>\n"
"Language: de\n"
@@ -84,29 +84,39 @@ 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:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr "Abk��rzung"
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr "Expansion der Abk��rzung"
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr "Eine Instanz dieses Programms l��uft schon."
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr "��ffne Datei"
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "Das Lernen aus der Datei %(filename)s war erfolgreich."
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "Fehler beim Lernen aus der Datai %(filename)s."
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -114,7 +124,7 @@ msgstr ""
"Wollen Sie wirklich alle Sprachdaten l��schen, die aus den\n"
"Usereingaben oder aus Dateien gelernt wurden?"
-#: setup/main.py:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr "Ibus l��uft nicht."
@@ -302,77 +312,81 @@ msgstr ""
msgid "Auto commit characters:"
msgstr "Zeichen, die automatisch committen:"
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr "Optionen"
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
msgstr "Eingabe leeren"
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
msgstr "Abk��rzung hinzuf��gen"
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
msgstr "Abk��rzung hier eintippen:"
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
msgstr "Expansion der Abk��rzung hier eingeben:"
-#: setup/setup.glade:491
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr "Abk��rzung l��schen"
+
+#: setup/setup.glade:534
msgid "Custom shortcuts"
msgstr "Benutzerdefinierte Abk��rzungen"
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr "Installiere W��rterbuch"
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr "Aus Textdatei lernen"
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr "Installiere das W��rterbuchpaket f��r diesen Engine"
-#: setup/setup.glade:567
+#: setup/setup.glade:610
msgid "Learn your style by reading a text file"
msgstr "Ihren Stil aus einer Textdatei lernen"
-#: setup/setup.glade:581
+#: setup/setup.glade:624
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:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr "Gelernte Daten l��schen"
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr "W��rterb��cher und pers��nliche Daten"
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr "Eine vervollst��ndigende Inputmethode zum schnelleren Tippen."
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr "<b>Homepage:</b>"
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr "<b>Online Dokumentation</b>"
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr "��ber"
@@ -395,6 +409,6 @@ msgstr ""
" Man kann einfach das gew��nschte Wort aus einer List von Vorschl��gen "
"ausw��hlen und so seine Tippgeschwindigkeit und Rechtschreibung verbessern."
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr "Mike FABIAN"
diff --git a/po/fr.po b/po/fr.po
index 5b6f2b7..df5313b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -81,30 +81,40 @@ msgstr "Le fichier de configuration %(file)s n'existe pas."
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr "Pr��f��rences pour ibus-typing-booster �� %(symbol)s ��"
-#: setup/main.py:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr ""
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr ""
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr ""
"Une autre instance de cette application est d��j�� en cours d'ex��cution."
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr "Ouvrir le fichier..."
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "Apprentissage r��ussi depuis le fichier %(filename)s."
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "��chec de l'apprentissage depuis le fichier %(filename)s."
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr "Le voulez-vous vraiment ?"
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -112,7 +122,7 @@ msgstr ""
"Voulez-vous vraiment supprimer toutes les donn��es\n"
"linguistiques apprises depuis la saisie ou la lecture de fichiers ?"
-#: setup/main.py:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr "Ibus n'est pas lanc��."
@@ -301,77 +311,81 @@ msgstr ""
msgid "Auto commit characters:"
msgstr "Caract��res d'auto-validation��:"
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr "Options"
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
msgstr ""
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
msgstr ""
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
msgstr ""
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
msgstr ""
-#: setup/setup.glade:491
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr ""
+
+#: setup/setup.glade:534
msgid "Custom shortcuts"
msgstr ""
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr "Installer un dictionnaire"
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr "Apprendre depuis un fichier texte"
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr "Installer le paquet du dictionnaire pour ce moteur"
-#: setup/setup.glade:567
+#: setup/setup.glade:610
msgid "Learn your style by reading a text file"
msgstr "Apprendre votre style en lisant un fichier texte"
-#: setup/setup.glade:581
+#: setup/setup.glade:624
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
"Supprimer toutes les donn��es linguistiques personnelles apprises depuis la "
"saisie ou la lecture de fichiers"
-#: setup/setup.glade:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr "Supprimer les donn��es apprises"
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr "Dictionnaires et donn��es personnelles"
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr "Une m��thode d'auto-compl��tement pour acc��l��rer la saisie."
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr "<b>Site web :</b>"
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr "<b>Documentation en ligne :</b>"
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr "�� propos"
@@ -394,6 +408,6 @@ msgstr ""
" On peut ainsi am��liorer sa vitesse d'��criture et son orthographe en "
"s��lectionnant simplement le mot d��sir�� dans une liste de suggestions."
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr "Mike FABIAN"
diff --git a/po/ibus-typing-booster.pot b/po/ibus-typing-booster.pot
index b23ae3d..4e0665e 100644
--- a/po/ibus-typing-booster.pot
+++ b/po/ibus-typing-booster.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\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"
@@ -78,35 +78,45 @@ msgstr ""
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr ""
-#: setup/main.py:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr ""
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr ""
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr ""
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr ""
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr ""
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr ""
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr ""
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
msgstr ""
-#: setup/main.py:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr ""
@@ -243,75 +253,79 @@ msgstr ""
msgid "Auto commit characters:"
msgstr ""
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr ""
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
msgstr ""
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
msgstr ""
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
msgstr ""
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
msgstr ""
-#: setup/setup.glade:491
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr ""
+
+#: setup/setup.glade:534
msgid "Custom shortcuts"
msgstr ""
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr ""
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr ""
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr ""
-#: setup/setup.glade:567
+#: setup/setup.glade:610
msgid "Learn your style by reading a text file"
msgstr ""
-#: setup/setup.glade:581
+#: setup/setup.glade:624
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
-#: setup/setup.glade:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr ""
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr ""
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr ""
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr ""
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr ""
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr ""
@@ -330,6 +344,6 @@ msgid ""
"word from a list of suggestions and improve one���s typing speed and spelling."
msgstr ""
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 2a2c95b..1967979 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,11 +4,11 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-09-20 01:59-0400\n"
+"PO-Revision-Date: 2016-11-20 10:35-0500\n"
"Last-Translator: Piotr Dr��g <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish\n"
"Language: pl\n"
@@ -78,29 +78,39 @@ msgstr "Plik konfiguracji %(file)s nie istnieje."
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr "Preferencje dla ibus-typing-booster ���%(symbol)s���"
-#: setup/main.py:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr "Skr��t"
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr "Rozwini��cie skr��tu"
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr "Inna kopia tej aplikacji jest ju�� uruchomiona."
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr "Otw��rz plik���"
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "Pomy��lnie nauczono si�� z��pliku %(filename)s."
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "Nauczenie si�� z��pliku %(filename)s si�� nie powiod��o."
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr "Na pewno?"
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -108,7 +118,7 @@ msgstr ""
"Na pewno usun���� wszystkie dane j��zyk��w\n"
"nauczone podczas pisania i��odczytywania plik��w?"
-#: setup/main.py:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr "Us��uga IBus nie jest uruchomiona."
@@ -293,79 +303,83 @@ msgstr ""
msgid "Auto commit characters:"
msgstr "Automatyczne zatwierdzanie znak��w:"
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr "Opcje"
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
-msgstr ""
+msgstr "Wyczy���� wprowadzone"
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
-msgstr ""
+msgstr "Dodaj skr��t"
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
-msgstr ""
+msgstr "Prosz�� poda�� skr��t:"
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
-msgstr ""
+msgstr "Prosz�� poda�� rozwini��cie skr��tu:"
+
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr "Usu�� skr��t"
-#: setup/setup.glade:491
+#: setup/setup.glade:534
msgid "Custom shortcuts"
-msgstr ""
+msgstr "Niestandardowe skr��ty"
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr "Zainstaluj s��ownik"
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr "Naucz si�� z��pliku tekstowego"
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr "Instaluje pakiet s��ownika dla tego mechanizmu"
-#: setup/setup.glade:567
+#: setup/setup.glade:610
msgid "Learn your style by reading a text file"
msgstr "Uczy si�� stylu odczytuj��c plik tekstowy"
-#: setup/setup.glade:581
+#: setup/setup.glade:624
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
"Usuwa wszystkie osobiste dane j��zyka nauczone podczas pisania lub "
"odczytywania plik��w"
-#: setup/setup.glade:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr "Usuwa nauczone dane"
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr "S��owniki i��dane osobiste"
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr ""
"Przyspieszaj��ca pisanie metoda wprowadzania, dzia��aj��ca na podstawie "
"uzupe��niania."
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr "<b>Strona domowa:</b>"
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr "<b>Dokumentacja online:</b>"
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr "O��programie"
@@ -388,6 +402,6 @@ msgstr ""
"prostu wybiera�� ����dane s��owa z��listy sugestii i��dzi��ki temu zwi��kszy�� swoj�� "
"pr��dko���� i��dok��adno���� pisania."
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr "Mike FABIAN"
diff --git a/po/uk.po b/po/uk.po
index 19a1e53..1b791aa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,11 +5,11 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/mike-fabian/ibus-typing-booster/"
"issues\n"
-"POT-Creation-Date: 2016-11-17 07:33+0100\n"
+"POT-Creation-Date: 2016-11-19 20:21+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-09-23 07:20-0400\n"
+"PO-Revision-Date: 2016-11-19 06:41-0500\n"
"Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk(a)kde.org>\n"
"Language: uk\n"
@@ -80,29 +80,39 @@ msgstr "���������� ���������������������� %(file)s ���� ����������."
msgid "Preferences for ibus-typing-booster \"%(symbol)s\""
msgstr "������������������ ������ ��%(symbol)s�� ibus-typing-booster"
-#: setup/main.py:376
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:183
+msgid "Shortcut"
+msgstr "��������������������"
+
+#. Translators: Column heading of the table listing the existing shortcuts
+#: setup/main.py:189
+msgid "Shortcut expansion"
+msgstr "���������������������� ��������������������"
+
+#: setup/main.py:401
msgid "Another instance of this app is already running."
msgstr "������ ���������������� ���������� ������������������ �������� ����������������."
-#: setup/main.py:510
+#: setup/main.py:586
msgid "Open File ..."
msgstr "���������������� �����������"
-#: setup/main.py:528
+#: setup/main.py:604
#, python-format
msgid "Learned successfully from file %(filename)s."
msgstr "�������������� �������������� �� ���������� %(filename)s."
-#: setup/main.py:537
+#: setup/main.py:613
#, python-format
msgid "Learning from file %(filename)s failed."
msgstr "������������ ���������������� �� ���������� %(filename)s �������������� ��������������."
-#: setup/main.py:550
+#: setup/main.py:626
msgid "Are you sure?"
msgstr "���� ����������������?"
-#: setup/main.py:557
+#: setup/main.py:633
msgid ""
"Do you really want to delete all language \n"
"data learned from typing or reading files?"
@@ -110,7 +120,7 @@ msgstr ""
"���� �������������� ������������ ���������������� ������ �������� ��������, \n"
"�������������� ���� ���������������� ���������� �� �������������� ������������?"
-#: setup/main.py:834
+#: setup/main.py:910
msgid "ibus is not running."
msgstr "ibus ���� ����������������."
@@ -298,79 +308,83 @@ msgstr ""
msgid "Auto commit characters:"
msgstr "���������������������������� ����������������:"
-#: setup/setup.glade:388
+#: setup/setup.glade:392
msgid "Options"
msgstr "������������������"
-#: setup/setup.glade:406
+#: setup/setup.glade:412
msgid "Clear input"
-msgstr ""
+msgstr "���������������� ��������������"
-#: setup/setup.glade:420
+#: setup/setup.glade:426
msgid "Add shortcut"
-msgstr ""
+msgstr "������������ ��������������������"
-#: setup/setup.glade:437
+#: setup/setup.glade:443
msgid "Enter shortcut here:"
-msgstr ""
+msgstr "�������������� ��������������������:"
-#: setup/setup.glade:451
+#: setup/setup.glade:457
msgid "Enter shortcut expansion here:"
-msgstr ""
+msgstr "�������������� ���������������������� ��������������������:"
+
+#: setup/setup.glade:514
+msgid "Delete shortcut"
+msgstr "���������������� ��������������������"
-#: setup/setup.glade:491
+#: setup/setup.glade:534
msgid "Custom shortcuts"
-msgstr ""
+msgstr "���������������� ��������������������"
-#: setup/setup.glade:525
+#: setup/setup.glade:568
msgid "Install dictionary"
msgstr "�������������������� ��������������"
-#: setup/setup.glade:539
+#: setup/setup.glade:582
msgid "Learn from text file"
msgstr "������������������ ���� ������������������ ������������"
-#: setup/setup.glade:557
+#: setup/setup.glade:600
msgid "Install the dictionary package for this engine"
msgstr "�������������������� �������������� ���������������� ������ ���������� ���������� ��������������"
-#: setup/setup.glade:567
+#: setup/setup.glade:610
msgid "Learn your style by reading a text file"
msgstr "�������������� ������ ���������� ������������ �������������� �������������������� ����������"
-#: setup/setup.glade:581
+#: setup/setup.glade:624
msgid ""
"Delete all personal language data learned from typing or from reading files"
msgstr ""
"���������������� ������ ���������������� �������� ��������, �������������� ���� ������������ ���������������� ���������� ������ "
"�������������� ������������"
-#: setup/setup.glade:593
+#: setup/setup.glade:636
msgid "Delete learned data"
msgstr "���������������� �������������� ��������"
-#: setup/setup.glade:630
+#: setup/setup.glade:673
msgid "Dictionaries and personal data"
msgstr "���������������� �� ���������������� ��������"
-#: setup/setup.glade:675
+#: setup/setup.glade:718
msgid "A completion input method to speedup typing."
msgstr ""
"������������ ���������������� ���� ������������������������ ����������������������, �������� �������������������� ���������������� "
"��������������."
-#: setup/setup.glade:701
+#: setup/setup.glade:744
msgid "<b>Home page:</b>"
msgstr "<b>�������������� ����������������:</b>"
-#: setup/setup.glade:713
+#: setup/setup.glade:756
msgid "<b>Online documentation:</b>"
msgstr "<b>������������������������ �� ������������������:</b>"
#. This is the ���About��� tab in the setup tool.
#.
#. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.
-#: setup/setup.glade:744
+#: setup/setup.glade:787
msgid "About"
msgstr "������ ����������������"
@@ -393,6 +407,6 @@ msgstr ""
"�������������� ������������ ���������� ���� ������������ ��������������������, �������� ���������������������� ���������������� ������������ "
"���� ������������������ �������� ������������."
-#: typing-booster.appdata.xml:484
+#: typing-booster.appdata.xml:493
msgid "Mike FABIAN"
msgstr "Mike FABIAN"
7 years, 7 months
[ibus-typing-booster] master: Fix some pylint warnings (9b5e729)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 9b5e7298845b56d243adec82fba56a9693de6a35
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Sat Nov 19 16:01:07 2016 +0100
Fix some pylint warnings
>---------------------------------------------------------------
engine/tabsqlitedb.py | 91 +++++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py
index e8149f0..4ff7f02 100755
--- a/engine/tabsqlitedb.py
+++ b/engine/tabsqlitedb.py
@@ -43,13 +43,13 @@ class ImeProperties:
if os.path.exists(configfile_path) and os.path.isfile(configfile_path):
comment_patt = re.compile('^#')
with codecs.open(
- configfile_path,
- mode='r',
- encoding='UTF-8') as file_handle:
+ configfile_path,
+ mode='r',
+ encoding='UTF-8') as file_handle:
for line in file_handle:
if not comment_patt.match(line):
- attr, val = line.strip().split ('=', 1)
- self.ime_property_cache[attr.strip()]= val.strip()
+ attr, val = line.strip().split('=', 1)
+ self.ime_property_cache[attr.strip()] = val.strip()
else:
sys.stderr.write(
"Error: ImeProperties: No such file: %s" %configfile_path)
@@ -82,7 +82,7 @@ class tabsqlitedb:
user_db: Database on disk where the phrases learned from the user are stored
user_freq >= 1: The number of times the user has used this phrase
'''
- def __init__(self, config_filename = '', user_db_file = ''):
+ def __init__(self, config_filename='', user_db_file=''):
global DEBUG_LEVEL
try:
DEBUG_LEVEL = int(os.getenv('IBUS_TYPING_BOOSTER_DEBUG_LEVEL'))
@@ -97,7 +97,7 @@ class tabsqlitedb:
self.user_db_file = path.join(
os.getenv('HOME'), '.local/share/ibus-typing-booster/user.db')
if (self.user_db_file != ':memory:'
- and not os.path.isdir(os.path.dirname(self.user_db_file))):
+ and not os.path.isdir(os.path.dirname(self.user_db_file))):
os.makedirs(os.path.dirname(self.user_db_file))
self._phrase_table_column_names = [
'id',
@@ -127,15 +127,16 @@ class tabsqlitedb:
else:
try:
desc = self.get_database_desc(self.user_db_file)
- if (desc == None
- or desc["version"] != USER_DATABASE_VERSION
- or (self.get_number_of_columns_of_phrase_table(self.user_db_file)
- != len(self._phrase_table_column_names))):
+ if (desc is None
+ or desc["version"] != USER_DATABASE_VERSION
+ or (self.get_number_of_columns_of_phrase_table(
+ self.user_db_file)
+ != len(self._phrase_table_column_names))):
sys.stderr.write(
"The user database %(udb)s "
%{'udb': self.user_db_file}
+ "seems to be incompatible.\n")
- if desc == None:
+ if desc is None:
sys.stderr.write(
"There is no version information in "
+ "the database.\n")
@@ -281,11 +282,11 @@ class tabsqlitedb:
# traceback.print_exc ()
# try create all hunspell-tables in user database
- self.create_indexes(commit = False)
+ self.create_indexes(commit=False)
self.generate_userdb_desc()
- def update_phrase(self, input_phrase = '', phrase = '',
- p_phrase = '', pp_phrase = '',
+ def update_phrase(self, input_phrase='', phrase='',
+ p_phrase='', pp_phrase='',
user_freq=0, commit=True):
'''
update the user frequency of a phrase
@@ -325,7 +326,7 @@ class tabsqlitedb:
except:
traceback.print_exc()
- def sync_usrdb (self):
+ def sync_usrdb(self):
'''
Trigger a checkpoint operation.
'''
@@ -349,8 +350,8 @@ class tabsqlitedb:
self.db.execute(sqlstr)
self.db.commit()
- def add_phrase(self, input_phrase = '', phrase = '',
- p_phrase = '', pp_phrase = '',
+ def add_phrase(self, input_phrase='', phrase='',
+ p_phrase='', pp_phrase='',
user_freq=0, commit=True):
'''
Add phrase to database
@@ -405,21 +406,21 @@ class tabsqlitedb:
sys.stderr.write(
"tabsqlitedb.add_phrase() insert_sqlargs=%s\n" %insert_sqlargs)
try:
- self.db.execute (insert_sqlstr, insert_sqlargs)
+ self.db.execute(insert_sqlstr, insert_sqlargs)
if commit:
self.db.commit()
except Exception:
traceback.print_exc()
- def optimize_database (self):
+ def optimize_database(self):
sqlstr = '''
CREATE TABLE tmp AS SELECT * FROM %(database)s.phrases;
DELETE FROM user_db.phrases;
INSERT INTO user_db.phrases SELECT * FROM tmp ORDER BY
input_phrase, user_freq DESC, id ASC;
DROP TABLE tmp;'''
- self.db.executescript (sqlstr)
- self.db.executescript ("VACUUM;")
+ self.db.executescript(sqlstr)
+ self.db.executescript("VACUUM;")
self.db.commit()
def drop_indexes(self):
@@ -430,7 +431,7 @@ class tabsqlitedb:
VACUUM;
'''
- self.db.executescript (sqlstr)
+ self.db.executescript(sqlstr)
self.db.commit()
def create_indexes(self, commit=True):
@@ -440,7 +441,7 @@ class tabsqlitedb:
CREATE INDEX IF NOT EXISTS user_db.phrases_index_i ON phrases
(phrase)
;'''
- self.db.executescript (sqlstr)
+ self.db.executescript(sqlstr)
if commit:
self.db.commit()
@@ -452,7 +453,7 @@ class tabsqlitedb:
x[0] # phrase alphabetical
))[:20]
- def select_words(self, input_phrase, p_phrase = '', pp_phrase = ''):
+ def select_words(self, input_phrase, p_phrase='', pp_phrase=''):
'''
Get phrases from database completing input_phrase.
@@ -636,20 +637,20 @@ class tabsqlitedb:
%self.best_candidates(phrase_frequencies))
return self.best_candidates(phrase_frequencies)
- def generate_userdb_desc (self):
+ def generate_userdb_desc(self):
try:
sqlstring = ('CREATE TABLE IF NOT EXISTS user_db.desc '
+ '(name PRIMARY KEY, value);')
- self.db.executescript (sqlstring)
+ self.db.executescript(sqlstring)
sqlstring = 'INSERT OR IGNORE INTO user_db.desc VALUES (?, ?);'
- self.db.execute (sqlstring, ('version', USER_DATABASE_VERSION))
+ self.db.execute(sqlstring, ('version', USER_DATABASE_VERSION))
sqlstring = (
'INSERT OR IGNORE INTO user_db.desc '
+ 'VALUES (?, DATETIME("now", "localtime"));')
- self.db.execute (sqlstring, ("create-time", ))
- self.db.commit ()
+ self.db.execute(sqlstring, ("create-time", ))
+ self.db.commit()
except:
- traceback.print_exc ()
+ traceback.print_exc()
def init_user_db(self):
if self.user_db_file == ':memory:':
@@ -741,8 +742,8 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
return result
def check_phrase_and_update_frequency(
- self, input_phrase = '', phrase = '', p_phrase = '',
- pp_phrase = '', user_freq_increment = 1, commit=True):
+ self, input_phrase='', phrase='', p_phrase='',
+ pp_phrase='', user_freq_increment=1, commit=True):
'''
Check whether input_phrase and phrase are already in database. If
they are in the database, increase the frequency by 1, if not
@@ -801,25 +802,25 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
if len(result) > 0:
# A match was found in user_db, increase user frequency by
# user_freq_increment (1 by default)
- self.update_phrase(input_phrase = input_phrase,
- phrase = phrase,
- p_phrase = p_phrase,
- pp_phrase = pp_phrase,
- user_freq = result[0][0]+user_freq_increment,
+ self.update_phrase(input_phrase=input_phrase,
+ phrase=phrase,
+ p_phrase=p_phrase,
+ pp_phrase=pp_phrase,
+ user_freq=result[0][0]+user_freq_increment,
commit=commit)
return
# The phrase was not found in user_db.
# Add it as a new phrase, i.e. with user_freq = user_freq_increment
# (1 by default):
- self.add_phrase(input_phrase = input_phrase,
- phrase = phrase,
- p_phrase = p_phrase,
- pp_phrase = pp_phrase,
- user_freq = user_freq_increment,
+ self.add_phrase(input_phrase=input_phrase,
+ phrase=phrase,
+ p_phrase=p_phrase,
+ pp_phrase=pp_phrase,
+ user_freq=user_freq_increment,
commit=commit)
return
- def remove_phrase(self, input_phrase = '', phrase = '', commit = True):
+ def remove_phrase(self, input_phrase='', phrase='', commit=True):
'''
Remove all rows matching ���input_phrase��� and ���phrase��� from database.
Or, if ���input_phrase��� is ���None���, remove all rows matching ���phrase���
@@ -888,7 +889,7 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
'pp_phrase': x[3],
'user_freq': x[4],
'timestamp': x[5]}
- )])
+ )])
with codecs.open(filename, encoding='UTF-8') as file_handle:
lines = [
unicodedata.normalize(self._normalization_form_internal, x)
7 years, 7 months
[ibus-typing-booster] master: Clear shortcut input fields after clicking the ���Add shortcut��� button (b9e5104)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit b9e5104ed26a8895b2ca1b9a987609d34f6dd61f
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Sun Nov 20 12:58:13 2016 +0100
Clear shortcut input fields after clicking the ���Add shortcut��� button
>---------------------------------------------------------------
setup/main.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/setup/main.py b/setup/main.py
index 6dd7852..a344520 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -547,6 +547,9 @@ class EventHandler:
phrase=shortcut_expansion,
user_freq_increment=itb_util.SHORTCUT_USER_FREQ)
model.append((shortcut, shortcut_expansion))
+ SETUP_UI.shortcut_entry.set_text('')
+ SETUP_UI.shortcut_expansion_entry.set_text('')
+ SETUP_UI.shortcut_treeview.get_selection().unselect_all()
def on_shortcut_selected(self, selection):
'''
7 years, 7 months
[ibus-typing-booster] master: Display existing shortcuts and make it possible to delete them (ab47711)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit ab477117e1a5cc0a2838ddfd086f2a9268bc6492
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Fri Nov 18 14:29:55 2016 +0100
Display existing shortcuts and make it possible to delete them
>---------------------------------------------------------------
engine/itb_util.py | 5 +++
engine/tabsqlitedb.py | 23 ++++++++++++
po/Makevars | 2 +-
setup/main.py | 90 +++++++++++++++++++++++++++++++++++++++++++++----
setup/setup.glade | 57 +++++++++++++++++++++++++++----
5 files changed, 162 insertions(+), 15 deletions(-)
diff --git a/engine/itb_util.py b/engine/itb_util.py
index 027f7ca..5f5726c 100755
--- a/engine/itb_util.py
+++ b/engine/itb_util.py
@@ -28,6 +28,11 @@ import unicodedata
from gi.repository import GLib
+# maximum possible value for the INTEGER datatype in SQLite3
+SQLITE_MAXINT = 2**63-1
+# user frequency used for a user defined shortcut
+SHORTCUT_USER_FREQ = 1000000
+
# If a character ending a sentence is committed (possibly
# followed by whitespace) remove trailing white space
# before the committed string. For example if
diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py
index 4f56a5d..e8149f0 100755
--- a/engine/tabsqlitedb.py
+++ b/engine/tabsqlitedb.py
@@ -717,6 +717,29 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
except:
return 0
+ def list_user_shortcuts(self):
+ '''Returns a list of user defined shortcuts from the user database.
+
+ :rtype: List of tuples of strings: [(str, str), ...]
+
+ '''
+ sqlstr = '''
+ SELECT input_phrase, phrase FROM user_db.phrases WHERE user_freq >= :freq
+ ;'''
+ sqlargs = {'freq': itb_util.SHORTCUT_USER_FREQ}
+ if DEBUG_LEVEL > 1:
+ sys.stderr.write(
+ "tabsqlitedb.list_user_shortcuts() sqlstr=%s\n"
+ %sqlstr)
+ sys.stderr.write(
+ "tabsqlitedb.list_user_shortcuts() sqlargs=%s\n"
+ %sqlargs)
+ result = self.db.execute(sqlstr, sqlargs).fetchall()
+ if DEBUG_LEVEL > 1:
+ sys.stderr.write(
+ "tabsqlite.list_user_shortcuts() result=%s\n" %result)
+ return result
+
def check_phrase_and_update_frequency(
self, input_phrase = '', phrase = '', p_phrase = '',
pp_phrase = '', user_freq_increment = 1, commit=True):
diff --git a/po/Makevars b/po/Makevars
index 0dc6124..57aa77e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = -c --keyword=_ --keyword=N_
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff --git a/setup/main.py b/setup/main.py
index 045b061..6dd7852 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -162,10 +162,35 @@ class SetupUI:
"shortcut_clear_button")
shortcut_clear_button.connect(
'clicked', event_handler.on_shortcut_clear_clicked)
+ shortcut_delete_button = self.builder.get_object(
+ "shortcut_delete_button")
+ shortcut_delete_button.connect(
+ 'clicked', event_handler.on_shortcut_delete_clicked)
shortcut_add_button = self.builder.get_object(
"shortcut_add_button")
shortcut_add_button.connect(
'clicked', event_handler.on_shortcut_add_clicked)
+ self.shortcut_treeview = self.builder.get_object(
+ "shortcut_treeview")
+ self.shortcut_treeview_model = Gtk.ListStore(str, str)
+ self.shortcut_treeview.set_model(self.shortcut_treeview_model)
+ current_shortcuts = self.tabsqlitedb.list_user_shortcuts()
+ for i, shortcut in enumerate(current_shortcuts):
+ self.shortcut_treeview_model.append(shortcut)
+ self.shortcut_treeview.append_column(
+ Gtk.TreeViewColumn(
+ # Translators: Column heading of the table listing the existing shortcuts
+ _('Shortcut'),
+ Gtk.CellRendererText(),
+ text=0))
+ self.shortcut_treeview.append_column(
+ Gtk.TreeViewColumn(
+ # Translators: Column heading of the table listing the existing shortcuts
+ _('Shortcut expansion'),
+ Gtk.CellRendererText(),
+ text=1))
+ self.shortcut_treeview.get_selection().connect(
+ 'changed', event_handler.on_shortcut_selected)
self.install_dictionary_button = self.builder.get_object(
"install_dictionary_button")
@@ -468,20 +493,71 @@ class EventHandler:
'''
SETUP_UI.shortcut_entry.set_text('')
SETUP_UI.shortcut_expansion_entry.set_text('')
+ SETUP_UI.shortcut_treeview.get_selection().unselect_all()
+
+ def on_shortcut_delete_clicked(self, dummy_widget):
+ '''
+ The button to delete a custom shortcut has been clicked.
+ '''
+ shortcut = SETUP_UI.shortcut_entry.get_text().strip()
+ shortcut_expansion = (
+ SETUP_UI.shortcut_expansion_entry.get_text().strip())
+ SETUP_UI.shortcut_entry.set_text('')
+ SETUP_UI.shortcut_expansion_entry.set_text('')
+ SETUP_UI.shortcut_treeview.get_selection().unselect_all()
+ if shortcut and shortcut_expansion:
+ model = SETUP_UI.shortcut_treeview_model
+ iterator = model.get_iter_first()
+ while iterator:
+ if (model.get_value(iterator, 0) == shortcut
+ and
+ model.get_value(iterator, 1) == shortcut_expansion):
+ SETUP_UI.tabsqlitedb.remove_phrase(
+ input_phrase=shortcut,
+ phrase=shortcut_expansion)
+ if not model.remove(iterator):
+ iterator = None
+ else:
+ iterator = model.iter_next(iterator)
def on_shortcut_add_clicked(self, dummy_widget):
'''
The button to add a custom shortcut has been clicked.
'''
+ SETUP_UI.shortcut_treeview.get_selection().unselect_all()
shortcut = SETUP_UI.shortcut_entry.get_text().strip()
- shortcut_expansion = SETUP_UI.shortcut_expansion_entry.get_text().strip()
+ shortcut_expansion = (
+ SETUP_UI.shortcut_expansion_entry.get_text().strip())
if shortcut and shortcut_expansion:
- sys.stderr.write(
- 'defining shortcut: ���%s��� -> ���%s���\n' %(shortcut, shortcut_expansion))
- SETUP_UI.tabsqlitedb.check_phrase_and_update_frequency(
- input_phrase=shortcut,
- phrase=shortcut_expansion,
- user_freq_increment=1000000)
+ model = SETUP_UI.shortcut_treeview_model
+ iterator = model.get_iter_first()
+ shortcut_existing = False
+ while iterator:
+ if (model.get_value(iterator, 0) == shortcut
+ and
+ model.get_value(iterator, 1) == shortcut_expansion):
+ shortcut_existing = True
+ iterator = model.iter_next(iterator)
+ if not shortcut_existing:
+ sys.stderr.write(
+ 'defining shortcut: ���%s��� -> ���%s���\n'
+ %(shortcut, shortcut_expansion))
+ SETUP_UI.tabsqlitedb.check_phrase_and_update_frequency(
+ input_phrase=shortcut,
+ phrase=shortcut_expansion,
+ user_freq_increment=itb_util.SHORTCUT_USER_FREQ)
+ model.append((shortcut, shortcut_expansion))
+
+ def on_shortcut_selected(self, selection):
+ '''
+ A row in the list of shortcuts has been selected.
+ '''
+ (model, iterator) = selection.get_selected()
+ if iterator:
+ shortcut = model[iterator][0]
+ shortcut_expansion = model[iterator][1]
+ SETUP_UI.shortcut_entry.set_text(shortcut)
+ SETUP_UI.shortcut_expansion_entry.set_text(shortcut_expansion)
def on_install_dictionary_clicked(self, dummy_widget):
'''
diff --git a/setup/setup.glade b/setup/setup.glade
index 7830878..b0e71c6 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -344,6 +344,8 @@
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -356,6 +358,8 @@
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -399,6 +403,8 @@
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">10</property>
<property name="column_spacing">10</property>
<child>
@@ -425,7 +431,7 @@
<property name="vexpand">False</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">4</property>
</packing>
</child>
@@ -440,7 +446,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
@@ -454,7 +460,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">2</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
@@ -465,7 +471,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
@@ -476,7 +482,44 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">2</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="shortcut_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">3</property>
+ <property name="height">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="shortcut_delete_button">
+ <property name="label" translatable="yes">Delete shortcut</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
</object>
@@ -756,8 +799,8 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
7 years, 7 months
[ibus-typing-booster] master: Update German translations (30a7c99)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 30a7c992f6f0785fa0fac399a14992ff8d4d0a25
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Thu Nov 17 07:53:13 2016 +0100
Update German translations
>---------------------------------------------------------------
Diff suppressed because of size. To see it, use:
git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^30a7c992f6f0785fa0fac399a14992ff8d4d0a25~1 30a7c992f6f0785fa0fac399a14992ff8d4d0a25
7 years, 7 months
[ibus-typing-booster] master: Add feature to define custom shortcuts (71b7535)
by mfabian＠fedoraproject.org
Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
>---------------------------------------------------------------
commit 71b753518a7f941cc5ca4623f50de644bda7021f
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Wed Nov 16 16:17:59 2016 +0100
Add feature to define custom shortcuts
>---------------------------------------------------------------
engine/tabsqlitedb.py | 12 +++--
setup/main.py | 35 +++++++++++++++
setup/setup.glade | 113 +++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 151 insertions(+), 9 deletions(-)
diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py
index 71445d3..4f56a5d 100755
--- a/engine/tabsqlitedb.py
+++ b/engine/tabsqlitedb.py
@@ -719,7 +719,7 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
def check_phrase_and_update_frequency(
self, input_phrase = '', phrase = '', p_phrase = '',
- pp_phrase = '', commit=True):
+ pp_phrase = '', user_freq_increment = 1, commit=True):
'''
Check whether input_phrase and phrase are already in database. If
they are in the database, increase the frequency by 1, if not
@@ -776,21 +776,23 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_
sys.stderr.write(
"check_phrase_and_update_frequency() result=%s\n" %result)
if len(result) > 0:
- # A match was found in user_db, increase user frequency by 1
+ # A match was found in user_db, increase user frequency by
+ # user_freq_increment (1 by default)
self.update_phrase(input_phrase = input_phrase,
phrase = phrase,
p_phrase = p_phrase,
pp_phrase = pp_phrase,
- user_freq = result[0][0]+1,
+ user_freq = result[0][0]+user_freq_increment,
commit=commit)
return
# The phrase was not found in user_db.
- # Add it as a new phrase, i.e. with user_freq = 1:
+ # Add it as a new phrase, i.e. with user_freq = user_freq_increment
+ # (1 by default):
self.add_phrase(input_phrase = input_phrase,
phrase = phrase,
p_phrase = p_phrase,
pp_phrase = pp_phrase,
- user_freq = 1,
+ user_freq = user_freq_increment,
commit=commit)
return
diff --git a/setup/main.py b/setup/main.py
index 2045992..045b061 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -154,6 +154,19 @@ class SetupUI:
'<span font_size="large"><b>ibus-typing-booster %s</b></span>'
%version.get_version())
+ self.shortcut_entry = self.builder.get_object(
+ "shortcut_entry")
+ self.shortcut_expansion_entry = self.builder.get_object(
+ "shortcut_expansion_entry")
+ shortcut_clear_button = self.builder.get_object(
+ "shortcut_clear_button")
+ shortcut_clear_button.connect(
+ 'clicked', event_handler.on_shortcut_clear_clicked)
+ shortcut_add_button = self.builder.get_object(
+ "shortcut_add_button")
+ shortcut_add_button.connect(
+ 'clicked', event_handler.on_shortcut_add_clicked)
+
self.install_dictionary_button = self.builder.get_object(
"install_dictionary_button")
self.install_dictionary_button.connect(
@@ -448,6 +461,28 @@ class EventHandler:
'''
Gtk.main_quit()
+ def on_shortcut_clear_clicked(self, dummy_widget):
+ '''
+ The button to clear the entry fields for defining
+ a custom shortcut has been clicked.
+ '''
+ SETUP_UI.shortcut_entry.set_text('')
+ SETUP_UI.shortcut_expansion_entry.set_text('')
+
+ def on_shortcut_add_clicked(self, dummy_widget):
+ '''
+ The button to add a custom shortcut has been clicked.
+ '''
+ shortcut = SETUP_UI.shortcut_entry.get_text().strip()
+ shortcut_expansion = SETUP_UI.shortcut_expansion_entry.get_text().strip()
+ if shortcut and shortcut_expansion:
+ sys.stderr.write(
+ 'defining shortcut: ���%s��� -> ���%s���\n' %(shortcut, shortcut_expansion))
+ SETUP_UI.tabsqlitedb.check_phrase_and_update_frequency(
+ input_phrase=shortcut,
+ phrase=shortcut_expansion,
+ user_freq_increment=1000000)
+
def on_install_dictionary_clicked(self, dummy_widget):
'''
The button to install the main dictionary for this engine
diff --git a/setup/setup.glade b/setup/setup.glade
index 2a85e18..7830878 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -392,6 +392,110 @@
</packing>
</child>
<child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="row_spacing">10</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkButton" id="shortcut_clear_button">
+ <property name="label" translatable="yes">Clear input</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="shortcut_add_button">
+ <property name="label" translatable="yes">Add shortcut</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="shortcut_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Enter shortcut here:</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="shortcut_expansion_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Enter shortcut expansion here:</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="shortcut_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="shortcut_expansion_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Custom shortcuts</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -516,7 +620,7 @@
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child type="tab">
@@ -526,7 +630,7 @@
<property name="label" translatable="yes">Dictionaries and personal data</property>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -630,7 +734,7 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child type="tab">
@@ -640,7 +744,7 @@
<property name="label" translatable="yes" comments="This is the ���About��� tab in the setup tool. That tab shows the version of ibus-typing-booster and shows links to the ibus-typing-booster home page and the online documentation.">About</property>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -666,4 +770,5 @@
<action-widget response="0">close_button</action-widget>
</action-widgets>
</object>
+ <object class="GtkTextBuffer" id="shortcut_expansion_textbuffer"/>
</interface>
7 years, 7 months
