From 57f30096080c7a9c072c551d68d2ffc20fa1e40b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 1 Aug 2019 17:05:28 +0100
Subject: weld OGeneralPage and OGeneralPageWizard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7caa08a5e060371c9b80ff83b141c27af09246bf
Reviewed-on: https://gerrit.libreoffice.org/76817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 dbaccess/uiconfig/ui/generalpagewizard.ui | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'dbaccess/uiconfig')

diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index bb9e46e72b0f..8413935a4a34 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="PageGeneral">
     <property name="width_request">400</property>
     <property name="visible">True</property>
@@ -14,9 +13,9 @@
       <object class="GtkLabel" id="headerText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" context="generalpagewizard|headerText">Welcome to the %PRODUCTNAME Database Wizard</property>
         <property name="wrap">True</property>
+        <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -31,10 +30,11 @@
       <object class="GtkLabel" id="helpText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" context="generalpagewizard|helpText">Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server.</property>
         <property name="wrap">True</property>
+        <property name="width_chars">72</property>
         <property name="max_width_chars">72</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -46,9 +46,9 @@
       <object class="GtkLabel" id="sourceTypeHeader">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" context="generalpagewizard|sourceTypeHeader">What do you want to do?</property>
         <property name="wrap">True</property>
+        <property name="xalign">0</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -84,10 +84,10 @@
           <object class="GtkLabel" id="embeddeddbLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes" context="generalpagewizard|embeddeddbLabel">_Embedded database:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">embeddeddbList</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -142,10 +142,10 @@
           <object class="GtkLabel" id="docListLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes" context="generalpagewizard|docListLabel">_Recently used:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">documentList</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -154,12 +154,10 @@
           </packing>
         </child>
         <child>
-          <object class="dbulo-OpenDocumentListBox" id="documentList">
+          <object class="GtkComboBoxText" id="documentList">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="entry_text_column">0</property>
-            <property name="id_column">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -175,7 +173,7 @@
       </packing>
     </child>
     <child>
-      <object class="dbulo-OpenDocumentButton" id="openDatabase">
+      <object class="GtkButton" id="openDatabase">
         <property name="label" translatable="yes" context="generalpagewizard|openDatabase">Open</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-- 
cgit