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

Caolán McNamara caolanm at redhat.com
Mon Mar 31 08:05:51 PDT 2014


 vcl/uiconfig/ui/printdialog.ui |  189 +++++++++++++++++++++--------------------
 1 file changed, 98 insertions(+), 91 deletions(-)

New commits:
commit e764b46eea2aab37b7f62d6bf495d2b80080e3b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 31 16:04:14 2014 +0100

    Resolves: fdo#63228 Printers list does not increase height with Print Dialog
    
    Change-Id: I731fe5159bead1dc0036ede8d4cd26c233e3b296

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 2aa464b..a23543c 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -21,6 +22,93 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-previous</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-next</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gint1 -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">1</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4</col>
+        <col id="1">4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">6</col>
+        <col id="1">6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">9</col>
+        <col id="1">9</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16</col>
+        <col id="1">16</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Custom</col>
+        <col id="1">65535</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">left to right, then down</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">top to bottom, then right</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">top to bottom, then left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">right to left, then down</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore3">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Automatic</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Portrait</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Landscape</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="PrintDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -90,11 +178,15 @@
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -188,10 +280,12 @@
               <object class="GtkNotebook" id="tabcontrol">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
                 <child>
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="vexpand">True</property>
                     <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
@@ -199,19 +293,20 @@
                       <object class="GtkFrame" id="frame1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="vexpand">True</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="vexpand">True</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkGrid" id="grid4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
                                 <property name="row_spacing">6</property>
                                 <child>
@@ -348,6 +443,7 @@
                                     <property name="height_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="vexpand">True</property>
                                     <child internal-child="selection">
                                       <object class="GtkTreeSelection" id="treeview-selection"/>
                                     </child>
@@ -435,7 +531,6 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">●</property>
-                                        <property name="invisible_char_set">True</property>
                                         <property name="adjustment">adjustment1</property>
                                       </object>
                                       <packing>
@@ -634,7 +729,6 @@
                                             <property name="can_focus">True</property>
                                             <property name="no_show_all">True</property>
                                             <property name="invisible_char">●</property>
-                                            <property name="invisible_char_set">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1532,91 +1626,4 @@
       <action-widget response="0">help</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-media-previous</property>
-    <property name="icon-size">1</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-media-next</property>
-    <property name="icon-size">1</property>
-  </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name gint1 -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">1</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">6</col>
-        <col id="1">6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">9</col>
-        <col id="1">9</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">16</col>
-        <col id="1">16</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Custom</col>
-        <col id="1">65535</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">left to right, then down</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">top to bottom, then right</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">top to bottom, then left</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">right to left, then down</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore3">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Automatic</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Portrait</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Landscape</col>
-      </row>
-    </data>
-  </object>
 </interface>


More information about the Libreoffice-commits mailing list