summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Huang <shawn.p.huang@gmail.com>2012-01-17 16:21:56 -0500
committerPeng Huang <shawn.p.huang@gmail.com>2012-01-17 16:21:56 -0500
commit4950900e3acc6cf0741962179e2b2b924964ae4f (patch)
tree1b98cf2c5fbfa628e53edf2d1aff39d889c365e7
parente735ba896377d8959d2a54e8a91ab81891d6d54e (diff)
downloadibus-pinyin-4950900e3acc6cf0741962179e2b2b924964ae4f.tar.gz
ibus-pinyin-setup: Port to gobject-introspection, do not use ibus python library anymore.
BUG=http://code.google.com/p/ibus/issues/detail?id=1381 TEST=manually Review URL: https://codereview.appspot.com/5545053
Diffstat
-rw-r--r--ibus-pinyin.spec.in7
-rw-r--r--setup/ibus-pinyin-preferences.ui359
-rw-r--r--setup/main.py84
3 files changed, 348 insertions, 102 deletions
diff --git a/ibus-pinyin.spec.in b/ibus-pinyin.spec.in
index 4e02b07..ade89f5 100644
--- a/ibus-pinyin.spec.in
+++ b/ibus-pinyin.spec.in
@@ -16,7 +16,6 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: sqlite-devel
BuildRequires: libuuid-devel
-BuildRequires: boost-devel >= 1.39
BuildRequires: ibus-devel >= 1.3
# Requires(post): sqlite
@@ -52,7 +51,11 @@ The phrase database for ibus Pinyin and Bopomofo from android project.
cp %{SOURCE1} data/db/open-phrase
%build
-%configure --disable-static --enable-db-open-phrase
+%configure \
+ --disable-static \
+ --enable-db-open-phrase \
+ --disable-english-input-mode \
+ --disable-lua-extension
# make -C po update-gmo
make %{?_smp_mflags}
diff --git a/setup/ibus-pinyin-preferences.ui b/setup/ibus-pinyin-preferences.ui
index febe032..6388006 100644
--- a/setup/ibus-pinyin-preferences.ui
+++ b/setup/ibus-pinyin-preferences.ui
@@ -1,26 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy project-wide -->
+ <object class="GtkAdjustment" id="LookupTablePageSize">
+ <property name="lower">1</property>
+ <property name="upper">11</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ <property name="page_size">1</property>
+ </object>
<object class="GtkDialog" id="dialog">
<property name="width_request">400</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Preferences</property>
<property name="window_position">center-always</property>
<property name="icon_name">gtk-preferences</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="buttonClose">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkNotebook" id="pages">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tab_vborder">3</property>
<child>
<object class="GtkAlignment" id="pageGeneral">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -28,20 +70,24 @@
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
@@ -50,6 +96,7 @@
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Language:</property>
</object>
@@ -57,6 +104,7 @@
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Half/full width:</property>
</object>
@@ -68,6 +116,7 @@
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Punctuations:</property>
</object>
@@ -82,6 +131,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">InitEnglish</property>
</object>
@@ -96,6 +146,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -110,6 +161,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">InitHalf</property>
</object>
@@ -126,6 +178,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -142,6 +195,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">InitHalfPunct</property>
</object>
@@ -158,6 +212,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -171,6 +226,7 @@
<child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Chinese:</property>
</object>
@@ -185,6 +241,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">InitTraditionalChinese</property>
</object>
@@ -201,6 +258,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -218,6 +276,7 @@
<child type="label">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Initial state&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -232,61 +291,83 @@
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Orientation of candidates:</property>
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="LookupTableOrientation">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreLookupTableOrientation</property>
<property name="button_sensitivity">on</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Number of candidates:</property>
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -294,17 +375,20 @@
<object class="GtkHScale" id="hscaleLookupTablePageSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="update_policy">delayed</property>
<property name="adjustment">LookupTablePageSize</property>
<property name="digits">0</property>
<property name="value_pos">left</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -315,6 +399,7 @@
<child type="label">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;UI&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -333,6 +418,7 @@
<child type="tab">
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">General</property>
</object>
<packing>
@@ -342,6 +428,7 @@
<child>
<object class="GtkAlignment" id="pagePinyinMode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -349,24 +436,29 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
@@ -375,17 +467,20 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">DoublePinyin</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="DoublePinyin">
@@ -393,11 +488,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -405,21 +502,33 @@
<object class="GtkComboBox" id="DoublePinyinSchema">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreDoublePinyin</property>
<property name="button_sensitivity">on</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -429,9 +538,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -441,10 +553,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -455,6 +570,7 @@
<child type="label">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Pinyin mode&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -462,26 +578,31 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -493,6 +614,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
</child>
@@ -502,6 +624,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -516,6 +639,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -530,6 +654,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -541,6 +666,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -551,6 +678,7 @@
<child type="label">
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Input Custom&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -558,22 +686,26 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -584,6 +716,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -598,6 +731,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -612,6 +746,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -626,6 +761,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -642,6 +778,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -658,6 +795,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -674,6 +812,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -689,6 +828,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -702,6 +842,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -720,12 +861,15 @@
<child type="label">
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Correct pinyin&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -739,6 +883,7 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Pinyin mode</property>
</object>
<packing>
@@ -749,6 +894,7 @@
<child>
<object class="GtkAlignment" id="pageBopomofoMode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -756,20 +902,24 @@
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="IncompleteBopomofo">
@@ -777,38 +927,56 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="labelBopomofoKeyboardMapping">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Keyboard Mapping:</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="BopomofoKeyboardMapping">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreBopomofoKeyboardMapping</property>
<property name="button_sensitivity">on</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -819,6 +987,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Bopomofo mode&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -833,42 +1002,60 @@
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="labelSelectionKeys">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Selection Keys:</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="SelectKeys">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreSelectionKeys</property>
<property name="button_sensitivity">on</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -878,10 +1065,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -891,10 +1081,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -904,10 +1097,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -918,6 +1114,7 @@
<child type="label">
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Selection mode&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -932,24 +1129,30 @@
<child>
<object class="GtkFrame" id="frame10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="LabelEnter">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Feature of Enter key:</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -959,11 +1162,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">CommitOriginalText</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -973,9 +1179,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -986,6 +1195,7 @@
<child type="label">
<object class="GtkLabel" id="labelOther">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Other&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -1007,6 +1217,7 @@
<child type="tab">
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Bopomofo mode</property>
</object>
<packing>
@@ -1017,6 +1228,7 @@
<child>
<object class="GtkAlignment" id="pageFuzzy">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -1024,15 +1236,18 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">12</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -1045,6 +1260,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1060,6 +1276,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1075,6 +1292,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1090,6 +1308,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1105,6 +1324,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1120,6 +1340,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1134,6 +1355,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1149,6 +1371,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1164,6 +1387,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1179,6 +1403,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1194,6 +1419,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1210,6 +1436,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1226,6 +1453,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1242,6 +1470,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1258,6 +1487,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1274,6 +1504,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1290,6 +1521,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1306,6 +1538,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1322,6 +1555,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1338,6 +1572,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1353,6 +1588,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1369,6 +1605,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1382,6 +1620,7 @@
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Fuzzy syllable</property>
</object>
<packing>
@@ -1392,6 +1631,7 @@
<child>
<object class="GtkAlignment" id="pageDictionary">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -1399,23 +1639,28 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="SpecialPhrases">
@@ -1423,10 +1668,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1436,6 +1683,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1457,12 +1705,15 @@
<child type="label">
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Dictionary option&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1476,6 +1727,7 @@
<child type="tab">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Dictionary</property>
</object>
<packing>
@@ -1486,6 +1738,7 @@
<child>
<object class="GtkAlignment" id="pageAbout">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
<property name="bottom_padding">12</property>
<property name="left_padding">12</property>
@@ -1493,10 +1746,12 @@
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image1">
@@ -1506,39 +1761,50 @@
<property name="icon_name">gtk-about</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="NameVersion">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;IBus Pinyin %s&lt;/b&gt;&lt;/big&gt;</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Pinyin input method for IBus</property>
<property name="selectable">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;small&gt;Copyright (c) 2009-2010 Peng Huang&lt;/small&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1548,6 +1814,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="uri">http://ibus.googlecode.com</property>
</object>
@@ -1560,6 +1827,7 @@
<child>
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;small&gt;
&lt;b&gt;Authors:&lt;/b&gt;
Peng Huang
@@ -1574,11 +1842,14 @@ koterpilla, Zerng07
<property name="selectable">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
@@ -1593,6 +1864,7 @@ koterpilla, Zerng07
<child type="tab">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">About</property>
</object>
<packing>
@@ -1602,36 +1874,9 @@ koterpilla, Zerng07
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="buttonClose">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="is_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1640,6 +1885,26 @@ koterpilla, Zerng07
<action-widget response="0">buttonClose</action-widget>
</action-widgets>
</object>
+ <object class="GtkListStore" id="liststoreBopomofoKeyboardMapping">
+ <columns>
+ <!-- column-name keyboard_mapping -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Standard</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">GinYieh</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Eten</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">IBM</col>
+ </row>
+ </data>
+ </object>
<object class="GtkListStore" id="liststoreDoublePinyin">
<columns>
<!-- column-name schema -->
@@ -1666,14 +1931,6 @@ koterpilla, Zerng07
</row>
</data>
</object>
- <object class="GtkAdjustment" id="LookupTablePageSize">
- <property name="value">1</property>
- <property name="lower">1</property>
- <property name="upper">11</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- <property name="page_size">1</property>
- </object>
<object class="GtkListStore" id="liststoreLookupTableOrientation">
<columns>
<!-- column-name orientation -->
@@ -1688,26 +1945,6 @@ koterpilla, Zerng07
</row>
</data>
</object>
- <object class="GtkListStore" id="liststoreBopomofoKeyboardMapping">
- <columns>
- <!-- column-name keyboard_mapping -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Standard</col>
- </row>
- <row>
- <col id="0" translatable="yes">GinYieh</col>
- </row>
- <row>
- <col id="0" translatable="yes">Eten</col>
- </row>
- <row>
- <col id="0" translatable="yes">IBM</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="liststoreSelectionKeys">
<columns>
<!-- column-name select_keys -->
diff --git a/setup/main.py b/setup/main.py
index 0e3a729..3d97645 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -19,34 +19,39 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-import sys
-import gtk
-import ibus
+
+import gettext
import locale
import os
-import version
-import gettext
+import sys
+
+from gi.repository import GLib
+from gi.repository import Gtk
+from gi.repository import IBus
from xdg import BaseDirectory
+import version
+
_ = lambda a : gettext.dgettext("ibus-pinyin", a)
class PreferencesDialog:
- def __init__(self,engine):
+ def __init__(self, engine):
locale.setlocale(locale.LC_ALL, "")
localedir = os.getenv("IBUS_LOCALEDIR")
gettext.bindtextdomain("ibus-pinyin", localedir)
gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
- self.__bus = ibus.Bus()
+ self.__bus = IBus.Bus()
self.__config = self.__bus.get_config()
- self.__builder = gtk.Builder()
+ self.__builder = Gtk.Builder()
self.__builder.set_translation_domain("ibus-pinyin")
self.__builder.add_from_file("ibus-pinyin-preferences.ui")
self.__dialog = self.__builder.get_object("dialog")
self.__init_pages()
-
+
if engine == "pinyin":
self.__config_namespace = "engine/Pinyin"
+ self.__values = dict(self.__config.get_values(self.__config_namespace))
self.__init_general()
self.__init_pinyin()
self.__init_fuzzy()
@@ -54,17 +59,17 @@ class PreferencesDialog:
self.__init_about()
elif engine == "bopomofo":
self.__config_namespace = "engine/Bopomofo"
+ self.__values = dict(self.__config.get_values(self.__config_namespace))
self.__init_general()
self.__init_bopomofo()
self.__init_fuzzy()
self.__init_dictionary()
self.__init_about()
self.__convert_fuzzy_pinyin_to_bopomofo()
-
else:
print("Error: Unknown Engine")
exit()
-
+
self.__pages.set_current_page(0)
def __init_pages(self):
@@ -75,7 +80,7 @@ class PreferencesDialog:
self.__page_fuzzy = self.__builder.get_object("pageFuzzy")
self.__page_dictionary = self.__builder.get_object("pageDictionary")
self.__page_about = self.__builder.get_object("pageAbout")
-
+
self.__page_general.hide()
self.__page_pinyin_mode.hide()
self.__page_bopomofo_mode.hide()
@@ -86,7 +91,7 @@ class PreferencesDialog:
def __init_general(self):
# page General
self.__page_general.show()
-
+
# init state
self.__init_chinese = self.__builder.get_object("InitChinese")
self.__init_english = self.__builder.get_object("InitEnglish")
@@ -96,13 +101,10 @@ class PreferencesDialog:
self.__init_half_punct = self.__builder.get_object("InitHalfPunct")
self.__init_simp = self.__builder.get_object("InitSimplifiedChinese")
self.__init_trad = self.__builder.get_object("IniTraditionalChinese")
-
+
# UI
self.__lookup_table_page_size = self.__builder.get_object("LookupTablePageSize")
self.__lookup_table_orientation = self.__builder.get_object("LookupTableOrientation")
- renderer = gtk.CellRendererText()
- self.__lookup_table_orientation.pack_start(renderer)
- self.__lookup_table_orientation.set_attributes(renderer, text=0)
# read values
self.__init_chinese.set_active(self.__get_value("InitChinese", True))
@@ -130,7 +132,7 @@ class PreferencesDialog:
def __init_pinyin(self):
# page
self.__page_pinyin_mode.show()
-
+
# pinyin
self.__full_pinyin = self.__builder.get_object("FullPinyin")
self.__incomplete_pinyin = self.__builder.get_object("IncompletePinyin")
@@ -139,10 +141,6 @@ class PreferencesDialog:
# self.__double_pinyin_schema_label = self.__builder.get_object("labelDoublePinyinSchema")
self.__double_pinyin_show_raw = self.__builder.get_object("DoublePinyinShowRaw")
- renderer = gtk.CellRendererText()
- self.__double_pinyin_schema.pack_start(renderer)
- self.__double_pinyin_schema.set_attributes(renderer, text=0)
-
# read value
self.__incomplete_pinyin.set_active(self.__get_value("IncompletePinyin", True))
self.__full_pinyin.set_active(not self.__get_value("DoublePinyin", False))
@@ -173,25 +171,20 @@ class PreferencesDialog:
self.__incomplete_pinyin.connect("toggled", self.__toggled_cb, "IncompletePinyin")
self.__double_pinyin_schema.connect("changed", __double_pinyin_schema_changed_cb)
self.__double_pinyin_show_raw.connect("toggled", self.__toggled_cb, "DoublePinyinShowRaw")
-
+
self.__init_input_custom()
self.__init_correct_pinyin()
-
+
def __init_bopomofo(self):
# page Bopomodo Mode
self.__page_bopomofo_mode.show()
-
+
# bopomofo mode
self.__incomplete_bopomofo = self.__builder.get_object("IncompleteBopomofo")
self.__bopomofo_keyboard_mapping = self.__builder.get_object("BopomofoKeyboardMapping")
- renderer = gtk.CellRendererText()
- self.__bopomofo_keyboard_mapping.pack_start(renderer)
- self.__bopomofo_keyboard_mapping.set_attributes(renderer, text=0)
-
+
# selection mode
self.__select_keys = self.__builder.get_object("SelectKeys")
- self.__select_keys.pack_start(renderer)
- self.__select_keys.set_attributes(renderer, text=0)
self.__guide_key = self.__builder.get_object("GuideKey")
self.__auxiliary_select_key_f = self.__builder.get_object("AuxiliarySelectKey_F")
self.__auxiliary_select_key_kp = self.__builder.get_object("AuxiliarySelectKey_KP")
@@ -213,7 +206,7 @@ class PreferencesDialog:
self.__set_value("BopomofoKeyboardMapping", widget.get_active())
def __select_keys_changed_cb(widget):
self.__set_value("SelectKeys", widget.get_active())
-
+
self.__bopomofo_keyboard_mapping.connect("changed", __bopomofo_keyboard_mapping_changed_cb)
self.__incomplete_bopomofo.connect("toggled", self.__toggled_cb, "IncompletePinyin")
self.__select_keys.connect("changed", __select_keys_changed_cb)
@@ -275,7 +268,7 @@ class PreferencesDialog:
def __init_fuzzy(self):
# page Fuzzy
self.__page_fuzzy.show()
-
+
# fuzzy pinyin
self.__fuzzy_pinyin = self.__builder.get_object("FuzzyPinyin")
self.__fuzzy_pinyin_widgets = [
@@ -357,7 +350,7 @@ class PreferencesDialog:
def __init_dictionary(self):
# page Dictionary
self.__page_dictionary.show()
-
+
# dictionary
self.__special_phrases = self.__builder.get_object("SpecialPhrases")
self.__edit_special_phrases = self.__builder.get_object("EditSpecialPhrases")
@@ -384,7 +377,7 @@ class PreferencesDialog:
def __init_about(self):
# page About
self.__page_about.show()
-
+
self.__name_version = self.__builder.get_object("NameVersion")
self.__name_version.set_markup(_("<big><b>IBus Pinyin %s</b></big>") % version.get_version())
@@ -395,14 +388,27 @@ class PreferencesDialog:
self.__set_value(name, widget.get_active ())
def __get_value(self, name, defval):
- value = self.__config.get_value(self.__config_namespace, name, "test_default_value_9898")
- if value != "test_default_value_9898":
- return value
+ if name in self.__values:
+ var = self.__values[name]
+ if isinstance(defval, type(var)):
+ return var
self.__set_value(name, defval)
return defval
def __set_value(self, name, val):
- self.__config.set_value(self.__config_namespace, name, val)
+ var = None
+ if isinstance(val, bool):
+ var = GLib.Variant.new_boolean(val)
+ elif isinstance(val, int):
+ var = GLib.Variant.new_int32(val)
+ elif isinstance(val, str):
+ var = GLib.Variant.new_string(val)
+ else:
+ print >> sys.stderr, "val(%s) is not in support type." % repr(val)
+ return
+
+ self.__values[name] = val
+ self.__config.set_value(self.__config_namespace, name, var)
def run(self):
return self.__dialog.run()
View Lorry Controller Status