84 lines
4.6 KiB
Diff
84 lines
4.6 KiB
Diff
|
--- ibus-anthy/engine/engine.py.orig 2012-10-06 21:14:45.250978091 +0900
|
||
|
+++ ibus-anthy/engine/engine.py 2012-10-06 21:20:31.325649562 +0900
|
||
|
@@ -204,7 +204,7 @@ class Engine(IBus.EngineSimple):
|
||
|
{ 'description' : _("Input mode"), 'symbol' : symbol }
|
||
|
input_mode_prop = IBus.Property(key=u'InputMode',
|
||
|
prop_type=IBus.PropType.MENU,
|
||
|
- label=IBus.Text.new_from_string(label),
|
||
|
+ label=IBus.Text.new_from_string(symbol),
|
||
|
symbol=IBus.Text.new_from_string(symbol),
|
||
|
icon='',
|
||
|
tooltip=IBus.Text.new_from_string(_("Switch input mode")),
|
||
|
@@ -278,7 +278,7 @@ class Engine(IBus.EngineSimple):
|
||
|
{ 'description' : _("Typing method"), 'symbol' : symbol }
|
||
|
typing_mode_prop = IBus.Property(key=u'TypingMode',
|
||
|
prop_type=IBus.PropType.MENU,
|
||
|
- label=IBus.Text.new_from_string(label),
|
||
|
+ label=IBus.Text.new_from_string(symbol),
|
||
|
symbol=IBus.Text.new_from_string(symbol),
|
||
|
icon='',
|
||
|
tooltip=IBus.Text.new_from_string(_("Switch typing method")),
|
||
|
@@ -355,7 +355,7 @@ class Engine(IBus.EngineSimple):
|
||
|
{ 'description' : _("Segment mode"), 'symbol' : symbol }
|
||
|
segment_mode_prop = IBus.Property(key=u'SegmentMode',
|
||
|
prop_type=IBus.PropType.MENU,
|
||
|
- label=IBus.Text.new_from_string(label),
|
||
|
+ label=IBus.Text.new_from_string(symbol),
|
||
|
symbol=IBus.Text.new_from_string(symbol),
|
||
|
icon=None,
|
||
|
tooltip=IBus.Text.new_from_string(_("Switch conversion mode")),
|
||
|
@@ -420,7 +420,7 @@ class Engine(IBus.EngineSimple):
|
||
|
{ 'description' : _("Dictionary mode"), 'symbol' : short_label }
|
||
|
dict_mode_prop = IBus.Property(key=u'DictMode',
|
||
|
prop_type=IBus.PropType.MENU,
|
||
|
- label=IBus.Text.new_from_string(label),
|
||
|
+ label=IBus.Text.new_from_string(short_label),
|
||
|
symbol=IBus.Text.new_from_string(short_label),
|
||
|
icon=None,
|
||
|
tooltip=IBus.Text.new_from_string(_("Switch dictionary")),
|
||
|
@@ -743,7 +743,7 @@ class Engine(IBus.EngineSimple):
|
||
|
self.__input_mode = mode
|
||
|
prop = self.__prop_dict[u'InputMode']
|
||
|
prop.set_symbol(IBus.Text.new_from_string(symbol))
|
||
|
- prop.set_label(IBus.Text.new_from_string(label))
|
||
|
+ prop.set_label(IBus.Text.new_from_string(symbol))
|
||
|
self.update_property(prop)
|
||
|
|
||
|
self.__reset()
|
||
|
@@ -771,7 +771,7 @@ class Engine(IBus.EngineSimple):
|
||
|
Engine.__typing_mode = mode
|
||
|
prop = self.__prop_dict[u'TypingMode']
|
||
|
prop.set_symbol(IBus.Text.new_from_string(symbol))
|
||
|
- prop.set_label(IBus.Text.new_from_string(label))
|
||
|
+ prop.set_label(IBus.Text.new_from_string(symbol))
|
||
|
self.update_property(prop)
|
||
|
|
||
|
self.__reset()
|
||
|
@@ -793,7 +793,7 @@ class Engine(IBus.EngineSimple):
|
||
|
_prop.set_state(IBus.PropState.CHECKED)
|
||
|
self.update_property(_prop)
|
||
|
prop.set_symbol(IBus.Text.new_from_string(symbol))
|
||
|
- prop.set_label(IBus.Text.new_from_string(label))
|
||
|
+ prop.set_label(IBus.Text.new_from_string(symbol))
|
||
|
self.update_property(prop)
|
||
|
|
||
|
def __segment_mode_activate(self, prop_name, state):
|
||
|
@@ -818,7 +818,7 @@ class Engine(IBus.EngineSimple):
|
||
|
self.__segment_mode = mode
|
||
|
prop = self.__prop_dict[u'SegmentMode']
|
||
|
prop.set_symbol(IBus.Text.new_from_string(symbol))
|
||
|
- prop.set_label(IBus.Text.new_from_string(label))
|
||
|
+ prop.set_label(IBus.Text.new_from_string(symbol))
|
||
|
self.update_property(prop)
|
||
|
|
||
|
self.__reset()
|
||
|
@@ -883,7 +883,7 @@ class Engine(IBus.EngineSimple):
|
||
|
label = _("%(description)s (%(symbol)s)") % \
|
||
|
{ 'description' : _("Dictionary mode"), 'symbol' : symbol }
|
||
|
prop.set_symbol(IBus.Text.new_from_string(symbol))
|
||
|
- prop.set_label(IBus.Text.new_from_string(label))
|
||
|
+ prop.set_label(IBus.Text.new_from_string(symbol))
|
||
|
self.update_property(prop)
|
||
|
|
||
|
def __argb(self, a, r, g, b):
|