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

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/inc/migrwarndlg.hxx  |    2 ++
 dbaccess/source/core/misc/migrwarndlg.cxx |    2 ++
 dbaccess/uiconfig/ui/migrwarndlg.ui       |   29 ++++++++++++++++++++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 0b2eaf8c9595cc5f91b5d31b770e6f23e3b5b27c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 6 16:24:26 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 13 16:03:31 2019 +0200

    add link to hsqldb->firebird migration dialog
    
    1. keep presenting the migration dialog
    2. but, default to 'later'
    3. add a link to a URL that someone will have to fill in
    
    Change-Id: I4c67fe0b65fd78e942ca0760c0f9e128e5ac7be6
    Reviewed-on: https://gerrit.libreoffice.org/73610
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/core/inc/migrwarndlg.hxx b/dbaccess/source/core/inc/migrwarndlg.hxx
index 3e0935bd732c..e01c2b9f0099 100644
--- a/dbaccess/source/core/inc/migrwarndlg.hxx
+++ b/dbaccess/source/core/inc/migrwarndlg.hxx
@@ -15,6 +15,8 @@ namespace dbaccess
 {
 class MigrationWarnDialog : public weld::MessageDialogController
 {
+    std::unique_ptr<weld::Button> m_xLater;
+
 public:
     MigrationWarnDialog(weld::Window* pParent);
 };
diff --git a/dbaccess/source/core/misc/migrwarndlg.cxx b/dbaccess/source/core/misc/migrwarndlg.cxx
index cbbe6e3ca90c..d1712fba3f16 100644
--- a/dbaccess/source/core/misc/migrwarndlg.cxx
+++ b/dbaccess/source/core/misc/migrwarndlg.cxx
@@ -13,7 +13,9 @@ namespace dbaccess
 {
 MigrationWarnDialog::MigrationWarnDialog(weld::Window* pParent)
     : MessageDialogController(pParent, "dbaccess/ui/migrwarndlg.ui", "MigrationWarnDialog")
+    , m_xLater(m_xBuilder->weld_button("no"))
 {
+    m_xLater->grab_focus();
 }
 }
 
diff --git a/dbaccess/uiconfig/ui/migrwarndlg.ui b/dbaccess/uiconfig/ui/migrwarndlg.ui
index 5f25d767a182..97a89cb6f67f 100644
--- a/dbaccess/uiconfig/ui/migrwarndlg.ui
+++ b/dbaccess/uiconfig/ui/migrwarndlg.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkMessageDialog" id="MigrationWarnDialog">
@@ -11,12 +11,12 @@
     <property name="text" translatable="yes" context="migrationwarndialog|MigrationWarnDialog">The document contains embedded HSQL data, which is deprecated.</property>
     <property name="secondary_text" translatable="yes" context="migrationwarndialog|MigrationWarnDialog">Would you like to migrate to Firebird now?</property>
     <child internal-child="vbox">
-      <object class="GtkBox">
+      <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox">
+          <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="yes">
@@ -37,6 +37,8 @@
                 <property name="label" translatable="yes" context="migrationwarndialog|later">_Later</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
               </object>
@@ -50,17 +52,30 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLinkButton" id="link">
+            <property name="label" translatable="yes" context="migrationwarndialog|link">Click for important information about migration.</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="relief">none</property>
+            <property name="uri">https://wiki.documentfoundation.org/Documentation/HowTo/MigrateFromHSQLDB</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>
       <action-widget response="-5">yes</action-widget>
       <action-widget response="-6">no</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>