[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/source sw/uiconfig

[Serge Krot]

 sw/source/ui/app/app.src                 |   10 +++++++
 sw/uiconfig/swriter/ui/insertbookmark.ui |   40 ++++++++++---------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

New commits:
commit bcc16920eec647f2a3753d60c4d969862f272942
Author: Serge Krot <Serge.Krot at cib.de>
Date:   Fri Mar 2 10:06:38 2018 +0100

    tdf#101856 Fix crash in Insert Bookmark dialog
    
    Change-Id: Idf892b9045429dc5826e995551b8e789c14600b8
    Reviewed-on: https://gerrit.libreoffice.org/50616
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4f8bcdbed691..19baa6f88898 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -233,6 +233,16 @@ String STR_BOOKMARK_TEXT
     Text [ en-US ] = "Text";
 };
 
+String STR_BOOKMARK_HIDDEN
+{
+    Text [ en-US ] = "Hidden";
+};
+
+String STR_BOOKMARK_CONDITION
+{
+    Text [ en-US ] = "Condition";
+};
+
 String SW_STR_NONE
 {
     Text [ en-US ] = "[None]" ;
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index db5fe770aa20..7336ae7a2beb 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -6,7 +6,7 @@
   <object class="GtkDialog" id="InsertBookmarkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Bookmark</property>
+    <property name="title" translatable="yes" context="insertbookmark|InsertBookmarkDialog">Bookmark</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -54,8 +54,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton" id="hidden">
-            <property name="label" translatable="yes" context="insertbookmark|hidden">Hidden</property>
+          <object class="GtkCheckButton" id="hide">
+            <property name="label" translatable="yes" context="insertbookmark|hide">H_ide</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -72,12 +72,12 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">6</property>
+            <property name="spacing">12</property>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="condlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="insertbookmark|label1">On condition</property>
+                <property name="label" translatable="yes" context="insertbookmark|condlabel">_With condition</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -86,7 +86,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="condition">
+              <object class="swlo-ConditionEdit" id="withcond">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
               </object>
@@ -170,14 +170,12 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">5</property>
+            <property name="position">4</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
+        <child internal-child="action_area" id="dialog-action_area1">
+          <object class="GtkButtonBox">
             <property name="can_focus">False</property>
-            <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
@@ -188,7 +186,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -202,28 +200,18 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">5</property>
           </packing>
         </child>
-        <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">6</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>