GNOME.org
 

[glade] GtkTextView: Integrating new margin properties

commit 415e90d0c7252d673cd26226ceeb1bcbd2d8286a
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Fri Jan 29 13:05:17 2016 +0100

    GtkTextView: Integrating new margin properties
    
    Top margin and bottom margin are since 3.18 and get placed
    beside the left and right margin properties

 plugins/gtk+/glade-text-view-editor.ui |  112 ++++++++++++++++++--------------
 plugins/gtk+/gtk+.xml.in               |    4 +-
 2 files changed, 66 insertions(+), 50 deletions(-)
---
diff --git a/plugins/gtk+/glade-text-view-editor.ui b/plugins/gtk+/glade-text-view-editor.ui
index 6d391b8..f4180c0 100644
--- a/plugins/gtk+/glade-text-view-editor.ui
+++ b/plugins/gtk+/glade-text-view-editor.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 
+<!-- Generated with glade 3.19.0 
 
 libgladegtk - Glade UI Designer Gtk+ support plugin
 Copyright (C) 2013 Tristan Van Berkom <tvb gnome org>
@@ -44,7 +44,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -62,7 +61,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -77,7 +75,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -91,7 +88,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">2</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -106,7 +102,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">3</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -122,7 +117,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">4</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -136,7 +130,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">3</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -150,7 +143,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">4</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -166,7 +158,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">5</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -180,8 +171,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -195,8 +184,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -212,7 +199,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">6</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -228,7 +214,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">6</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -246,7 +231,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">7</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -261,7 +245,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">8</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -276,7 +259,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">9</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -290,7 +272,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">8</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -304,7 +285,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">9</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -320,7 +300,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">10</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -334,7 +313,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">2</property>
             <property name="top_attach">10</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -350,8 +328,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -367,8 +343,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">13</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -381,8 +355,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -395,8 +367,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">13</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -415,7 +385,6 @@ Author: Tristan Van Berkom <tvb gnome org>
             <property name="left_attach">0</property>
             <property name="top_attach">11</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -432,8 +401,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -449,8 +416,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -466,8 +431,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">13</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -483,8 +446,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">14</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -497,8 +458,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -511,8 +470,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">13</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -525,8 +482,6 @@ Author: Tristan Van Berkom <tvb gnome org>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">14</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -537,12 +492,69 @@ Author: Tristan Van Berkom <tvb gnome org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">16</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
+          <object class="GladePropertyLabel" id="top_margin_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">top-margin</property>
+            <property name="custom_text" translatable="yes">Top:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">14</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyLabel" id="bottom_margin_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">bottom-margin</property>
+            <property name="custom_text" translatable="yes">Bottom:</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">15</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="top_margin_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">top-margin</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">14</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="bottom_margin_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">bottom-margin</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">15</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
           <placeholder/>
         </child>
         <child>
@@ -651,8 +663,12 @@ Author: Tristan Van Berkom <tvb gnome org>
       <editor id="indent_editor"/>
       <editor id="left_margin_label"/>
       <editor id="right_margin_label"/>
+      <editor id="top_margin_label"/>
+      <editor id="bottom_margin_label"/>
       <editor id="left_margin_editor"/>
       <editor id="right_margin_editor"/>
+      <editor id="top_margin_editor"/>
+      <editor id="bottom_margin_editor"/>
       <editor id="above_lines_label"/>
       <editor id="below_lines_label"/>
       <editor id="inside_wrap_label"/>
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 18761ce..a449aae 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1639,8 +1639,8 @@
           <property id="indent" custom-layout="True"/>
           <property id="left-margin" custom-layout="True"/>
           <property id="right-margin" custom-layout="True"/>
-          <property id="bottom-margin" since="3.18"/>
-          <property id="top-margin" since="3.18"/>
+          <property id="bottom-margin" custom-layout="True" since="3.18"/>
+          <property id="top-margin" custom-layout="True" since="3.18"/>
           <property id="pixels-above-lines" custom-layout="True"/>
           <property id="pixels-below-lines" custom-layout="True"/>
           <property id="pixels-inside-wrap" custom-layout="True"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]