Rename icon ibus-keyboard to ibus-off

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index e50d5dbbe56c24e0c03ecd5a454704aef0df0e19..f565d3f4e335712120109f5c629627e162a4e600 100644 (file)
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -27,7 +27,7 @@ iconsdir = $(pkgdatadir)/icons
 sysicons_DATA = \
        ibus.svg \
        ibus-setup.svg \
-       ibus-keyboard.svg \
+       ibus-off.svg \
        ibus-engine.svg \
        $(NULL)
 

diff --git a/data/icons/ibus-keyboard.svg b/data/icons/ibus-keyboard.svg
deleted file mode 120000 (symlink)
index ed6fc03..0000000
--- a/data/icons/ibus-keyboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-ibus.svg
\ No newline at end of file

diff --git a/data/icons/ibus-off.svg b/data/icons/ibus-off.svg
new file mode 120000 (symlink)
index 0000000..ed6fc03
--- /dev/null
+++ b/data/icons/ibus-off.svg
@@ -0,0 +1 @@
+ibus.svg
\ No newline at end of file

diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
index 38ea8e86bac22e33c9b96828afa080b3bdd20029..4ffb977bfe23f0fea7d71ac9e18b5572e26196cd 100644 (file)
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
@@ -37,7 +37,7 @@ from gettext import dgettext
 _  = lambda a : dgettext("ibus", a)
 N_ = lambda a : a
 
-ICON_KEYBOARD = "ibus-keyboard"
+ICON_OFF = "ibus-off"
 ICON_ENGINE = "ibus-engine"
 
 def show_uri(screen, link):
@@ -106,7 +106,7 @@ class Panel(ibus.PanelBase):
         self.__status_icon = gtk.StatusIcon()
         self.__status_icon.connect("popup-menu", self.__status_icon_popup_menu_cb)
         self.__status_icon.connect("activate", self.__status_icon_activate_cb)
-        self.__status_icon.set_from_icon_name(ICON_KEYBOARD)
+        self.__status_icon.set_from_icon_name(ICON_OFF)
         self.__status_icon.set_tooltip(_("IBus input method framework"))
         self.__status_icon.set_visible(True)
 
@@ -198,7 +198,7 @@ class Panel(ibus.PanelBase):
         self.__language_bar.set_enabled(enabled)
 
         if not enabled:
-            self.__set_im_icon(ICON_KEYBOARD)
+            self.__set_im_icon(ICON_OFF)
             self.__set_im_name(None)
         else:
             engine = self.__focus_ic.get_engine()
@@ -206,7 +206,7 @@ class Panel(ibus.PanelBase):
                 self.__set_im_icon(engine.icon)
                 self.__set_im_name(engine.longname)
             else:
-                self.__set_im_icon(ICON_KEYBOARD)
+                self.__set_im_icon(ICON_OFF)
                 self.__set_im_name(None)
         self.__language_bar.focus_in()
 
@@ -215,7 +215,7 @@ class Panel(ibus.PanelBase):
         self.__focus_ic = None
         self.__language_bar.set_enabled(False)
         self.__language_bar.focus_out()
-        self.__set_im_icon(ICON_KEYBOARD)
+        self.__set_im_icon(ICON_OFF)
         self.__set_im_name(None)
 
     def state_changed(self):
@@ -227,7 +227,7 @@ class Panel(ibus.PanelBase):
 
         if enabled == False:
             self.reset()
-            self.__set_im_icon(ICON_KEYBOARD)
+            self.__set_im_icon(ICON_OFF)
             self.__set_im_name(None)
         else:
             engine = self.__focus_ic.get_engine()
@@ -235,7 +235,7 @@ class Panel(ibus.PanelBase):
                 self.__set_im_icon(engine.icon)
                 self.__set_im_name(engine.longname)
             else:
-                self.__set_im_icon(ICON_KEYBOARD)
+                self.__set_im_icon(ICON_OFF)
                 self.__set_im_name(None)