[Libreoffice-commits] core.git: sd/source sd/uiconfig

[Caolán McNamara]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |    2 +-
 sd/uiconfig/simpress/ui/photoalbum.ui |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 49a92a140763ca0273135489a676247d670161a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 11 11:46:24 2018 +0100

    rename create_btn to ok to get desired button ordering
    
    and help is missing a RET_HELP response id
    
    Change-Id: Ibb816f9a3d03ceef4edde023725bebd29f9160d2
    Reviewed-on: https://gerrit.libreoffice.org/54128
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 513dc00781c5..d7af857f86d8 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -44,7 +44,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pAc
   pDoc(pActDoc)
 {
     get(pCancelBtn, "cancel");
-    get(pCreateBtn, "create_btn");
+    get(pCreateBtn, "ok");
 
     get(pAddBtn, "add_btn");
     get(pUpBtn, "up_btn");
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui
index 743cad7108af..2ad9d1df394b 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkListStore" id="liststore1">
@@ -56,7 +56,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="create_btn">
+              <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="photoalbum|create_btn">Insert Slides</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -428,8 +428,11 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">create_btn</action-widget>
+      <action-widget response="-11">help</action-widget>
       <action-widget response="-6">cancel</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>