Move panel into ui folder, and rename panel to gtk.

16 files changed, 38 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 9d5a8ec..7f99b46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = \
 	gconf \
 	ibus \
 	launcher \
-	panel \
+	ui \
 	lib \
 	util \
 	client \
diff --git a/configure.ac b/configure.ac
index 8d0b685..b80ace3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ PKG_CHECK_MODULES(DBUS, [
     dbus-glib-1
 ])
 
-
 # Check for Qt4
 PKG_CHECK_MODULES(QT,
     [QtCore >= 4.4.0 QtDBus >= 4.4.0],
@@ -230,8 +229,9 @@ daemon/ibus-daemon
 launcher/ibus
 launcher/ibus.desktop
 launcher/Makefile
-panel/Makefile
-panel/ibus-panel
+ui/Makefile
+ui/gtk/Makefile
+ui/gtk/ibus-ui-gtk
 gconf/Makefile
 gconf/ibus-gconf
 lib/Makefile
diff --git a/launcher/ibus.in b/launcher/ibus.in
index 020e6da..0f8c5fd 100644
--- a/launcher/ibus.in
+++ b/launcher/ibus.in
@@ -31,14 +31,14 @@ import signal
 
 daemon = "@prefix@/bin/ibus-daemon"
 x11 = "@prefix@/bin/ibus-x11"
-panel = "@prefix@/bin/ibus-panel"
+ui = "@prefix@/bin/ibus-ui-gtk"
 conf = "@prefix@/bin/ibus-gconf"
 
 class Launcher(object):
     def __init__(self):
         super(Launcher, self).__init__()
         self.__daemon_pid = 0
-        self.__panel_pid = 0
+        self.__ui_pid = 0
         self.__conf_pid = 0
         self.__x11_pid = 0
         self.__bus = None
@@ -69,8 +69,8 @@ class Launcher(object):
                 self.__bus = None
             elif pid == self.__x11_pid:
                 self.__x11_pid = 0
-            elif pid == self.__panel_pid:
-                self.__panel_pid = 0
+            elif pid == self.__ui_pid:
+                self.__ui_pid = 0
             elif pid == self.__conf_pid:
                 self.__conf_pid = 0
         elif sig == signal.SIGTERM or sig == signal.SIGINT:
@@ -122,7 +122,7 @@ class Launcher(object):
         self.__bus.connect("config-reloaded", self.__bus_config_reloaded_cb)
 
         self.__conf_pid = self.__start_process(conf, [conf], "ibus-conf")
-        self.__panel_pid = self.__start_process(panel, [panel], "ibus-panel")
+        self.__ui_pid = self.__start_process(ui, [ui], "ibus-ui-gtk")
         self.__x11_pid = self.__start_process(x11, [x11, "--kill-daemon"], "ibus-x11")
         ibus.main()
 
diff --git a/ui/Makefile.am b/ui/Makefile.am
new file mode 100644
index 0000000..851c80e
--- /dev/null
+++ b/ui/Makefile.am
@@ -0,0 +1,24 @@
+# vim:set noet ts=4:
+#
+# ibus - The Input Bus
+#
+# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA  02111-1307  USA
+
+SUBDIRS = \
+	gtk \
+	$(NULL)
diff --git a/panel/.gitignore b/ui/gtk/.gitignore
index a278abf..a278abf 100644
--- a/panel/.gitignore
+++ b/ui/gtk/.gitignore
diff --git a/panel/Makefile.am b/ui/gtk/Makefile.am
index 6a09a7f..610b6a5 100644
--- a/panel/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -19,7 +19,7 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-panel_PYTHON = \
+ui_gtk_PYTHON = \
 	candidatepanel.py \
 	handle.py \
 	icon.py \
@@ -31,16 +31,16 @@ panel_PYTHON = \
 	toolitem.py \
 	$(NULL)
 
-paneldir = $(pkgdatadir)/panel
+ui_gtkdir = $(pkgdatadir)/ui/gtk
 
-bin_SCRIPTS = ibus-panel
+bin_SCRIPTS = ibus-ui-gtk
 
 CLEANFILES = \
 	*.pyc \
 	$(NULL)
 
 EXTRA_DIST = \
-	ibus-panel.in \
+	ibus-ui-gtk.in \
 	$(NULL)
 
 test:
diff --git a/panel/candidatepanel.py b/ui/gtk/candidatepanel.py
index 528c7e7..528c7e7 100644
--- a/panel/candidatepanel.py
+++ b/ui/gtk/candidatepanel.py
diff --git a/panel/handle.py b/ui/gtk/handle.py
index 327a018..327a018 100644
--- a/panel/handle.py
+++ b/ui/gtk/handle.py
diff --git a/panel/ibus-panel.in b/ui/gtk/ibus-ui-gtk.in
index 0a46f5d..1f2331b 100644
--- a/panel/ibus-panel.in
+++ b/ui/gtk/ibus-ui-gtk.in
@@ -19,5 +19,5 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 export IBUS_PREFIX=@prefix@
-exec python @prefix@/share/ibus/panel/main.py $@
+exec python @prefix@/share/ibus/ui/gtk/main.py $@
 
diff --git a/panel/icon.py b/ui/gtk/icon.py
index 4a373a9..4a373a9 100644
--- a/panel/icon.py
+++ b/ui/gtk/icon.py
diff --git a/panel/languagebar.py b/ui/gtk/languagebar.py
index 65eb2e5..65eb2e5 100644
--- a/panel/languagebar.py
+++ b/ui/gtk/languagebar.py
diff --git a/panel/main.py b/ui/gtk/main.py
index 07ea3c0..07ea3c0 100644
--- a/panel/main.py
+++ b/ui/gtk/main.py
diff --git a/panel/menu.py b/ui/gtk/menu.py
index 19911e8..19911e8 100644
--- a/panel/menu.py
+++ b/ui/gtk/menu.py
diff --git a/panel/panel.py b/ui/gtk/panel.py
index de54464..de54464 100644
--- a/panel/panel.py
+++ b/ui/gtk/panel.py
diff --git a/panel/propitem.py b/ui/gtk/propitem.py
index 3d363ed..3d363ed 100644
--- a/panel/propitem.py
+++ b/ui/gtk/propitem.py
diff --git a/panel/toolitem.py b/ui/gtk/toolitem.py
index 48147a7..48147a7 100644
--- a/panel/toolitem.py
+++ b/ui/gtk/toolitem.py