[Libreoffice-commits] core.git: cui/uiconfig

Caolán McNamara caolanm at redhat.com
Wed May 7 05:46:35 PDT 2014


 cui/uiconfig/ui/linetabpage.ui |  129 ++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 63 deletions(-)

New commits:
commit 9bd4bd431cefda3602701ea648e221be01af7a5d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 7 13:43:25 2014 +0100

    Resolves: fdo#78323 consistent left spacing for previews
    
    Change-Id: I9bfbde0f5abad6d6f297fc18e24f6b20be914ce4

diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index 670dfba..c43b2ed 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentPERCENT">
     <property name="upper">100</property>
     <property name="step_increment">5</property>
@@ -17,6 +18,54 @@
     <property name="step_increment">0.050000000000000003</property>
     <property name="page_increment">1</property>
   </object>
+  <object class="GtkListStore" id="liststoreCAP_STYLE">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Flat</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Round</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Square</col>
+        <col id="1">2</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreEDGE_STYLE">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Rounded</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">- none -</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mitered</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Beveled</col>
+        <col id="1">3</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkBox" id="LineTabPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -150,7 +199,6 @@
                             <property name="can_focus">True</property>
                             <property name="halign">start</property>
                             <property name="invisible_char">•</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="adjustment">adjustmentWIDTH</property>
                             <property name="digits">2</property>
                           </object>
@@ -193,7 +241,6 @@
                             <property name="can_focus">True</property>
                             <property name="halign">start</property>
                             <property name="invisible_char">•</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="adjustment">adjustmentPERCENT</property>
                           </object>
                           <packing>
@@ -343,7 +390,6 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="invisible_char">•</property>
-                                    <property name="invisible_char_set">True</property>
                                     <property name="adjustment">adjustmentWIDTH</property>
                                     <property name="digits">2</property>
                                   </object>
@@ -405,7 +451,6 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="invisible_char">•</property>
-                                    <property name="invisible_char_set">True</property>
                                     <property name="adjustment">adjustmentWIDTH</property>
                                     <property name="digits">2</property>
                                   </object>
@@ -686,7 +731,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="invisible_char">•</property>
-                                <property name="invisible_char_set">True</property>
                                 <property name="adjustment">adjustmentWIDTH_SYMBOL</property>
                                 <property name="digits">2</property>
                               </object>
@@ -741,12 +785,19 @@
       </packing>
     </child>
     <child>
-      <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW:border">
+      <object class="GtkAlignment" id="alignment6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="CTL_PREVIEW:border-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+        <property name="left_padding">12</property>
+        <child>
+          <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW:border">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="CTL_PREVIEW:border-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
@@ -757,53 +808,11 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststoreCAP_STYLE">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Flat</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Round</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Square</col>
-        <col id="1">2</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreEDGE_STYLE">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Rounded</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">- none -</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Mitered</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Beveled</col>
-        <col id="1">3</col>
-      </row>
-    </data>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <widgets>
+      <widget name="MTR_FLD_LINE_WIDTH:0cm"/>
+      <widget name="MTR_LINE_TRANSPARENT:0%"/>
+    </widgets>
   </object>
   <object class="GtkMenu" id="menuSELECT">
     <property name="visible">True</property>
@@ -849,10 +858,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <widgets>
-      <widget name="MTR_FLD_LINE_WIDTH:0cm"/>
-      <widget name="MTR_LINE_TRANSPARENT:0%"/>
-    </widgets>
-  </object>
 </interface>


More information about the Libreoffice-commits mailing list