diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2009-09-25 10:34:01 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2009-09-25 10:34:01 +0800 |
| commit | 6bc7522f638b1d7f80d7c2706a62369a578505a1 (patch) | |
| tree | 42555a8bded3ac778b96da7d8c0ff199328a149b /setup | |
| parent | 15cd217742d7c773867e067eed8d6de8af4af297 (diff) | |
| download | ibus-libpinyin-6bc7522f638b1d7f80d7c2706a62369a578505a1.tar.gz ibus-libpinyin-6bc7522f638b1d7f80d7c2706a62369a578505a1.tar.xz ibus-libpinyin-6bc7522f638b1d7f80d7c2706a62369a578505a1.zip | |
Use HScale widget for page size
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/ibus-pinyin-preferences.glade | 68 | ||||
| -rw-r--r-- | setup/main.py | 11 |
2 files changed, 24 insertions, 55 deletions
diff --git a/setup/ibus-pinyin-preferences.glade b/setup/ibus-pinyin-preferences.glade index 9bcd645..721d0c6 100644 --- a/setup/ibus-pinyin-preferences.glade +++ b/setup/ibus-pinyin-preferences.glade @@ -356,7 +356,6 @@ <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> - <property name="homogeneous">True</property> <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> @@ -369,16 +368,6 @@ </packing> </child> <child> - <object class="GtkComboBox" id="LookupTablePageSize"> - <property name="visible">True</property> - <property name="model">liststorePageSize</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="ShiftSelectCandidate"> <property name="label" translatable="yes">Press [Shift] key to select candidate</property> <property name="visible">True</property> @@ -438,6 +427,19 @@ <property name="bottom_attach">5</property> </packing> </child> + <child> + <object class="GtkHScale" id="hscaleLookupTablePageSize"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">LookupTablePageSize</property> + <property name="digits">0</property> + <property name="value_pos">left</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> </object> </child> </object> @@ -1282,42 +1284,12 @@ </row> </data> </object> - <object class="GtkListStore" id="liststorePageSize"> - <columns> - <!-- column-name pageSize --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">1</col> - </row> - <row> - <col id="0" translatable="yes">2</col> - </row> - <row> - <col id="0" translatable="yes">3</col> - </row> - <row> - <col id="0" translatable="yes">4</col> - </row> - <row> - <col id="0" translatable="yes">5</col> - </row> - <row> - <col id="0" translatable="yes">6</col> - </row> - <row> - <col id="0" translatable="yes">7</col> - </row> - <row> - <col id="0" translatable="yes">8</col> - </row> - <row> - <col id="0" translatable="yes">9</col> - </row> - <row> - <col id="0" translatable="yes">10</col> - </row> - </data> + <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> </interface> diff --git a/setup/main.py b/setup/main.py index 324da6f..5629aaf 100644 --- a/setup/main.py +++ b/setup/main.py @@ -95,9 +95,6 @@ class PreferencesDialog: def __init_others(self): #others self.__lookup_table_page_size = self.__builder.get_object("LookupTablePageSize") - renderer = gtk.CellRendererText() - self.__lookup_table_page_size.pack_start(renderer) - self.__lookup_table_page_size.set_attributes(renderer, text=0) self.__shift_select_candidate = self.__builder.get_object("ShiftSelectCandidate") self.__minus_equal_page = self.__builder.get_object("MinusEqualPage") @@ -106,20 +103,20 @@ class PreferencesDialog: self.__half_width_puncts = self.__builder.get_object("HalfWidthPuncts") # read values - self.__lookup_table_page_size.set_active(self.__get_value("LookupTablePageSize", 5) - 1) + self.__lookup_table_page_size.set_value(self.__get_value("LookupTablePageSize", 5)) self.__shift_select_candidate.set_active(self.__get_value("ShiftSelectCandidate", False)) self.__minus_equal_page.set_active(self.__get_value("MinusEqualPage", True)) self.__comma_period_page.set_active(self.__get_value("CommaPeriodPage", True)) self.__half_width_puncts.set_text(self.__get_value("HalfWidthPuncts", "+-*/=%")) # connect signals - def __lookup_table_page_size_changed_cb(widget): - self.__set_value("LookupTablePageSize", widget.get_active() + 1) + def __lookup_table_page_size_changed_cb(adjustment): + self.__set_value("LookupTablePageSize", int(adjustment.get_value())) self.__shift_select_candidate.connect("toggled", self.__toggled_cb, "ShiftSelectCandidate") self.__minus_equal_page.connect("toggled", self.__toggled_cb, "MinusEqualPage") self.__comma_period_page.connect("toggled", self.__toggled_cb, "CommaPeriodPage") - self.__lookup_table_page_size.connect("changed", __lookup_table_page_size_changed_cb) + self.__lookup_table_page_size.connect("value-changed", __lookup_table_page_size_changed_cb) def __entry_activate_cb(widget, name): text = widget.get_text() |