sfx2/uiconfig/ui/custominfopage.ui      |    3 --
 sfx2/uiconfig/ui/descriptioninfopage.ui |    2 -
 sfx2/uiconfig/ui/documentfontspage.ui   |    2 -
 sfx2/uiconfig/ui/documentinfopage.ui    |   44 +++++++++++++++-----------------
 sfx2/uiconfig/ui/securityinfopage.ui    |   30 +++------------------
 5 files changed, 27 insertions(+), 54 deletions(-)

New commits:
commit 7b1667d9500d541f57a8a4401ec1fc8bd238fa29
Author:     andreas kainz <kain...@gmail.com>
AuthorDate: Fri Nov 8 02:20:51 2019 +0100
Commit:     andreas_kainz <kain...@gmail.com>
CommitDate: Fri Nov 8 09:22:50 2019 +0100

    Writer Property Dialog update
    
    Change-Id: I22959d387d23fc28e2b7d8fa84b290d7f7d95995
    Reviewed-on: https://gerrit.libreoffice.org/82260
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kain...@gmail.com>

diff --git a/sfx2/uiconfig/ui/custominfopage.ui 
b/sfx2/uiconfig/ui/custominfopage.ui
index 86e520a12095..fcd78784d123 100644
--- a/sfx2/uiconfig/ui/custominfopage.ui
+++ b/sfx2/uiconfig/ui/custominfopage.ui
@@ -5,8 +5,6 @@
   <object class="GtkGrid" id="CustomInfoPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -97,7 +95,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
-                    <property name="vexpand">False</property>
                     <property name="border_width">3</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui 
b/sfx2/uiconfig/ui/descriptioninfopage.ui
index f2db5badd612..a2db39cd6119 100644
--- a/sfx2/uiconfig/ui/descriptioninfopage.ui
+++ b/sfx2/uiconfig/ui/descriptioninfopage.ui
@@ -5,8 +5,6 @@
   <object class="GtkGrid" id="DescriptionInfoPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
     <property name="column_spacing">12</property>
diff --git a/sfx2/uiconfig/ui/documentfontspage.ui 
b/sfx2/uiconfig/ui/documentfontspage.ui
index 44fdaf383541..30addf981529 100644
--- a/sfx2/uiconfig/ui/documentfontspage.ui
+++ b/sfx2/uiconfig/ui/documentfontspage.ui
@@ -5,7 +5,7 @@
   <object class="GtkGrid" id="DocumentFontsPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="border_width">12</property>
     <property name="row_spacing">6</property>
     <property name="column_spacing">12</property>
     <child>
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index 5581cb8cdcab..6799a99f5665 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkGrid" id="DocumentInfoPage">
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border_width">12</property>
     <property name="row_spacing">6</property>
     <property name="column_spacing">12</property>
     <child>
@@ -99,8 +99,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -113,8 +113,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -127,9 +127,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" 
context="documentinfopage|showsigned">Multiply signed document</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -141,13 +141,12 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">8</property>
-        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -155,8 +154,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -169,8 +168,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -195,8 +194,8 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="thumbnailsavecb">
-        <property name="visible">True</property>
         <property name="label" translatable="yes" 
context="documentinfopage|thumbnailsavecb">Save preview image with this 
document</property>
+        <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="no_show_all">True</property>
@@ -207,7 +206,6 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">12</property>
-        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -221,6 +219,7 @@
       <packing>
         <property name="left_attach">2</property>
         <property name="top_attach">11</property>
+        <property name="height">2</property>
       </packing>
     </child>
     <child>
@@ -235,7 +234,8 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">7</property>
+        <property name="top_attach">6</property>
+        <property name="height">3</property>
       </packing>
     </child>
     <child>
@@ -256,9 +256,9 @@
       <object class="GtkLabel" id="showsize">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" 
context="documentinfopage|showsize">unknown</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -315,13 +315,12 @@
       <object class="GtkLabel" id="showtype">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -330,12 +329,13 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
-        <property name="valign">center</property>
+        <property name="valign">start</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
         <property name="left_attach">2</property>
         <property name="top_attach">0</property>
+        <property name="height">2</property>
       </packing>
     </child>
     <child>
@@ -356,22 +356,19 @@
       <object class="GtkLabel" id="showtemplate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="selectable">True</property>
         <property name="max_width_chars">56</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="top_attach">6</property>
-        <property name="width">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="valign">center</property>
-        <property name="hexpand">True</property>
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkImage" id="icon">
@@ -389,7 +386,6 @@
           <object class="GtkLabel" id="nameed">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
             <property name="selectable">True</property>
             <property name="single_line_mode">True</property>
             <property name="max_width_chars">56</property>
@@ -401,9 +397,8 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
+        <property name="left_attach">1</property>
         <property name="top_attach">0</property>
-        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -412,5 +407,8 @@
     <child>
       <placeholder/>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/sfx2/uiconfig/ui/securityinfopage.ui 
b/sfx2/uiconfig/ui/securityinfopage.ui
index 3bde492162fb..241f13e1f60d 100644
--- a/sfx2/uiconfig/ui/securityinfopage.ui
+++ b/sfx2/uiconfig/ui/securityinfopage.ui
@@ -1,31 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkFrame" id="SecurityInfoPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border_width">12</property>
     <property name="label_xalign">0</property>
     <property name="shadow_type">none</property>
     <child>
       <object class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="valign">start</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
           <object class="GtkGrid" id="grid9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="valign">end</property>
-            <property name="hexpand">True</property>
-            <property name="row_spacing">12</property>
-            <property name="column_spacing">12</property>
+            <property name="row_spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="readonly">
                 <property name="label" translatable="yes" 
context="securityinfopage|readonly">_Open file read-only</property>
@@ -33,7 +26,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="halign">start</property>
-                <property name="valign">end</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -41,8 +33,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -58,15 +48,12 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="protect">
@@ -74,7 +61,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="halign">end</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -88,7 +74,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="halign">end</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -99,15 +84,10 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
         </child>
       </object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to