data/dconf: Delete dconf dependencies
gsettings-schema-convert has not worked with python3 since GConf has been deprecated since 2011 so we cannot disable python2 in canse GConf is enabled. I don't wish to maintain both ibus.schemas.in and org.freedesktop.ibus.gschema.xml.in and now decide to delete whole the GConf builds. gsettings is now stable and can be used instead. ibus-dconf will be deperecated in the near future. BUG=https://bugzilla.gnome.org/show_bug.cgi?id=759334
This commit is contained in:
fujiwarat
Родитель
41c866868a
Коммит
a8e8b694dc
|
|
@ -3,7 +3,7 @@
|
|||
# ibus - The Input Bus
|
||||
#
|
||||
# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
|
||||
# Copyright (c) 2007-2010 Red Hat, Inc.
|
||||
# Copyright (c) 2007-2018 Red Hat, Inc.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
|
@ -20,12 +20,6 @@
|
|||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
|
||||
# USA
|
||||
|
||||
if ENABLE_GCONF
|
||||
GCONF_DIR = \
|
||||
gconf \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
MEMCONF_DIR = \
|
||||
memconf \
|
||||
$(NULL)
|
||||
|
|
@ -38,7 +32,6 @@ endif
|
|||
|
||||
SUBDIRS = \
|
||||
$(DCONF_DIR) \
|
||||
$(GCONF_DIR) \
|
||||
$(MEMCONF_DIR) \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
29
configure.ac
29
configure.ac
|
|
@ -339,33 +339,6 @@ PKG_CHECK_MODULES(DBUS, [
|
|||
dbus-1
|
||||
])
|
||||
|
||||
# --enable-gconf option.
|
||||
AC_ARG_ENABLE(gconf,
|
||||
AS_HELP_STRING([--enable-gconf],
|
||||
[Use GConf code]),
|
||||
[enable_gconf=$enableval],
|
||||
[enable_gconf=no]
|
||||
)
|
||||
AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
|
||||
|
||||
if test x"$enable_gconf" = x"yes"; then
|
||||
# check gconf
|
||||
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_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
|
||||
else
|
||||
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
|
||||
enable_gconf="no (disabled, use --enable-gconf to enable)"
|
||||
fi
|
||||
|
||||
# --enable-memconf option.
|
||||
AC_ARG_ENABLE(memconf,
|
||||
AS_HELP_STRING([--enable-memconf],
|
||||
|
|
@ -771,7 +744,6 @@ bindings/Makefile
|
|||
bindings/pygobject/Makefile
|
||||
bindings/vala/Makefile
|
||||
conf/Makefile
|
||||
conf/gconf/Makefile
|
||||
conf/dconf/Makefile
|
||||
conf/memconf/Makefile
|
||||
tools/Makefile
|
||||
|
|
@ -798,7 +770,6 @@ Build options:
|
|||
Build appindicator support $enable_appindicator
|
||||
Build appindicator engine icon $enable_appindicator_engine_icon
|
||||
Build python library $enable_python_library
|
||||
Build gconf modules $enable_gconf
|
||||
Build memconf modules $enable_memconf
|
||||
Build dconf modules $enable_dconf
|
||||
Build introspection $found_introspection
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# ibus - The Input Bus
|
||||
#
|
||||
# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
|
||||
# Copyright (c) 2007-2016 Red Hat, Inc.
|
||||
# Copyright (c) 2007-2018 Red Hat, Inc.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
|
@ -30,27 +30,4 @@ if ENABLE_DCONF
|
|||
SUBDIRS += dconf
|
||||
endif
|
||||
|
||||
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schemas_in_files = ibus.schemas.in
|
||||
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
|
||||
@INTLTOOL_SCHEMAS_RULE@
|
||||
|
||||
install-data-local:
|
||||
if GCONF_SCHEMAS_INSTALL
|
||||
if test -z "$(DESTDIR)" ; then \
|
||||
for p in $(schemas_DATA) ; do \
|
||||
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
|
||||
--makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
|
||||
done \
|
||||
fi
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(schemas_in_files) \
|
||||
$(NULL)
|
||||
|
||||
DISTCLEANFILES = \
|
||||
$(schemas_DATA) \
|
||||
$(NULL)
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
|
|
|
|||
|
|
@ -34,11 +34,6 @@ dconfprofile_DATA = profile/ibus
|
|||
dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
|
||||
dconfdb_DATA = 00-upstream-settings
|
||||
|
||||
org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
|
||||
$(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
|
||||
--schema-id "org.freedesktop.ibus" \
|
||||
--output $@ $<
|
||||
|
||||
00-upstream-settings: $(srcdir)/make-dconf-override-db.sh | $(gsettings_SCHEMAS)
|
||||
@$(MKDIR_P) db
|
||||
$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
|
||||
|
|
@ -75,7 +70,6 @@ CLEANFILES = \
|
|||
$(NULL)
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(gsettings_schemas_in_files) \
|
||||
00-upstream-settings \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,225 @@
|
|||
<?xml version="1.0"?>
|
||||
<schemalist>
|
||||
<schema id="org.freedesktop.ibus" path="/desktop/ibus/">
|
||||
<child name="general" schema="org.freedesktop.ibus.general"/>
|
||||
<child name="panel" schema="org.freedesktop.ibus.panel"/>
|
||||
</schema>
|
||||
<schema id="org.freedesktop.ibus.general" path="/desktop/ibus/general/">
|
||||
<key name="preload-engines" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Preload engines</summary>
|
||||
<description>Preload engines during ibus starts up</description>
|
||||
</key>
|
||||
<key name="engines-order" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Engines order</summary>
|
||||
<description>Saved engines order in input method list</description>
|
||||
</key>
|
||||
<key name="switcher-delay-time" type="i">
|
||||
<default>400</default>
|
||||
<summary>Popup delay milliseconds for IME switcher window</summary>
|
||||
<description>Set popup delay milliseconds to show IME switcher window. The default is 400. 0 = Show the window immediately. 0 < Delay milliseconds. 0 > Do not show the window and switch prev/next engines.</description>
|
||||
</key>
|
||||
<key name="version" type="s">
|
||||
<default>''</default>
|
||||
<summary>Saved version number</summary>
|
||||
<description>The saved version number will be used to check the difference between the version of the previous installed ibus and one of the current ibus.</description>
|
||||
</key>
|
||||
<key name="xkb-latin-layouts" type="as">
|
||||
<default>[ 'ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua' ]</default>
|
||||
<summary>Latin layouts which have no ASCII</summary>
|
||||
<description>US layout is appended to the Latin layouts. variant can be omitted.</description>
|
||||
</key>
|
||||
<key name="use-xmodmap" type="b">
|
||||
<default>true</default>
|
||||
<summary>Use xmodmap</summary>
|
||||
<description>Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched.</description>
|
||||
</key>
|
||||
<key name="use-system-keyboard-layout" type="b">
|
||||
<default>false</default>
|
||||
<summary>Use system keyboard layout</summary>
|
||||
<description>Use system keyboard (XKB) layout</description>
|
||||
</key>
|
||||
<key name="embed-preedit-text" type="b">
|
||||
<default>true</default>
|
||||
<summary>Embed Preedit Text</summary>
|
||||
<description>Embed Preedit Text in Application Window</description>
|
||||
</key>
|
||||
<key name="use-global-engine" type="b">
|
||||
<default>true</default>
|
||||
<summary>Use global input method</summary>
|
||||
<description>Share the same input method among all applications</description>
|
||||
</key>
|
||||
<key name="enable-by-default" type="b">
|
||||
<default>false</default>
|
||||
<summary>Enable input method by default</summary>
|
||||
<description>Enable input method by default when the application gets input focus</description>
|
||||
</key>
|
||||
<key name="dconf-preserve-name-prefixes" type="as">
|
||||
<default>[ '/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul' ]</default>
|
||||
<summary>DConf preserve name prefixes</summary>
|
||||
<description>Prefixes of DConf keys to stop name conversion</description>
|
||||
</key>
|
||||
<child name="hotkey" schema="org.freedesktop.ibus.general.hotkey"/>
|
||||
</schema>
|
||||
<schema id="org.freedesktop.ibus.general.hotkey" path="/desktop/ibus/general/hotkey/">
|
||||
<key name="trigger" type="as">
|
||||
<default>[ 'Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R' ]</default>
|
||||
<summary>Trigger shortcut keys</summary>
|
||||
<description>The shortcut keys for turning input method on or off</description>
|
||||
</key>
|
||||
<key name="triggers" type="as">
|
||||
<default>[ '<Super>space' ]</default>
|
||||
<summary>Trigger shortcut keys for gtk_accelerator_parse</summary>
|
||||
<description>The shortcut keys for turning input method on or off</description>
|
||||
</key>
|
||||
<key name="enable-unconditional" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Enable shortcut keys</summary>
|
||||
<description>The shortcut keys for turning input method on</description>
|
||||
</key>
|
||||
<key name="disable-unconditional" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Disable shortcut keys</summary>
|
||||
<description>The shortcut keys for turning input method off</description>
|
||||
</key>
|
||||
<key name="next-engine" type="as">
|
||||
<default>[ 'Alt+Shift_L' ]</default>
|
||||
<summary>Next engine shortcut keys</summary>
|
||||
<description>The shortcut keys for switching to the next input method in the list</description>
|
||||
</key>
|
||||
<key name="next-engine-in-menu" type="as">
|
||||
<default>[ 'Alt+Shift_L' ]</default>
|
||||
<summary>Next engine shortcut keys</summary>
|
||||
<description>The shortcut keys for switching to the next input method in the list</description>
|
||||
</key>
|
||||
<key name="prev-engine" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Prev engine shortcut keys</summary>
|
||||
<description>The shortcut keys for switching to the previous input method</description>
|
||||
</key>
|
||||
<key name="previous-engine" type="as">
|
||||
<default>[]</default>
|
||||
<summary>Prev engine shortcut keys</summary>
|
||||
<description>The shortcut keys for switching to the previous input method</description>
|
||||
</key>
|
||||
</schema>
|
||||
<schema id="org.freedesktop.ibus.panel" path="/desktop/ibus/panel/">
|
||||
<key name="show" type="i">
|
||||
<default>0</default>
|
||||
<summary>Auto hide</summary>
|
||||
<description>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</description>
|
||||
</key>
|
||||
<key name="x" type="i">
|
||||
<default>-1</default>
|
||||
<summary>Language panel position</summary>
|
||||
</key>
|
||||
<key name="y" type="i">
|
||||
<default>-1</default>
|
||||
<summary>Language panel position</summary>
|
||||
</key>
|
||||
<key name="follow-input-cursor-when-always-shown" type="b">
|
||||
<default>false</default>
|
||||
<summary>Follow the input cursor in case the panel is always shown</summary>
|
||||
<description>If true, the panel follows the input cursor in case the panel is always shown. If false, the panel is shown at a fixed location.</description>
|
||||
</key>
|
||||
<key name="auto-hide-timeout" type="i">
|
||||
<default>10000</default>
|
||||
<summary>The milliseconds to show property panel</summary>
|
||||
<description>The milliseconds to show property panel after focus-in or properties are changed.</description>
|
||||
</key>
|
||||
<key name="lookup-table-orientation" type="i">
|
||||
<default>1</default>
|
||||
<summary>Orientation of lookup table</summary>
|
||||
<description>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</description>
|
||||
</key>
|
||||
<key name="show-icon-on-systray" type="b">
|
||||
<default>true</default>
|
||||
<summary>Show icon on system tray</summary>
|
||||
<description>Show icon on system tray</description>
|
||||
</key>
|
||||
<key name="show-im-name" type="b">
|
||||
<default>false</default>
|
||||
<summary>Show input method name</summary>
|
||||
<description>Show input method name on language bar</description>
|
||||
</key>
|
||||
<key name="xkb-icon-rgba" type="s">
|
||||
<default>'#415099'</default>
|
||||
<summary>RGBA value of XKB icon</summary>
|
||||
<description>XKB icon shows the layout string and the string is rendered with the RGBA value. The RGBA value can be 1. a color name from X11, 2. a hex value in form '#rrggbb' where 'r', 'g' and 'b' are hex digits of the red, green, and blue, 3. a RGB color in form 'rgb(r,g,b)' or 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', 'g', and 'b' are either integers in the range 0 to 255 or percentage values in the range 0% to 100%, and 'a' is a floating point value in the range 0 to 1 of the alpha.</description>
|
||||
</key>
|
||||
<key name="property-icon-delay-time" type="i">
|
||||
<default>500</default>
|
||||
<summary>The milliseconds to show the panel icon for a property</summary>
|
||||
<description>The milliseconds to show the panel icon from the engine icon to a property icon whenever engines are switched if the property is specified by the value of icon-prop-key in IBusEngineDesc. If the value is 0, no delay time and the property icon is shown immediately.</description>
|
||||
</key>
|
||||
<key name="use-custom-font" type="b">
|
||||
<default>false</default>
|
||||
<summary>Use custom font</summary>
|
||||
<description>Use custom font name for language panel</description>
|
||||
</key>
|
||||
<key name="custom-font" type="s">
|
||||
<default>'Sans 10'</default>
|
||||
<summary>Custom font</summary>
|
||||
<description>Custom font name for language panel</description>
|
||||
</key>
|
||||
<child name="emoji" schema="org.freedesktop.ibus.panel.emoji"/>
|
||||
</schema>
|
||||
<schema id="org.freedesktop.ibus.panel.emoji" path="/desktop/ibus/panel/emoji/">
|
||||
<key name="unicode-hotkey" type="as">
|
||||
<default>[ '<Control><Shift>u' ]</default>
|
||||
<summary>Unicode shortcut keys for gtk_accelerator_parse</summary>
|
||||
<description>The shortcut keys for turning Unicode typing on or off</description>
|
||||
</key>
|
||||
<key name="hotkey" type="as">
|
||||
<default>[ '<Control><Shift>e' ]</default>
|
||||
<summary>Emoji shortcut keys for gtk_accelerator_parse</summary>
|
||||
<description>The shortcut keys for turning emoji typing on or off</description>
|
||||
</key>
|
||||
<key name="font" type="s">
|
||||
<default>'Monospace 16'</default>
|
||||
<summary>Custom font</summary>
|
||||
<description>Custom font name for emoji characters on emoji dialog</description>
|
||||
</key>
|
||||
<key name="lang" type="s">
|
||||
<default>'en'</default>
|
||||
<summary>Default language for emoji dictionary</summary>
|
||||
<description>Choose a default language of emoji dictionaries on the emoji dialog. The value $lang is applied to /usr/share/ibus/dicts/emoji-$lang.dict</description>
|
||||
</key>
|
||||
<key name="favorites" type="as">
|
||||
<default>[]</default>
|
||||
<summary>favorite emoji list on emoji dialog</summary>
|
||||
<description>You can show the favorite emojis on emoji list if this list has any characters.</description>
|
||||
</key>
|
||||
<key name="favorite-annotations" type="as">
|
||||
<default>[]</default>
|
||||
<summary>favorite emoji annotation list on emoji dialog</summary>
|
||||
<description>You can assign an annotation for a favorite emoji in this list.</description>
|
||||
</key>
|
||||
<key name="has-partial-match" type="b">
|
||||
<default>false</default>
|
||||
<summary>Whether emoji annotations can be match partially or not</summary>
|
||||
<description>Whether emoji annotations can be matched with a partial string instead of the exact match or not.</description>
|
||||
</key>
|
||||
<key name="partial-match-length" type="i">
|
||||
<default>3</default>
|
||||
<summary>Match emoji annotations with the specified length</summary>
|
||||
<description>Match emoji annotations partially with more than the specified number of characters instead of the exact match.</description>
|
||||
</key>
|
||||
<key name="partial-match-condition" type="i">
|
||||
<default>0</default>
|
||||
<summary>Choose a condition to match emoji annotations partially</summary>
|
||||
<description>Choose one of the following conditions to match emoji annotations partially: 0 == Prefix match, 1 == Suffix match, 2 == Containing match</description>
|
||||
</key>
|
||||
<key name="load-emoji-at-startup" type="b">
|
||||
<default>true</default>
|
||||
<summary>Load the emoji data at the time of startup</summary>
|
||||
<description>Load the emoji data at the time of startup if true. About 10MB memory is needed to load the data. Load the emoji data when open the emoji dialog at the beginning if false.</description>
|
||||
</key>
|
||||
<key name="load-unicode-at-startup" type="b">
|
||||
<default>false</default>
|
||||
<summary>Load the Unicode data at the time of startup</summary>
|
||||
<description>Load the Unicode data at the time of startup if true. About 15MB memory is needed to load the data. Load the Unicode data when open the emoji dialog at the beginning if false. The Unicode data is always loaded after the emoji data is loaded even if true.</description>
|
||||
</key>
|
||||
</schema>
|
||||
</schemalist>
|
||||
Загрузка…
Ссылка в новой задаче