From 8db276818d12776ba0cd7819972fa5ce30005164 Mon Sep 17 00:00:00 2001 From: Huang Peng Date: Fri, 27 Feb 2009 09:07:18 +0800 Subject: Move icons to data/icons. Install schemas. --- Makefile.am | 2 +- configure.ac | 23 +- data/ibus.schemas | 96 +++++ data/icons/Makefile.am | 48 +++ data/icons/engine-default.svg | 146 +++++++ data/icons/ibus-help.png | Bin 0 -> 13998 bytes data/icons/ibus-keyboard.svg | 250 ++++++++++++ data/icons/ibus-locale.svg | 884 ++++++++++++++++++++++++++++++++++++++++++ data/icons/ibus-setup.svg | 1 + data/icons/ibus-zh.svg | 684 ++++++++++++++++++++++++++++++++ data/icons/ibus.svg | 401 +++++++++++++++++++ icons/Makefile.am | 48 --- icons/engine-default.svg | 146 ------- icons/ibus-help.png | Bin 13998 -> 0 bytes icons/ibus-keyboard.svg | 250 ------------ icons/ibus-locale.svg | 884 ------------------------------------------ icons/ibus-setup.svg | 1 - icons/ibus-zh.svg | 684 -------------------------------- icons/ibus.svg | 401 ------------------- setup/ibus.schemas | 96 ----- 20 files changed, 2533 insertions(+), 2512 deletions(-) create mode 100644 data/ibus.schemas create mode 100644 data/icons/Makefile.am create mode 100644 data/icons/engine-default.svg create mode 100644 data/icons/ibus-help.png create mode 100644 data/icons/ibus-keyboard.svg create mode 100644 data/icons/ibus-locale.svg create mode 120000 data/icons/ibus-setup.svg create mode 100644 data/icons/ibus-zh.svg create mode 100644 data/icons/ibus.svg delete mode 100644 icons/Makefile.am delete mode 100644 icons/engine-default.svg delete mode 100644 icons/ibus-help.png delete mode 100644 icons/ibus-keyboard.svg delete mode 100644 icons/ibus-locale.svg delete mode 120000 icons/ibus-setup.svg delete mode 100644 icons/ibus-zh.svg delete mode 100644 icons/ibus.svg delete mode 100644 setup/ibus.schemas diff --git a/Makefile.am b/Makefile.am index 433b03e..074bb0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = \ client \ setup \ bus \ - icons \ + data \ m4 \ po \ docs \ diff --git a/configure.ac b/configure.ac index 2302dd3..c40d8b0 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,26 @@ PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.12], ) +AC_PATH_PROG(GCONFTOOL, gconftool-2, no) +if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +fi + +AM_GCONF_SOURCE_2 + +# GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0` +# old_path=$PATH +# if test x"$GCONF_SERVERDIR" != x; then +# PATH=$GCONF_SERVERDIR:$PATH +# fi +# +# AC_PATH_PROG(GCONF_SANITY_CHECK, gconf-sanity-check-2, no) +# if test x"$GCONF_SANITY_CHECK" = xno; then +# AC_MSG_ERROR([gconf-sanity-check-2 executable not found in your path - should be installed with GConf]) +# fi +# +# AC_SUBST(GCONF_SANITY_CHECK) +# PATH=$old_path # Check for Qt4 PKG_CHECK_MODULES(QT, @@ -253,7 +273,8 @@ bindings/Makefile bindings/python/Makefile util/Makefile util/IMdkit/Makefile -icons/Makefile +data/Makefile +data/icons/Makefile docs/Makefile docs/reference/Makefile docs/reference/ibus/Makefile diff --git a/data/ibus.schemas b/data/ibus.schemas new file mode 100644 index 0000000..2bd2bb5 --- /dev/null +++ b/data/ibus.schemas @@ -0,0 +1,96 @@ + + + + + /schemas/desktop/ibus/general/preload_engines + /desktop/ibus/general/preload_engines + ibus + list + string + + Preload Engines + Preload Engines during ibus starts up + + + + /schemas/desktop/ibus/general/hotkey/trigger + /desktop/ibus/general/hotkey/trigger + ibus + list + string + [Control+space] + + Trigger Hotkey + Trigger hotkey for enable or disable input context + + + + /schemas/desktop/ibus/general/hotkey/next_engine + /desktop/ibus/general/hotkey/next_engine + ibus + list + string + [] + + Next Engine Hotkey + Next engine hotkey for switch to next input method engine + + + + /schemas/desktop/ibus/general/hotkey/prev_engine + /desktop/ibus/general/hotkey/prev_engine + ibus + list + string + [] + + Prev Engine Hotkey + Prev engine hotkey for switch to previous input method engine + + + + /schemas/desktop/ibus/panel/auto_hide + /desktop/ibus/panel/auto_hide + ibus + bool + true + + Auto Hide + Auto hide language panel + + + + /schemas/desktop/ibus/panel/lookup_table_orientation + /desktop/ibus/panel/lookup_table_orientation + ibus + int + 0 + + Orientation of Lookup Table + Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical + + + + /schemas/desktop/ibus/panel/use_custom_font + /desktop/ibus/panel/use_custom_font + ibus + bool + false + + Use Custom Font + Use custom font name for language panel + + + + /schemas/desktop/ibus/panel/custom_font + /desktop/ibus/panel/custom_font + ibus + string + Sans 10 + + Custom Font + Custom font name for language panel + + + + diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 0000000..5a6617c --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,48 @@ +# vim:set noet ts=4: +# +# ibus - The Input Bus +# +# Copyright (c) 2007-2008 Huang Peng +# +# 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 + +icons_DATA = \ + engine-default.svg \ + ibus-help.png \ + ibus-keyboard.svg \ + ibus-locale.svg \ + ibus-zh.svg \ + ibus.svg \ + $(NULL) + +iconsdir = $(pkgdatadir)/icons + +sysicons_DATA = \ + ibus.svg \ + ibus-setup.svg \ + $(NULL) + +sysiconsdir = $(datadir)/pixmaps + +EXTRA_DIST = \ + engine-default.svg \ + ibus-help.png \ + ibus-keyboard.svg \ + ibus-locale.svg \ + ibus-zh.svg \ + ibus-setup.svg \ + ibus.svg \ + $(NULL) diff --git a/data/icons/engine-default.svg b/data/icons/engine-default.svg new file mode 100644 index 0000000..e27018c --- /dev/null +++ b/data/icons/engine-default.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/icons/ibus-help.png b/data/icons/ibus-help.png new file mode 100644 index 0000000..aff3318 Binary files /dev/null and b/data/icons/ibus-help.png differ diff --git a/data/icons/ibus-keyboard.svg b/data/icons/ibus-keyboard.svg new file mode 100644 index 0000000..4a19adc --- /dev/null +++ b/data/icons/ibus-keyboard.svg @@ -0,0 +1,250 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/ibus-locale.svg b/data/icons/ibus-locale.svg new file mode 100644 index 0000000..0d737d9 --- /dev/null +++ b/data/icons/ibus-locale.svg @@ -0,0 +1,884 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/icons/ibus-setup.svg b/data/icons/ibus-setup.svg new file mode 120000 index 0000000..ed6fc03 --- /dev/null +++ b/data/icons/ibus-setup.svg @@ -0,0 +1 @@ +ibus.svg \ No newline at end of file diff --git a/data/icons/ibus-zh.svg b/data/icons/ibus-zh.svg new file mode 100644 index 0000000..7747876 --- /dev/null +++ b/data/icons/ibus-zh.svg @@ -0,0 +1,684 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/icons/ibus.svg b/data/icons/ibus.svg new file mode 100644 index 0000000..87063a9 --- /dev/null +++ b/data/icons/ibus.svg @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Character map + August 2007 + + + Andreas Nilsson + + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + diff --git a/icons/Makefile.am b/icons/Makefile.am deleted file mode 100644 index 5a6617c..0000000 --- a/icons/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# vim:set noet ts=4: -# -# ibus - The Input Bus -# -# Copyright (c) 2007-2008 Huang Peng -# -# 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 - -icons_DATA = \ - engine-default.svg \ - ibus-help.png \ - ibus-keyboard.svg \ - ibus-locale.svg \ - ibus-zh.svg \ - ibus.svg \ - $(NULL) - -iconsdir = $(pkgdatadir)/icons - -sysicons_DATA = \ - ibus.svg \ - ibus-setup.svg \ - $(NULL) - -sysiconsdir = $(datadir)/pixmaps - -EXTRA_DIST = \ - engine-default.svg \ - ibus-help.png \ - ibus-keyboard.svg \ - ibus-locale.svg \ - ibus-zh.svg \ - ibus-setup.svg \ - ibus.svg \ - $(NULL) diff --git a/icons/engine-default.svg b/icons/engine-default.svg deleted file mode 100644 index e27018c..0000000 --- a/icons/engine-default.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/icons/ibus-help.png b/icons/ibus-help.png deleted file mode 100644 index aff3318..0000000 Binary files a/icons/ibus-help.png and /dev/null differ diff --git a/icons/ibus-keyboard.svg b/icons/ibus-keyboard.svg deleted file mode 100644 index 4a19adc..0000000 --- a/icons/ibus-keyboard.svg +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/ibus-locale.svg b/icons/ibus-locale.svg deleted file mode 100644 index 0d737d9..0000000 --- a/icons/ibus-locale.svg +++ /dev/null @@ -1,884 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icons/ibus-setup.svg b/icons/ibus-setup.svg deleted file mode 120000 index ed6fc03..0000000 --- a/icons/ibus-setup.svg +++ /dev/null @@ -1 +0,0 @@ -ibus.svg \ No newline at end of file diff --git a/icons/ibus-zh.svg b/icons/ibus-zh.svg deleted file mode 100644 index 7747876..0000000 --- a/icons/ibus-zh.svg +++ /dev/null @@ -1,684 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icons/ibus.svg b/icons/ibus.svg deleted file mode 100644 index 87063a9..0000000 --- a/icons/ibus.svg +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Character map - August 2007 - - - Andreas Nilsson - - - - - - Andreas Nilsson - - - - - - - - - - - - - - - - - - - diff --git a/setup/ibus.schemas b/setup/ibus.schemas deleted file mode 100644 index 2bd2bb5..0000000 --- a/setup/ibus.schemas +++ /dev/null @@ -1,96 +0,0 @@ - - - - - /schemas/desktop/ibus/general/preload_engines - /desktop/ibus/general/preload_engines - ibus - list - string - - Preload Engines - Preload Engines during ibus starts up - - - - /schemas/desktop/ibus/general/hotkey/trigger - /desktop/ibus/general/hotkey/trigger - ibus - list - string - [Control+space] - - Trigger Hotkey - Trigger hotkey for enable or disable input context - - - - /schemas/desktop/ibus/general/hotkey/next_engine - /desktop/ibus/general/hotkey/next_engine - ibus - list - string - [] - - Next Engine Hotkey - Next engine hotkey for switch to next input method engine - - - - /schemas/desktop/ibus/general/hotkey/prev_engine - /desktop/ibus/general/hotkey/prev_engine - ibus - list - string - [] - - Prev Engine Hotkey - Prev engine hotkey for switch to previous input method engine - - - - /schemas/desktop/ibus/panel/auto_hide - /desktop/ibus/panel/auto_hide - ibus - bool - true - - Auto Hide - Auto hide language panel - - - - /schemas/desktop/ibus/panel/lookup_table_orientation - /desktop/ibus/panel/lookup_table_orientation - ibus - int - 0 - - Orientation of Lookup Table - Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical - - - - /schemas/desktop/ibus/panel/use_custom_font - /desktop/ibus/panel/use_custom_font - ibus - bool - false - - Use Custom Font - Use custom font name for language panel - - - - /schemas/desktop/ibus/panel/custom_font - /desktop/ibus/panel/custom_font - ibus - string - Sans 10 - - Custom Font - Custom font name for language panel - - - - -- cgit