Attachment 884512 Details for Bug 1084684 – 0004-Don-t-try-to-colour-system-phrases-and-user-phrases-.patch

[patch] 0004-Don-t-try-to-colour-system-phrases-and-user-phrases-.patch

0004-Don-t-try-to-colour-system-phrases-and-user-phrases-.patch (text/plain), 2.41 KB, created by Mike FABIAN on 2014-04-09 14:12:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike FABIAN

Created: 2014-04-09 14:12:21 UTC

Size: 2.41 KB

patch

obsolete

>From 920e236ee240e054cf05a85aacf606590633196f Mon Sep 17 00:00:00 2001
>From: Mike FABIAN <mfabian@redhat.com>
>Date: Tue, 8 Apr 2014 17:51:12 +0200
>Subject: [PATCH 4/7] =?UTF-8?q?Don=E2=80=99t=20try=20to=20colour=20system?=
> =?UTF-8?q?=20phrases=20and=20user=20phrases=20differently=20in=20pinyin?=
> =?UTF-8?q?=20mode?=
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>In pinyin mode, there are no user defined phrases.  Therefore, the
>array holding a candidate does not have two integers at the end, only
>one. candi[-2] is already the phrase, i.e. the chinese character in
>pinyin mode, not an integer specifying a frequency.
>
>Resolves: rhbz#1084684 - [abrt] ibus-table: table.py:670:ap_candidate:TypeError: unorderable types: str() < int()
>See: https://bugzilla.redhat.com/show_bug.cgi?id=1084684
>---
> engine/table.py | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/engine/table.py b/engine/table.py
>index 0e9e00e..ed33862 100644
>--- a/engine/table.py
>+++ b/engine/table.py
>@@ -659,21 +659,17 @@ class editor(object):
>         else:
>             _tbks = u''.join( map(self._deparser , candi[_fkey + len(self._tabkey_list) : _p_index ] ) )
>         _phrase = candi[_p_index]
>-        # further color implementation needed :)
>-        # here -2 is the pos of num, -1 is the pos of . 0 is the pos of string
>-        #attrs = IBus.AttrList ([IBus.AttributeForeground (0x8e2626, -2, 1)])
>         attrs = IBus.AttrList ()
>-        # this is the part of tabkey
>         attrs.append(IBus.attr_foreground_new(rgb(0x19,0x73,0xa2), 0, \
>             len(_phrase) + len(_tbks)))
>-        if candi[-2] < 0:
>+        if not self._py_mode and candi[-2] < 0:
>             # this is a user defined phrase:
>             attrs.append(IBus.attr_foreground_new(rgb(0x77,0x00,0xc3), 0, len(_phrase)))
>-        elif candi[-1] > 0:
>-            # this is a sys phrase used by user:
>+        elif not self._py_mode and candi[-1] > 0:
>+            # this is a system phrase which has already been used by the user:
>             attrs.append(IBus.attr_foreground_new(rgb(0x00,0x00,0x00), 0, len(_phrase)))
>         else:
>-            # this is a system phrase haven't been used:
>+            # this is a system phrase that has not been used yet:
>             attrs.append(IBus.attr_foreground_new(rgb(0x00,0x00,0x00), 0, len(_phrase)))
>         text = IBus.Text.new_from_string(_phrase + _tbks)
>         i = 0
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1084684: 883032 | 883033 | 884512