weld OTitleWindow

Change-Id: I10996b1d927e6e8db913d04d975fda69669a2988
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

8 files changed, 336 insertions, 235 deletions

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eb693505740b..40a06cd388a0 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/taskwindow \
     dbaccess/uiconfig/ui/textconnectionsettings \
     dbaccess/uiconfig/ui/textpage \
+    dbaccess/uiconfig/ui/titlewindow \
     dbaccess/uiconfig/ui/typeselectpage \
     dbaccess/uiconfig/ui/useradmindialog \
     dbaccess/uiconfig/ui/useradminpage \
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index ab8c7632e54f..ed7a1c6c861c 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -228,17 +228,17 @@ void OTasksWindow::Clear()
 
 OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent )
     ,m_aHorzSplitter(VclPtr<Splitter>::Create(this))
-    ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this, STR_TASKS, WB_BORDER | WB_DIALOGCONTROL))
-    ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this, nullptr, WB_BORDER | WB_DIALOGCONTROL))
+    ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this, STR_TASKS))
+    ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this, nullptr))
     ,m_rBorderWin(_rParent)
 {
     ImplInitSettings();
 
-    m_pControlHelper = VclPtr<OAppDetailPageHelper>::Create(m_aContainer.get(),m_rBorderWin,_ePreviewMode);
+    m_pControlHelper = VclPtr<OAppDetailPageHelper>::Create(m_aContainer->getChildContainer(),m_rBorderWin,_ePreviewMode);
     m_pControlHelper->Show();
     m_aContainer->setChildWindow(m_pControlHelper);
 
-    VclPtrInstance<OTasksWindow> pTasks(m_aTasks.get(),this);
+    VclPtrInstance<OTasksWindow> pTasks(m_aTasks->getChildContainer(),this);
     pTasks->Show();
     pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly());
     m_aTasks->setChildWindow(pTasks);
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index f3a8023312c2..3231d020e42a 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -17,34 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "AppTitleWindow.hxx"
+#include <com/sun/star/awt/XWindow.hpp>
 #include <core_resource.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
+#include "AppTitleWindow.hxx"
 
 namespace dbaui
 {
 
-OTitleWindow::OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift)
-    : Window(_pParent,_nBits | WB_DIALOGCONTROL)
-    , m_aTitleFrame(VclPtr<vcl::Window>::Create(this))
-    , m_aTitle(VclPtr<FixedText>::Create(m_aTitleFrame, WB_VCENTER))
-    , m_pChild(nullptr)
-    , m_bShift(_bShift)
+OTitleWindow::OTitleWindow(vcl::Window* pParent, const char* pTitleId)
+    : InterimItemWindow(pParent, "dbaccess/ui/titlewindow.ui", "TitleWindow")
+    , m_xTitleFrame(m_xBuilder->weld_container("titleparent"))
+    , m_xTitle(m_xBuilder->weld_label("title"))
+    , m_xChildContainer(m_xBuilder->weld_container("box"))
+    , m_xChildParent(m_xChildContainer->CreateChildFrame())
+    , m_xChild(nullptr)
 {
     setTitle(pTitleId);
-    SetBorderStyle(WindowBorderStyle::MONO);
     ImplInitSettings();
 
-    const StyleSettings& rStyle = Application::GetSettings().GetStyleSettings();
-    vcl::Font aFont = m_aTitle->GetControlFont();
-    aFont.SetWeight(WEIGHT_BOLD);
-    m_aTitle->SetControlFont(aFont);
-    m_aTitle->SetControlForeground(rStyle.GetLightColor());
-    m_aTitleFrame->SetBackground(rStyle.GetShadowColor());
-    m_aTitleFrame->Show();
-    m_aTitle->Show();
+    m_xTitleFrame->set_title_background();
+    m_xTitle->set_label_type(weld::LabelType::Title);
 }
 
 OTitleWindow::~OTitleWindow()
@@ -54,64 +50,45 @@ OTitleWindow::~OTitleWindow()
 
 void OTitleWindow::dispose()
 {
-    if ( m_pChild )
-    {
-        m_pChild->Hide();
-    }
-    m_pChild.disposeAndClear();
-    m_aTitle.disposeAndClear();
-    m_aTitleFrame.disposeAndClear();
-    vcl::Window::dispose();
+    if (m_xChild)
+        m_xChild->Hide();
+    m_xChild.disposeAndClear();
+    m_xChildParent->dispose();
+    m_xChildParent.clear();
+    m_xChildContainer.reset();
+    m_xTitle.reset();
+    m_xTitleFrame.reset();
+    InterimItemWindow::dispose();
 }
 
-void OTitleWindow::setChildWindow(vcl::Window* _pChild)
+vcl::Window* OTitleWindow::getChildContainer()
 {
-    m_pChild = _pChild;
+    return VCLUnoHelper::GetWindow(m_xChildParent);
 }
 
-#define SPACE_BORDER    1
-void OTitleWindow::Resize()
+void OTitleWindow::setChildWindow(vcl::Window* pChild)
 {
-    // parent window dimension
-    Size aOutputSize( GetOutputSize() );
-    long nOutputWidth   = aOutputSize.Width();
-    long nOutputHeight  = aOutputSize.Height();
-
-    Size aTextSize = LogicToPixel(Size(6, 3), MapMode(MapUnit::MapAppFont));
-    sal_Int32 nXOffset = aTextSize.Width();
-    sal_Int32 nYOffset = aTextSize.Height();
-    sal_Int32 nHeight = GetTextHeight() + 2*nYOffset;
-
-    m_aTitleFrame->SetPosSizePixel(Point(SPACE_BORDER, SPACE_BORDER),
-                                   Size(nOutputWidth - 2*SPACE_BORDER, nHeight - SPACE_BORDER));
-    m_aTitle->SetPosSizePixel(Point(nXOffset, 0),
-                              Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nHeight - SPACE_BORDER));
-    if ( m_pChild )
-    {
-        m_pChild->SetPosSizePixel(  Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER),
-                                    Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) );
-    }
+    m_xChild = pChild;
 }
 
 void OTitleWindow::setTitle(const char* pTitleId)
 {
-    if (pTitleId)
-    {
-        m_aTitle->SetText(DBA_RES(pTitleId));
-    }
+    if (!pTitleId)
+        return;
+    m_xTitle->set_label(DBA_RES(pTitleId));
 }
 
 void OTitleWindow::GetFocus()
 {
-    Window::GetFocus();
-    if ( m_pChild )
-        m_pChild->GrabFocus();
+    InterimItemWindow::GetFocus();
+    if (m_xChild)
+        m_xChild->GrabFocus();
 }
 
 long OTitleWindow::GetWidthPixel() const
 {
     Size aTextSize = LogicToPixel(Size(12, 0), MapMode(MapUnit::MapAppFont));
-    sal_Int32 nWidth = GetTextWidth(m_aTitle->GetText()) + 2*aTextSize.Width();
+    sal_Int32 nWidth = GetTextWidth(m_xTitle->get_label()) + 2*aTextSize.Width();
 
     return nWidth;
 }
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index ebb7fae7e42d..dcef39575cf0 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -19,30 +19,33 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 
-#include <vcl/fixed.hxx>
+#include <vcl/InterimItemWindow.hxx>
 
 namespace dbaui
 {
-    class OTitleWindow : public vcl::Window
+    class OTitleWindow final : public InterimItemWindow
     {
-        VclPtr<vcl::Window> m_aTitleFrame;
-        VclPtr<FixedText>   m_aTitle;
-        VclPtr<vcl::Window> m_pChild;
-        bool                m_bShift;
+        std::unique_ptr<weld::Container> m_xTitleFrame;
+        std::unique_ptr<weld::Label> m_xTitle;
+        std::unique_ptr<weld::Container> m_xChildContainer;
+        css::uno::Reference<css::awt::XWindow> m_xChildParent;
+        VclPtr<vcl::Window> m_xChild;
         void ImplInitSettings();
-    protected:
+
         virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
     public:
-        OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift = true);
+        OTitleWindow(vcl::Window* pParent, const char* pTitleId);
         virtual ~OTitleWindow() override;
         virtual void dispose() override;
 
         // Window overrides
-        virtual void Resize() override;
         virtual void GetFocus() override;
 
         virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
+        /** gets the window which should be used as a child's parent */
+        vcl::Window* getChildContainer();
+
         /** sets the child window which should be displayed below the title. It will be destroyed at the end.
             @param  _pChild
                 The child window.
@@ -54,7 +57,7 @@ namespace dbaui
             @return
                 The child window.
         */
-        vcl::Window* getChildWindow() const { return m_pChild; }
+        vcl::Window* getChildWindow() const { return m_xChild; }
 
         /** sets the title text out of the resource
             @param  pTitleId
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index bdb2f561126e..b92917c4615b 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -50,9 +50,9 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
 
     SetBorderStyle(WindowBorderStyle::MONO);
 
-    m_pPanel = VclPtr<OTitleWindow>::Create(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL, false);
+    m_pPanel = VclPtr<OTitleWindow>::Create(this, STR_DATABASE);
     m_pPanel->SetBorderStyle(WindowBorderStyle::MONO);
-    VclPtrInstance<OApplicationSwapWindow> pSwap( m_pPanel, *this );
+    VclPtrInstance<OApplicationSwapWindow> pSwap( m_pPanel->getChildContainer(), *this );
     pSwap->Show();
 
     m_pPanel->setChildWindow(pSwap);
diff --git a/dbaccess/uiconfig/ui/detailwindow.ui b/dbaccess/uiconfig/ui/detailwindow.ui
index d07bca93a3ff..6942851383ad 100644
--- a/dbaccess/uiconfig/ui/detailwindow.ui
+++ b/dbaccess/uiconfig/ui/detailwindow.ui
@@ -11,40 +11,29 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">0</property>
-    <property name="spacing">6</property>
-    <property name="homogeneous">True</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkBox" id="box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkGrid">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="column_spacing">6</property>
+        <property name="border_width">12</property>
+        <property name="spacing">6</property>
+        <property name="homogeneous">True</property>
         <child>
-          <object class="GtkSeparator" id="separator">
+          <object class="GtkBox" id="box">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
             <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -53,108 +42,133 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkScrolledWindow">
+              <object class="GtkSeparator" id="separator">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="orientation">vertical</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="border_width">0</property>
-                <property name="shadow_type">in</property>
+                <property name="row_spacing">6</property>
                 <child>
-                  <object class="GtkViewport">
+                  <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="border_width">0</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkDrawingArea" id="preview">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkDrawingArea" id="infopreview">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
                         <child>
-                          <object class="GtkBox" id="tablepreview">
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <placeholder/>
+                              <object class="GtkDrawingArea" id="preview">
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkDrawingArea" id="infopreview">
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="tablepreview">
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="disablepreview">
-                <property name="label">label</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="no_show_all">True</property>
-                <property name="halign">end</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="popup">menu</property>
-                <property name="use_popover">False</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkMenuButton" id="disablepreview">
+                    <property name="label">label</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="no_show_all">True</property>
+                    <property name="halign">end</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="popup">menu</property>
+                    <property name="use_popover">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">0</property>
       </packing>
     </child>
   </object>
diff --git a/dbaccess/uiconfig/ui/taskwindow.ui b/dbaccess/uiconfig/ui/taskwindow.ui
index 1a9568e99ecc..a356a173d09d 100644
--- a/dbaccess/uiconfig/ui/taskwindow.ui
+++ b/dbaccess/uiconfig/ui/taskwindow.ui
@@ -17,73 +17,62 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">0</property>
-    <property name="spacing">6</property>
-    <property name="homogeneous">True</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkScrolledWindow">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
+        <property name="border_width">12</property>
+        <property name="spacing">6</property>
+        <property name="homogeneous">True</property>
         <child>
-          <object class="GtkTreeView" id="treeview">
+          <object class="GtkScrolledWindow">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="model">liststore1</property>
-            <property name="headers_visible">False</property>
-            <property name="search_column">1</property>
-            <property name="hover_selection">True</property>
-            <property name="enable_tree_lines">True</property>
-            <property name="activate_on_single_click">True</property>
-            <child internal-child="selection">
-              <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
-            </child>
             <child>
-              <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
-                  <attributes>
-                    <attribute name="pixbuf">0</attribute>
-                  </attributes>
+              <object class="GtkTreeView" id="treeview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="model">liststore1</property>
+                <property name="headers_visible">False</property>
+                <property name="search_column">1</property>
+                <property name="hover_selection">True</property>
+                <property name="enable_tree_lines">True</property>
+                <property name="activate_on_single_click">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
                 </child>
                 <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
+                      <attributes>
+                        <attribute name="pixbuf">0</attribute>
+                      </attributes>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
               </object>
             </child>
           </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="column_spacing">6</property>
-        <child>
-          <object class="GtkSeparator" id="separator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-          </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -92,18 +81,12 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkLabel" id="description">
+              <object class="GtkSeparator" id="separator">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="taskwindow|STR_DESCRIPTION">Description</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">helptext</property>
-                <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="orientation">vertical</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -111,36 +94,67 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="helptext">
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="wrap">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="helptext-atkobject">
-                    <property name="AtkObject::accessible-role" translatable="no">static</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="description">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="taskwindow|STR_DESCRIPTION">Description</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">helptext</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="helptext">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="wrap">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="helptext-atkobject">
+                        <property name="AtkObject::accessible-role">static</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">0</property>
       </packing>
     </child>
   </object>
diff --git a/dbaccess/uiconfig/ui/titlewindow.ui b/dbaccess/uiconfig/ui/titlewindow.ui
new file mode 100644
index 000000000000..c2a074412a63
--- /dev/null
+++ b/dbaccess/uiconfig/ui/titlewindow.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.36.0 -->
+<interface domain="dba">
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkBox" id="TitleWindow">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkScrolledWindow">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="vscrollbar_policy">never</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkGrid" id="titleparent">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkAlignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="title">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>