convert gallery search progress dialog to .ui

Change-Id: I77d9530ebc6529d87e2484c8440794e246aab5b9

2 files changed, 9 insertions, 51 deletions

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a81dbd8201e6..b49e8a57a1e9 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -204,17 +204,16 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
 // - SearchProgress -
 // ------------------
 
-SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) :
-    ModalDialog     ( pParent, CUI_RES(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
-    aFtSearchDir    ( this, CUI_RES( FT_SEARCH_DIR ) ),
-    aFLSearchDir   ( this, CUI_RES( FL_SEARCH_DIR ) ),
-    aFtSearchType   ( this, CUI_RES( FT_SEARCH_TYPE ) ),
-    aFLSearchType  ( this, CUI_RES( FL_SEARCH_TYPE ) ),
-    aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
-    parent_(pParent), startUrl_(rStartURL)
+SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL )
+    : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
+    , parent_(pParent)
+    , startUrl_(rStartURL)
 {
-    FreeResource();
-    aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
+    get(m_pFtSearchDir, "dir");
+    get(m_pFtSearchType, "file");
+    m_pFtSearchType->set_width_request(m_pFtSearchType->get_preferred_size().Width());
+    get(m_pBtnCancel, "cancel");
+    m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
 }
 
 // ------------------------------------------------------------------------
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index cba3d941f030..a80d60448d0e 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -219,47 +219,6 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
 
 /******************************************************************************/
 
-ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
-{
-    HelpId = HID_GALLERY_SEARCH ;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 124 , 86 ) ;
-    Text [ en-US ] = "Find" ;
-    Moveable = TRUE ;
-    FixedLine FL_SEARCH_DIR
-    {
-        Pos = MAP_APPFONT ( 6 , 33 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "Directory" ;
-    };
-    FixedText FT_SEARCH_DIR
-    {
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 37 , 66 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_SEARCH_TYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "File type" ;
-    };
-    FixedText FT_SEARCH_TYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-    };
-};
-
-/******************************************************************************/
-
 ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
 {
     HelpId = HID_GALLERY_APPLY ;