Commit 06bb4afd authored by ChangZhuo Chen's avatar ChangZhuo Chen

New upstream version 1.10.0

parent dcca3dde
version 1.10.0
* bug fixes
version 1.9.91
* migrate to use GSettings
* fixes lyx short cut issue
version 1.9.3
* translate input method name in ibus menu
version 1.9.2
* fixes pinyin and bopomofo config
......
......@@ -21,8 +21,8 @@
# if not 1, append datestamp to the version number.
m4_define([ibus_released], [1])
m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [9])
m4_define([ibus_micro_version], [2])
m4_define([ibus_minor_version], [10])
m4_define([ibus_micro_version], [0])
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
......@@ -150,6 +150,11 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
AM_GLIB_GNU_GETTEXT
# Checks for GSettings.
PKG_CHECK_MODULES(GIO2, [gio-2.0 >= 2.26.0])
GLIB_GSETTINGS
# --disable-lua-extension
AC_ARG_ENABLE(lua-extension,
AS_HELP_STRING([--disable-lua-extension],
......
......@@ -28,6 +28,10 @@ STROKES_DB = strokes.db
APPDATA_XML = libpinyin.appdata.xml
gsettings_SCHEMAS = com.github.libpinyin.ibus-libpinyin.gschema.xml
@GSETTINGS_RULES@
SUBDIRS = \
icons \
$(NULL)
......@@ -79,6 +83,7 @@ EXTRA_DIST = \
$(STROKES) \
$(STROKES_AWK) \
$(APPDATA_XML) \
$(gsettings_SCHEMAS) \
$(NULL)
CLEANFILES = \
......
This diff is collapsed.
......@@ -14,6 +14,7 @@ src/PYSimpTradConverter.cc
src/PYEnglishEditor.cc
src/PYStrokeEditor.cc
setup/main2.py
setup/config.py
setup/dicttreeview.py
setup/keyboardshortcut.py
setup/shortcuteditor.py
......
......@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2015-09-24 09:36-0400\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Catalan\n"
......@@ -134,6 +134,11 @@ msgstr "Si us plau, deseu un fitxer"
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>Pinyin intel·ligent %s</b></big>"
#: ../setup/config.py:30
#, fuzzy
msgid "Intelligent Pinyin"
msgstr "Pinyin intel·ligent (depuració)"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr "Art"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2012-03-19 22:13+0100\n"
"Last-Translator: Ma Jiehong <ma.jiehong@gmail.com>\n"
"Language-Team: French\n"
......@@ -150,6 +150,11 @@ msgstr ""
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>Ibus Pinyin %s</b></big>"
#: ../setup/config.py:30
#, fuzzy
msgid "Intelligent Pinyin"
msgstr "Pinyin (débug)"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-10-14 09:44+0300\n"
"Last-Translator: Alexey Kotlyarov <koterpillar@gmail.com>\n"
"Language-Team: Russian\n"
......@@ -151,6 +151,11 @@ msgstr ""
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus Пиньинь %s</b></big>"
#: ../setup/config.py:30
#, fuzzy
msgid "Intelligent Pinyin"
msgstr "Пиньинь"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.2.99\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"PO-Revision-Date: 2017-08-24 14:03+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2018-01-04 16:53+0800\n"
"Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
"Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
"Language: \n"
......@@ -136,6 +136,10 @@ msgstr "请保存文件"
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 智能拼音 %s</b></big>"
#: ../setup/config.py:30
msgid "Intelligent Pinyin"
msgstr "智能拼音"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr "艺术"
......
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.3.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-09-20 16:05+8\n"
"Last-Translator: BYVoid <byvoid1@gmail.com>\n"
"Language-Team: BYVoid <byvoid1@gmail.com>\n"
......@@ -143,6 +143,11 @@ msgstr ""
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 拼音 %s</b></big>"
#: ../setup/config.py:30
#, fuzzy
msgid "Intelligent Pinyin"
msgstr "拼音(調試)"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
......
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.3.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-24 14:01+0800\n"
"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-09-20 16:05+8\n"
"Last-Translator: BYVoid <byvoid1@gmail.com>\n"
"Language-Team: BYVoid <byvoid1@gmail.com>\n"
......@@ -143,6 +143,11 @@ msgstr ""
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 拼音 %s</b></big>"
#: ../setup/config.py:30
#, fuzzy
msgid "Intelligent Pinyin"
msgstr "拼音(調試)"
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
......
......@@ -19,6 +19,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import gettext
gettext.install("ibus-libpinyin")
def get_version():
return "@VERSION@"
def get_longname():
return _("Intelligent Pinyin")
This diff is collapsed.
......@@ -43,10 +43,10 @@ COLUMN_ACCELERATOR,
# The default shortcut value is stored here.
accelerators = \
(
(_("Switch Chinese/English"), "main_switch" , "<Shift>"),
(_("Full/Half Width Letter"), "letter_switch", ""),
(_("Full/Half Width Punct"), "punct_switch", "<Control>period"),
(_("Switch Traditional/Simplfied Chinese"), "trad_switch", "<Control><Shift>f")
(_("Switch Chinese/English"), "main-switch" , "<Shift>"),
(_("Full/Half Width Letter"), "letter-switch", ""),
(_("Full/Half Width Punct"), "punct-switch", "<Control>period"),
(_("Switch Traditional/Simplfied Chinese"), "trad-switch", "<Control><Shift>f")
)
class ShortcutTreeView(Gtk.TreeView):
......@@ -211,12 +211,12 @@ class ShortcutEditor(Gtk.Box):
def emit_shortcut_changed(self, key, value):
self.emit("shortcut-changed", key, value)
def update_shortcuts(self, values):
def update_shortcuts(self, config):
for label, keyname, defvalue in accelerators:
value = values[keyname] if keyname in values else defvalue
value = config.get_value(keyname).get_string()
self.__shortcut_treeview.set_shortcut_value(keyname, value)
# store the default value
self.emit_shortcut_changed(keyname, value)
# self.emit_shortcut_changed(keyname, value)
class ShortcutEditorDialog(Gtk.Dialog):
def __init__(self, title = None, transient_for = None, flags = 0):
......
......@@ -169,10 +169,6 @@ BUILT_SOURCES = \
$(ibus_engine_built_h_sources) \
$(NULL)
pkgdata_DATA = \
phrases.txt \
$(NULL)
component_DATA = \
libpinyin.xml \
$(NULL)
......@@ -180,7 +176,6 @@ componentdir = @datadir@/ibus/component
EXTRA_DIST = \
libpinyin.xml.in \
phrases.txt \
$(NULL)
CLEANFILES = \
......
......@@ -26,15 +26,11 @@
namespace PY {
Config::Config (Bus & bus, const std::string & name)
: Object (ibus_bus_get_config (bus)),
m_section ("engine/" + name)
Config::Config (const std::string & name)
: m_schema_id (name)
{
m_settings = NULL;
initDefaultValues ();
g_signal_connect (get<IBusConfig> (),
"value-changed",
G_CALLBACK (valueChangedCallback),
this);
}
Config::~Config (void)
......@@ -47,7 +43,7 @@ Config::initDefaultValues (void)
m_orientation = IBUS_ORIENTATION_HORIZONTAL;
m_page_size = 5;
m_remember_every_input = FALSE;
m_sort_option = SORT_BY_PHRASE_LENGTH_AND_FREQUENCY;
m_sort_option = SORT_BY_PHRASE_LENGTH_AND_PINYIN_LENGTH_AND_FREQUENCY;
m_shift_select_candidate = FALSE;
m_minus_equal_page = TRUE;
......@@ -56,13 +52,11 @@ Config::initDefaultValues (void)
m_double_pinyin = FALSE;
m_double_pinyin_schema = DOUBLE_PINYIN_DEFAULT;
m_double_pinyin_show_raw = FALSE;
m_init_chinese = TRUE;
m_init_full = FALSE;
m_init_full_punct = TRUE;
m_init_simp_chinese = TRUE;
m_special_phrases = TRUE;
m_dictionaries = "";
......@@ -78,59 +72,50 @@ Config::readDefaultValues (void)
{
}
inline bool
bool
Config::read (const gchar * name,
bool defval)
{
GVariant *value = NULL;
if ((value = ibus_config_get_value (get<IBusConfig> (), m_section.c_str (), name)) != NULL) {
if ((value = g_settings_get_value (m_settings, name)) != NULL) {
if (g_variant_classify (value) == G_VARIANT_CLASS_BOOLEAN)
return g_variant_get_boolean (value);
}
// write default value to config
value = g_variant_new ("b", defval);
ibus_config_set_value (get<IBusConfig> (), m_section.c_str (), name, value);
g_warn_if_reached ();
return defval;
}
inline gint
gint
Config::read (const gchar * name,
gint defval)
{
GVariant *value = NULL;
if ((value = ibus_config_get_value (get<IBusConfig> (), m_section.c_str (), name)) != NULL) {
if ((value = g_settings_get_value (m_settings, name)) != NULL) {
if (g_variant_classify (value) == G_VARIANT_CLASS_INT32)
return g_variant_get_int32 (value);
}
// write default value to config
value = g_variant_new ("i", defval);
ibus_config_set_value (get<IBusConfig> (), m_section.c_str (), name, value);
g_warn_if_reached ();
return defval;
}
inline std::string
std::string
Config::read (const gchar * name,
const gchar * defval)
{
GVariant *value = NULL;
if ((value = ibus_config_get_value (get<IBusConfig> (), m_section.c_str (), name)) != NULL) {
if ((value = g_settings_get_value (m_settings, name)) != NULL) {
if (g_variant_classify (value) == G_VARIANT_CLASS_STRING)
return g_variant_get_string (value, NULL);
}
// write default value to config
value = g_variant_new ("s", defval);
ibus_config_set_value (get<IBusConfig> (), m_section.c_str (), name, value);
g_warn_if_reached ();
return defval;
}
gboolean
Config::valueChanged (const std::string &section,
Config::valueChanged (const std::string &schema_id,
const std::string &name,
GVariant *value)
{
......@@ -138,13 +123,18 @@ Config::valueChanged (const std::string &section,
}
void
Config::valueChangedCallback (IBusConfig *config,
const gchar *section,
Config::valueChangedCallback (GSettings *settings,
const gchar *name,
GVariant *value,
Config *self)
{
self->valueChanged (section, name, value);
gchar * property = NULL;
g_object_get (settings, "schema-id", &property, NULL);
std::string schema_id (property);
g_free (property);
GVariant * value = g_settings_get_value (settings, name);
self->valueChanged (schema_id, name, value);
g_variant_unref (value);
}
};
......@@ -26,6 +26,7 @@
#endif
#include <string>
#include <gio/gio.h>
#include <ibus.h>
#include <pinyin.h>
#include "PYUtil.h"
......@@ -33,11 +34,9 @@
namespace PY {
class Bus;
class Config : public Object {
class Config {
protected:
Config (Bus & bus, const std::string & name);
Config (const std::string & name);
virtual ~Config (void);
public:
......@@ -53,12 +52,10 @@ public:
gboolean autoCommit (void) const { return m_auto_commit; }
gboolean doublePinyin (void) const { return m_double_pinyin; }
DoublePinyinScheme doublePinyinSchema (void) const { return m_double_pinyin_schema; }
gboolean doublePinyinShowRaw (void) const { return m_double_pinyin_show_raw; }
gboolean initChinese (void) const { return m_init_chinese; }
gboolean initFull (void) const { return m_init_full; }
gboolean initFullPunct (void) const { return m_init_full_punct; }
gboolean initSimpChinese (void) const { return m_init_simp_chinese; }
gboolean specialPhrases (void) const { return m_special_phrases; }
ZhuyinScheme bopomofoKeyboardMapping (void) const { return m_bopomofo_keyboard_mapping; }
gint selectKeys (void) const { return m_select_keys; }
gboolean guideKey (void) const { return m_guide_key; }
......@@ -78,18 +75,17 @@ protected:
void initDefaultValues (void);
virtual void readDefaultValues (void);
virtual gboolean valueChanged (const std::string &section,
virtual gboolean valueChanged (const std::string &schema_id,
const std::string &name,
GVariant *value);
private:
static void valueChangedCallback (IBusConfig *config,
const gchar *section,
static void valueChangedCallback (GSettings *settings,
const gchar *name,
GVariant *value,
Config *self);
protected:
std::string m_section;
GSettings *m_settings;
std::string m_schema_id;
std::string m_dictionaries;
pinyin_option_t m_option;
pinyin_option_t m_option_mask;
......@@ -106,13 +102,11 @@ protected:
gboolean m_double_pinyin;
DoublePinyinScheme m_double_pinyin_schema;
gboolean m_double_pinyin_show_raw;
gboolean m_init_chinese;
gboolean m_init_full;
gboolean m_init_full_punct;
gboolean m_init_simp_chinese;
gboolean m_special_phrases;
ZhuyinScheme m_bopomofo_keyboard_mapping;
gint m_select_keys;
......@@ -133,24 +127,33 @@ protected:
static inline bool
normalizeGVariant (GVariant *value, bool defval)
{
if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_BOOLEAN)
if (value == NULL ||
g_variant_classify (value) != G_VARIANT_CLASS_BOOLEAN) {
g_warn_if_reached ();
return defval;
}
return g_variant_get_boolean (value);
}
static inline gint
normalizeGVariant (GVariant *value, gint defval)
{
if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_INT32)
if (value == NULL ||
g_variant_classify (value) != G_VARIANT_CLASS_INT32) {
g_warn_if_reached ();
return defval;
}
return g_variant_get_int32 (value);
}
static inline std::string
normalizeGVariant (GVariant *value, const std::string &defval)
{
if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_STRING)
if (value == NULL ||
g_variant_classify (value) != G_VARIANT_CLASS_STRING) {
g_warn_if_reached ();
return defval;
}
return g_variant_get_string (value, NULL);
}
......
......@@ -24,8 +24,7 @@
namespace PY {
Editor::Editor (PinyinProperties & props, Config & config)
: m_text (128),
m_cursor (0),
: m_cursor (0),
m_props (props),
m_config (config)
{
......
......@@ -418,11 +418,11 @@ EnglishEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
/* Remember the input string. */
if (m_cursor == 0) {
g_return_val_if_fail ('v' == keyval, FALSE);
m_text = "v";
g_return_val_if_fail ('v' == keyval || 'V' == keyval, FALSE);
m_text.insert (m_cursor, keyval);
m_cursor ++;
} else {
g_return_val_if_fail ('v' == m_text[0], FALSE);
g_return_val_if_fail ('v' == m_text[0] || 'V' == m_text[0], FALSE);
if ((keyval >= 'a' && keyval <= 'z') ||
(keyval >= 'A' && keyval <= 'Z')) {
m_text.insert (m_cursor, keyval);
......@@ -596,14 +596,15 @@ EnglishEditor::updateStateFromInput (void)
return FALSE;
}
if ('v' != m_text[0]) {
if ('v' != m_text[0] && 'V' != m_text[0]) {
g_warning ("v is expected in m_text string.\n");
m_auxiliary_text = "";
clearLookupTable ();
return FALSE;
}
m_auxiliary_text = "v";
m_auxiliary_text = m_text[0];
if (1 == m_text.length ()) {
clearLookupTable ();
......
......@@ -87,8 +87,8 @@ private:
LabelMode m_mode;
Pointer<IBusEnginePlugin> m_lua_plugin;
std::string m_preedit_text;
std::string m_auxiliary_text;
String m_preedit_text;
String m_auxiliary_text;
LookupTable m_lookup_table;
......
......@@ -79,7 +79,7 @@ FallbackEditor::processPunctForSimplifiedChinese (guint keyval, guint keycode, g
commit (","); return TRUE;
case '.':
if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
commit (keyval);
return FALSE;
else
commit ("。");
return TRUE;
......@@ -147,7 +147,7 @@ FallbackEditor::processPunctForTraditionalChinese (guint keyval, guint keycode,
commit (","); return TRUE;
case '.':
if (m_prev_committed_char >= '0' && m_prev_committed_char <= '9')
commit (keyval);
return FALSE;
else
commit ("。");
return TRUE;
......@@ -175,7 +175,7 @@ FallbackEditor::processPunct (guint keyval, guint keycode, guint modifiers)
if (G_UNLIKELY (m_props.modeFull ()))
commit (HalfFullConverter::toFull (keyval));
else
commit (keyval);
return FALSE;
return TRUE;
}
else {
......@@ -190,7 +190,10 @@ FallbackEditor::processPunct (guint keyval, guint keycode, guint modifiers)
return TRUE;
}
}
commit (m_props.modeFull () ? HalfFullConverter::toFull (keyval) : keyval);
if (m_props.modeFull ())
commit (HalfFullConverter::toFull (keyval));
else
return FALSE;
}
return TRUE;
}
......@@ -215,7 +218,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
case IBUS_a ... IBUS_z:
case IBUS_A ... IBUS_Z:
if (modifiers == 0) {
commit (m_props.modeFull () ? HalfFullConverter::toFull (keyval) : keyval);
if (!m_props.modeFull ())
return FALSE;
commit (HalfFullConverter::toFull (keyval));
retval = TRUE;
}
break;
......@@ -254,7 +260,10 @@ FallbackEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
keyval = IBUS_space;
case IBUS_space:
if (modifiers == 0) {
commit (m_props.modeFull () ? " " : " ");
if (!m_props.modeFull ())
return FALSE;
commit (" ");
retval = TRUE;
}
break;
......
......@@ -89,8 +89,8 @@ start_component (void)
LibPinyinBackEnd::init ();
PinyinConfig::init (bus);
BopomofoConfig::init (bus);
PinyinConfig::init ();
BopomofoConfig::init ();
g_signal_connect ((IBusBus *)bus, "disconnected", G_CALLBACK (ibus_disconnected_cb), NULL);
......
......@@ -79,7 +79,7 @@ BopomofoEditor::insert (gint ch)
gboolean
BopomofoEditor::processGuideKey (guint keyval, guint keycode,
guint modifiers)
guint modifiers)
{
if (!m_config.guideKey ())
return FALSE;
......@@ -166,7 +166,7 @@ BopomofoEditor::processSelectKey (guint keyval, guint keycode,
gboolean
BopomofoEditor::processBopomofo (guint keyval, guint keycode,
guint modifiers)
guint modifiers)
{
if (G_UNLIKELY (cmshm_filter (modifiers) != 0))
return m_text ? TRUE : FALSE;
......@@ -211,6 +211,20 @@ BopomofoEditor::processKeyEvent (guint keyval, guint keycode,
m_select_mode = TRUE;
return processSpace (keyval, keycode, modifiers);
case IBUS_Return:
case IBUS_KP_Enter:
/* no user input */
if (m_text.empty ())
return FALSE;
if (m_config.enterKey ())
commit ();
else
PhoneticEditor::commit (m_text.c_str ());
reset ();
return TRUE;
case IBUS_Up: case IBUS_KP_Up:
case IBUS_Down: case IBUS_KP_Down:
case IBUS_Page_Up: case IBUS_KP_Page_Up:
......@@ -237,6 +251,38 @@ BopomofoEditor::processKeyEvent (guint keyval, guint keycode,
return FALSE;
}
void
BopomofoEditor::updateLookupTableLabel (void)
{
String labels = bopomofo_select_keys[m_config.selectKeys ()];
size_t len = MIN (labels.length (), m_config.pageSize ());
for (size_t i = 0; i < len; ++i) {
String label = (gchar) labels[i];
Text text (label);
m_lookup_table.setLabel (i, text);
}
}
void
BopomofoEditor::updateLookupTable (void)
{
if (!m_select_mode) {
hideLookupTable ();
return;
}
m_lookup_table.clear ();
fillLookupTable ();
updateLookupTableLabel ();
if (m_lookup_table.size()) {
Editor::updateLookupTable (m_lookup_table, TRUE);
} else {
hideLookupTable ();
}
}
void
BopomofoEditor::updatePinyin (void)
{
......
......@@ -46,6 +46,8 @@ protected:
gboolean processBopomofo (guint keyval, guint keycode, guint modifiers);
gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers);
void updateLookupTableLabel ();
virtual void updateLookupTable ();
virtual void updatePreeditText ();
virtual void updateAuxiliaryText ();
......
......@@ -88,7 +88,7 @@ BopomofoEngine::processAccelKeyEvent (guint keyval, guint keycode,
if (!m_editors[MODE_INIT]->text ().empty ())
m_editors[MODE_INIT]->reset ();
m_props.toggleModeChinese ();
return TRUE;
return FALSE;
}
if (m_input_mode == MODE_INIT &&
......
This diff is collapsed.
......@@ -34,11 +34,9 @@
namespace PY {
class Bus;
class LibPinyinConfig : public Config {
protected:
LibPinyinConfig (Bus & bus, const std::string & name);
LibPinyinConfig (const std::string & name);
virtual ~LibPinyinConfig (void);
public:
......@@ -47,14 +45,12 @@ protected:
void initDefaultValues (void);
virtual void readDefaultValues (void);
virtual gboolean valueChanged (const std::string &section,
virtual gboolean valueChanged (const std::string &schema_id,
const std::string &name,
GVariant *value);
private:
static void valueChangedCallback (IBusConfig *config,
const gchar *section,
static void valueChangedCallback (GSettings *settings,
const gchar *name,
GVariant *value,