From 095e8232b871738ff2d22f33e70c4b1199ea6b4f Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Wed, 30 May 2012 07:42:51 -0400 Subject: [PATCH] Update setup ui file to gtk 3.0 and remove a debug print. BUG=None TEST=Manually Review URL: https://codereview.appspot.com/6244057 --- setup/enginecombobox.py | 1 - setup/setup.ui | 191 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 161 insertions(+), 31 deletions(-) diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py index 0ac7368..f80b164 100644 --- a/setup/enginecombobox.py +++ b/setup/enginecombobox.py @@ -65,7 +65,6 @@ class EngineComboBox(Gtk.ComboBox): self.__model.set(iter1, 0, 0) langs = {} for e in engines: - print e.get_language() l = IBus.get_language_name(e.get_language()) if l == None: l = "" diff --git a/setup/setup.ui b/setup/setup.ui index e37cb32..8121d62 100644 --- a/setup/setup.ui +++ b/setup/setup.ui @@ -1,7 +1,6 @@ - + - - + @@ -16,47 +15,48 @@ - + - + - Embedded in menu + Top left corner - When active + Top right corner - Always + Bottom left corner + + + Bottom right corner + + + Custom - + - + - Top left corner - - - Top right corner - - - Bottom left corner + Embedded in menu - Bottom right corner + When active - Custom + Always + False 12 IBus Preferences False @@ -65,7 +65,7 @@ True - vertical + False 12 @@ -74,6 +74,7 @@ True + False 12 12 12 @@ -81,21 +82,24 @@ True - vertical + False 18 True + False 0 none True + False 6 12 True + False 5 2 12 @@ -103,6 +107,7 @@ True + False The shortcut keys for switching to next input method in the list 0 Next input method: @@ -118,6 +123,7 @@ True False + False The shortcut keys for switching to previous input method in the list 0 Previous input method: @@ -132,6 +138,7 @@ True + False 6 @@ -140,19 +147,24 @@ False + True + True 0 ... + False True True False + False True False + True 1 @@ -165,6 +177,7 @@ True + False 6 @@ -173,19 +186,24 @@ False + True + True 0 ... + False True True False + False True False + True 1 @@ -200,6 +218,7 @@ True + False 6 @@ -209,20 +228,25 @@ False + True + True 0 ... + False True False True False + False True False + True 1 @@ -237,6 +261,7 @@ True + False The shortcut keys for turning input method on or off 0 Enable or disable: @@ -249,6 +274,7 @@ True + False 0 Enable: @@ -262,6 +288,7 @@ True + False 6 @@ -270,19 +297,24 @@ False + True + True 0 ... + False True True True + False True False + True 1 @@ -297,6 +329,7 @@ True + False 0 Disable: @@ -310,6 +343,7 @@ True + False 6 @@ -318,19 +352,24 @@ False + True + True 0 ... + False True True True + False True False + True 1 @@ -349,6 +388,7 @@ True + False <b>Keyboard Shortcuts</b> True @@ -356,22 +396,26 @@ False + True 0 True + False 0 none True + False 6 12 True + False 7 2 12 @@ -379,6 +423,7 @@ True + False Set the orientation of candidates in lookup table 0 Candidates orientation: @@ -391,6 +436,7 @@ True + False model_candidates_orientation @@ -407,6 +453,7 @@ True + False Set the behavior of ibus how to show or hide language bar 0 Show language panel: @@ -420,6 +467,7 @@ + False True 0 Language panel position: @@ -434,6 +482,7 @@ True + False model_panel_show_mode @@ -451,6 +500,7 @@ + False True model_panel_position @@ -470,10 +520,13 @@ Show icon on system tray + False True True False Show icon on system tray + False + 0 True @@ -486,10 +539,13 @@ Show input method name on language bar + False True True False Show input method's name on language bar when check the checkbox + False + 0 True @@ -502,10 +558,13 @@ Embed preedit text in application window + False True True False Embed the preedit text of input method in the application window + False + 0 True @@ -518,10 +577,13 @@ Use custom font: + False True True False + False True + 0 True @@ -532,9 +594,11 @@ + False True True True + False 1 @@ -550,6 +614,7 @@ True + False <b>Font and Style</b> True @@ -557,6 +622,7 @@ False + True 1 @@ -567,6 +633,7 @@ True + False General @@ -576,6 +643,7 @@ True + False 12 12 12 @@ -583,21 +651,24 @@ True - vertical + False True + False True + False True - vertical + False 6 True + False True @@ -606,6 +677,7 @@ False + True 0 @@ -615,8 +687,6 @@ 300 True True - automatic - automatic in @@ -626,6 +696,8 @@ + True + True 1 @@ -633,27 +705,32 @@ + True + True 0 True + False 12 True - vertical + False 5 start gtk-add + False True False True True Add the selected input method into the enabled input methods + False True @@ -665,11 +742,13 @@ gtk-remove + False True False True True Remove the selected input method from the enabled input methods + False True @@ -681,11 +760,13 @@ gtk-go-up + False True False True True Move up the selected input method in the enabled input methods list + False True @@ -697,11 +778,13 @@ gtk-go-down + False True False True True Move down the selected input method in the enabled input methods + False True @@ -713,11 +796,13 @@ gtk-about + False True False True True Show information of the selected input method + False True @@ -729,11 +814,13 @@ gtk-preferences + False True False True True Show setup of the selected input method + False True @@ -747,42 +834,52 @@ False + True 1 + True + True 0 True + False 6 True + False 6 True + False gtk-info 2 False + True 0 True + False 0 <small><i>The default input method is the top one in the list. You may use up/down buttons to change it.</i></small> True + True + True 1 @@ -791,6 +888,7 @@ You may use up/down buttons to change it.</i></small> False + True 1 @@ -804,6 +902,7 @@ You may use up/down buttons to change it.</i></small> True + False Input Method @@ -814,6 +913,7 @@ You may use up/down buttons to change it.</i></small> True + False 12 12 12 @@ -821,33 +921,39 @@ You may use up/down buttons to change it.</i></small> True - vertical + False True + False 0 none True + False 12 True + False 6 12 True - vertical + False 6 Use system keyboard layout + False True True False Use system keyboard (XKB) layout + False + 0 True @@ -865,6 +971,7 @@ You may use up/down buttons to change it.</i></small> True + False <b>Keyboard Layout</b> True @@ -879,28 +986,34 @@ You may use up/down buttons to change it.</i></small> True + False 0 none True + False 12 True + False 6 12 True - vertical + False 6 Share the same input method among all applications + False True True False + False + 0 True @@ -918,6 +1031,7 @@ You may use up/down buttons to change it.</i></small> True + False <b>Global input method settings</b> True @@ -939,6 +1053,7 @@ You may use up/down buttons to change it.</i></small> True + False Advanced @@ -948,14 +1063,15 @@ You may use up/down buttons to change it.</i></small> + False True - vertical True + False <big><b>IBus</b></big> <small>The intelligent input bus</small> Homepage: http://code.google.com/p/ibus @@ -967,26 +1083,33 @@ Homepage: http://code.google.com/p/ibus center + True + True 1 + False True 0 none True + False 6 12 Start ibus on login + False True True False + False True + 0 True @@ -995,6 +1118,7 @@ Homepage: http://code.google.com/p/ibus True + False <b>Startup</b> True @@ -1014,6 +1138,7 @@ Homepage: http://code.google.com/p/ibus True + False About @@ -1023,20 +1148,25 @@ Homepage: http://code.google.com/p/ibus + True + True 0 True + False 12 end gtk-close + False True True False + False True @@ -1048,6 +1178,7 @@ Homepage: http://code.google.com/p/ibus False + True 1 -- 2.7.4