GNOME.org
 

[meld] data: Re-save preferences.ui with new glade

commit 22e343ef643ab0cb635148cc8e4d2895bbb36c49
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 22 08:39:28 2017 +1000

    data: Re-save preferences.ui with new glade

 data/ui/preferences.ui |  214 +++++++++++++++++++++++++-----------------------
 1 files changed, 112 insertions(+), 102 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 339afc9..9386d12 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">8</property>
@@ -15,83 +16,13 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="syntaxschemestore">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="fileorderstore">
-    <columns>
-      <!-- column-name id -->
-      <column type="gboolean"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">False</col>
-        <col id="1" translatable="yes">Left is remote, right is local</col>
-      </row>
-      <row>
-        <col id="0">True</col>
-        <col id="1" translatable="yes">Left is local, right is remote</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="mergeorderstore">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">remote-merge-local</col>
-        <col id="1" translatable="yes">Remote, merge, local</col>
-      </row>
-      <row>
-        <col id="0">local-merge-remote</col>
-        <col id="1" translatable="yes">Local, merge, remote</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="timestampstore">
-    <columns>
-      <!-- column-name value -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes">1ns (ext4)</col>
-      </row>
-      <row>
-        <col id="0">100</col>
-        <col id="1" translatable="yes">100ns (NTFS)</col>
-      </row>
-      <row>
-        <col id="0">1000000000</col>
-        <col id="1" translatable="yes">1s (ext2/ext3)</col>
-      </row>
-      <row>
-        <col id="0">2000000000</col>
-        <col id="1" translatable="yes">2s (VFAT)</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkDialog" id="preferencesdialog">
+    <property name="can_focus">False</property>
     <property name="border_width">0</property>
-    <property name="modal">True</property>
-    <property name="resizable">False</property>
     <property name="title" translatable="yes">Meld Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <property name="use-header-bar">1</property>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
@@ -99,6 +30,16 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="border-width">0</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
@@ -119,9 +60,9 @@
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Font</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -179,10 +120,10 @@
                                   <object class="GtkLabel" id="label_fontpicker">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Editor font:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">fontpicker</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -195,7 +136,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="font_name">Monospace 12</property>
+                                    <property name="font">Monospace 12</property>
                                     <property name="use_font">True</property>
                                   </object>
                                   <packing>
@@ -241,9 +182,9 @@
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Display</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -284,10 +225,10 @@
                                   <object class="GtkLabel" id="label_tabsize">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Tab width:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">spinbutton_tabsize</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -453,7 +394,6 @@
                                   <packing>
                                     <property name="expand">True</property>
                                     <property name="fill">True</property>
-                                    <property name="padding">0</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -513,9 +453,9 @@
                       <object class="GtkLabel" id="label69">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">External Editor</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -572,10 +512,10 @@
                                   <object class="GtkLabel" id="label_editor_command">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Edito_r command:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">custom_edit_command_entry</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -649,9 +589,9 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Shallow Comparison</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -708,10 +648,10 @@
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Timestamp 
resolution:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">combo_timestamp</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -792,9 +732,9 @@
                       <object class="GtkLabel" id="symlink_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Symbolic Links</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -860,9 +800,9 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Visible Columns</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -949,9 +889,9 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Version Comparisons</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -992,10 +932,10 @@
                                   <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">_Order when comparing file 
revisions:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">combo_file_order</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1039,10 +979,10 @@
                                   <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>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1107,9 +1047,9 @@
                       <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">Commit Messages</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1261,9 +1201,9 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Filename filters</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1299,10 +1239,10 @@
                               <object class="GtkLabel" id="label86">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When performing directory 
comparisons, you may filter out files and directories by name. Each pattern is a list of shell style 
wildcards separated by spaces.</property>
                                 <property name="wrap">True</property>
-                                <property name="max-width-chars">40</property>
+                                <property name="max_width_chars">40</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1366,9 +1306,9 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Change trimming</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1446,9 +1386,9 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Text filters</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1484,11 +1424,11 @@
                               <object class="GtkLabel" id="label87">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When performing file comparisons, 
you may ignore certain types of changes. Each pattern here is a python regular expression which replaces 
matching text with the empty string before comparison is performed. If the expression contains groups, only 
the groups are replaced. See the user manual for more details.</property>
                                 <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
-                                <property name="max-width-chars">40</property>
+                                <property name="max_width_chars">40</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1553,16 +1493,86 @@
       <widget name="label_editor_command"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup_file_order_combos">
+    <widgets>
+      <widget name="combo_file_order"/>
+      <widget name="combo_merge_order"/>
+    </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 class="GtkListStore" id="fileorderstore">
+    <columns>
+      <!-- column-name id -->
+      <column type="gboolean"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">False</col>
+        <col id="1" translatable="yes">Left is remote, right is local</col>
+      </row>
+      <row>
+        <col id="0">True</col>
+        <col id="1" translatable="yes">Left is local, right is remote</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="mergeorderstore">
+    <columns>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">remote-merge-local</col>
+        <col id="1" translatable="yes">Remote, merge, local</col>
+      </row>
+      <row>
+        <col id="0">local-merge-remote</col>
+        <col id="1" translatable="yes">Local, merge, remote</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="syntaxschemestore">
+    <columns>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="timestampstore">
+    <columns>
+      <!-- column-name value -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">1ns (ext4)</col>
+      </row>
+      <row>
+        <col id="0">100</col>
+        <col id="1" translatable="yes">100ns (NTFS)</col>
+      </row>
+      <row>
+        <col id="0">1000000000</col>
+        <col id="1" translatable="yes">1s (ext2/ext3)</col>
+      </row>
+      <row>
+        <col id="0">2000000000</col>
+        <col id="1" translatable="yes">2s (VFAT)</col>
+      </row>
+    </data>
   </object>
 </interface>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]