[meld] preferences: Fix UI for VC file order preferences

[Kai Willadsen <kaiw src gnome org>]

commit 6fe0404eda74fba1544d21c19527f01f93ebdea0
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Apr 24 06:38:04 2014 +1000

    preferences: Fix UI for VC file order preferences

 data/ui/preferences.ui |   51 ++++++++++++++++++++++++++++++++++++++++++-----
 meld/preferences.py    |    3 +-
 2 files changed, 47 insertions(+), 7 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index e0a5464..9a876e2 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -43,11 +43,11 @@
     <data>
       <row>
         <col id="0">local-merge-remote</col>
-        <col id="1" translatable="yes">Remote/Merge/Local</col>
+        <col id="1" translatable="yes">Remote, merge, local</col>
       </row>
       <row>
         <col id="0">remote-merge-local</col>
-        <col id="1" translatable="yes">Local/Merge/Remote</col>
+        <col id="1" translatable="yes">Local, merge, remote</col>
       </row>
     </data>
   </object>
@@ -962,11 +962,11 @@
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <object class="GtkLabel" id="label12">
+                                  <object class="GtkLabel" id="file_order_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_When comparing file 
revisions:</property>
+                                    <property name="label" translatable="yes">_Order when comparing file 
revisions:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">combo_file_order</property>
                                   </object>
@@ -996,6 +996,33 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="merge_order_hbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="merge_order_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Order when _merging 
files:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">combo_merge_order</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="GSettingsStringComboBox" id="combo_merge_order">
                                     <property name="visible">True</property>
@@ -1013,14 +1040,14 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="position">2</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
@@ -1320,4 +1347,16 @@
       <widget name="label_editor_command"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup_file_order_labels">
+    <widgets>
+      <widget name="file_order_label"/>
+      <widget name="merge_order_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup_file_order_combos">
+    <widgets>
+      <widget name="combo_file_order"/>
+      <widget name="combo_merge_order"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/meld/preferences.py b/meld/preferences.py
index 1ed5d00..d059040 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -172,7 +172,8 @@ class PreferencesDialog(Component):
         Component.__init__(self, "preferences.ui", "preferencesdialog",
                            ["adjustment1", "adjustment2", "fileorderstore",
                             "sizegroup_editor", "timestampstore",
-                            "mergeorderstore"])
+                            "mergeorderstore", "sizegroup_file_order_labels",
+                            "sizegroup_file_order_combos"])
         self.widget.set_transient_for(parent)
 
         bindings = [