change pos of buttons

git-svn-id: svn://localhost/trunk@56 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/po/vi.po b/po/vi.po
index 08b38f9..457e3bf 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -67,8 +67,7 @@ msgstr "Tùy chọn"
 msgid "Configure Unikey here"
 msgstr "Cấu hình Unikey ở đây"
 
-#: src/unikey_instance.cpp:182
-#: setup/setup-main.glade:146
+#: src/unikey_instance.cpp:182 setup/setup-main.glade:146
 msgid "Enable spell check"
 msgstr "Bật kiểm tra chính tả"
 
@@ -76,8 +75,7 @@ msgstr "Bật kiểm tra chính tả"
 msgid "If enable, you can decrease mistake when typing"
 msgstr "Nếu bật, bạn có thể giảm lỗi chính tả khi gõ"
 
-#: src/unikey_instance.cpp:190
-#: setup/setup-main.glade:158
+#: src/unikey_instance.cpp:190 setup/setup-main.glade:158
 msgid "Auto restore keys with invalid words"
 msgstr "Tự động khôi phục phím với từ sai"
 
@@ -89,13 +87,11 @@ msgstr ""
 "Khi gõ một từ không phải tiếng Việt,\n"
 "nó sẽ tự động khôi phục phím gốc"
 
-#: src/unikey_instance.cpp:199
-#: setup/setup-main.glade:170
+#: src/unikey_instance.cpp:199 setup/setup-main.glade:170
 msgid "Use oà, uý (instead of òa, úy)"
 msgstr "Đặt dấu oà, uý (thay vì òa, úy)"
 
-#: src/unikey_instance.cpp:207
-#: setup/setup-main.glade:182
+#: src/unikey_instance.cpp:207 setup/setup-main.glade:182
 msgid "Allow type with more freedom"
 msgstr "Cho phép gõ tự do"
 
@@ -119,8 +115,7 @@ msgstr ""
 msgid "Launch Unikey-setup"
 msgstr "Chạy trình cài đặt Unikey"
 
-#: setup/scim_unikey_setup.cpp:64
-#: setup/scim_unikey_helper.cpp:36
+#: setup/scim_unikey_setup.cpp:64 setup/scim_unikey_helper.cpp:36
 msgid "Unikey Setup"
 msgstr "Cài đặt Unikey"
 
@@ -205,11 +200,3 @@ msgstr "_Nhập..."
 #: setup/setup-macro.glade:109
 msgid "_Export..."
 msgstr "_Xuất..."
-
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-delete"
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-

diff --git a/setup/setup-macro.glade b/setup/setup-macro.glade
index 5f00ec6..431a56b 100644 (file)
--- a/setup/setup-macro.glade
+++ b/setup/setup-macro.glade
@@ -134,8 +134,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="btn_ok">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -148,8 +148,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="btn_ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -171,8 +171,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-5">btn_ok</action-widget>
       <action-widget response="-6">btn_cancel</action-widget>
+      <action-widget response="-5">btn_ok</action-widget>
     </action-widgets>
   </object>
   <object class="GtkImage" id="img_remove">

diff --git a/setup/setup-main.glade b/setup/setup-main.glade
index 705ab19..cc85bc5 100644 (file)
--- a/setup/setup-main.glade
+++ b/setup/setup-main.glade
@@ -263,8 +263,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="btn_main_ok">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="btn_main_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -277,8 +277,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="btn_main_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="btn_main_ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -300,8 +300,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-5">btn_main_ok</action-widget>
       <action-widget response="-6">btn_main_cancel</action-widget>
+      <action-widget response="-5">btn_main_ok</action-widget>
     </action-widgets>
   </object>
   <object class="GtkImage" id="img_edit">