DLG_FILTER_SELECT and DLG_SIMPLE_NAME_CLASH conversion to .ui

Change-Id: I2a87330d73e2735a764296185f165a29f05b517c
Reviewed-on: https://gerrit.libreoffice.org/11040
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

14 files changed, 311 insertions, 262 deletions

diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index 89cfad0c630c..2cd36571b0e8 100644
--- a/uui/AllLangResTarget_uui.mk
+++ b/uui/AllLangResTarget_uui.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,uui/res,\
 $(eval $(call gb_SrsTarget_add_files,uui/res,\
 	uui/source/alreadyopen.src \
 	uui/source/filechanged.src \
-	uui/source/fltdlg.src \
 	uui/source/ids.src \
 	uui/source/lockfailed.src \
 	uui/source/nameclashdlg.src \
diff --git a/uui/UIConfig_uui.mk b/uui/UIConfig_uui.mk
index 076969b6d089..41dc9e5b8190 100644
--- a/uui/UIConfig_uui.mk
+++ b/uui/UIConfig_uui.mk
@@ -10,11 +10,13 @@
 $(eval $(call gb_UIConfig_UIConfig,uui))
 
 $(eval $(call gb_UIConfig_add_uifiles,uui,\
+	uui/uiconfig/ui/filterselect \
 	uui/uiconfig/ui/logindialog \
 	uui/uiconfig/ui/macrowarnmedium \
 	uui/uiconfig/ui/masterpassworddlg \
 	uui/uiconfig/ui/password \
 	uui/uiconfig/ui/setmasterpassworddlg \
+	uui/uiconfig/ui/simplenameclash \
 	uui/uiconfig/ui/sslwarndialog \
 	uui/uiconfig/ui/unknownauthdialog \
 ))
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 1fae82634eca..1d045fa40717 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -21,8 +21,6 @@
 
 #include "ids.hrc"
 
-#include "fltdlg.hrc"
-
 #include <com/sun/star/util/XStringWidth.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -45,20 +43,19 @@ namespace uui
     @seealso    method SetURL()
 
     @param      "pParentWindow"  , parent window for dialog
-    @param      "pResMgr"        , resource manager
     @threadsafe no
 *//*-*************************************************************************************************************/
-FilterDialog::FilterDialog( Window* pParentWindow ,
-                            ResMgr* pResMgr       )
-    :   ModalDialog  (pParentWindow, ResId( DLG_FILTER_SELECT, *pResMgr ) )
-    ,   m_ftURL      (this, ResId( FT_URL, *pResMgr))
-    ,   m_lbFilters  (this, ResId( LB_FILTERS, *pResMgr))
-    ,   m_btnOK      (this, ResId( BTN_OK, *pResMgr))
-    ,   m_btnCancel  (this, ResId( BTN_CANCEL, *pResMgr))
-    ,   m_btnHelp    (this, ResId( BTN_HELP, *pResMgr))
+FilterDialog::FilterDialog( Window* pParentWindow )
+    :   ModalDialog  (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" )
     ,   m_pFilterNames(NULL)
 {
-    FreeResource();
+    get(m_pFtURL, "url");
+    get(m_pLbFilters, "filters");
+    m_pFtURL->GetOutputSizePixel();
+    Size aSize(pParentWindow->LogicToPixel(Size(182, 175), MAP_APPFONT));
+    m_pLbFilters->set_height_request(aSize.Height());
+    m_pLbFilters->set_width_request(aSize.Width());
+    m_pFtURL->SetSizePixel(Size(aSize.Width(), m_pFtURL->GetOptimalSize().Height()));
 }
 
 /*-************************************************************************************************************
@@ -70,7 +67,7 @@ FilterDialog::FilterDialog( Window* pParentWindow ,
 void FilterDialog::SetURL( const OUString& sURL )
 {
     // convert it and use given pure string as fallback if conversion failed
-    m_ftURL.SetText( impl_buildUIFileName(sURL) );
+    m_pFtURL->SetText( impl_buildUIFileName(sURL) );
 }
 
 /*-************************************************************************************************************
@@ -93,14 +90,14 @@ void FilterDialog::SetURL( const OUString& sURL )
 void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
 {
     m_pFilterNames = pFilterNames;
-    m_lbFilters.Clear();
+    m_pLbFilters->Clear();
     if( m_pFilterNames != NULL )
     {
         for( FilterNameListPtr pItem  = m_pFilterNames->begin();
                                pItem != m_pFilterNames->end()  ;
                                ++pItem                         )
         {
-            m_lbFilters.InsertEntry( pItem->sUI );
+            m_pLbFilters->InsertEntry( pItem->sUI );
         }
     }
 }
@@ -131,10 +128,10 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
     {
         if( ModalDialog::Execute() == RET_OK )
         {
-            OUString sEntry = m_lbFilters.GetSelectEntry();
+            OUString sEntry = m_pLbFilters->GetSelectEntry();
             if( !sEntry.isEmpty() )
             {
-                int nPos = m_lbFilters.GetSelectEntryPos();
+                int nPos = m_pLbFilters->GetSelectEntryPos();
                 if( nPos < (int)(m_pFilterNames->size()) )
                 {
                     pSelectedItem  = m_pFilterNames->begin();
@@ -199,11 +196,11 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName )
     else
     {
         // otherwise its really a url ... build short name by using INetURLObject
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > xStringCalculator( new StringCalculator(&m_ftURL) );
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > xStringCalculator( new StringCalculator(m_pFtURL) );
         if( xStringCalculator.is() )
         {
             INetURLObject aBuilder   ( sName );
-            Size          aSize      = m_ftURL.GetOutputSize();
+            Size          aSize      = m_pFtURL->GetOutputSizePixel();
                           sShortName = aBuilder.getAbbreviated( xStringCalculator, aSize.Width(), INetURLObject::DECODE_UNAMBIGUOUS );
         }
     }
diff --git a/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc
deleted file mode 100644
index 552a10362af3..000000000000
--- a/uui/source/fltdlg.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef UUI_FLTDLG_HRC
-#define UUI_FLTDLG_HRC
-
-#define BTN_OK                      20
-#define BTN_CANCEL                  21
-#define BTN_HELP                    22
-
-#define FT_URL                      30
-#define LB_FILTERS                  31
-
-#endif /* UUI_FLTDLG_HRC */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index 9b0663376076..26ceb81b3cd5 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -46,8 +46,7 @@ class FilterDialog : public ModalDialog
 {
     // public interface
     public:
-             FilterDialog (       Window*            pParentWindow  ,
-                                  ResMgr*            pResMgr        );
+             FilterDialog (       Window*            pParentWindow  );
         void SetURL       ( const OUString&          sURL           );
         void ChangeFilters( const FilterNameList*    pFilterNames   );
         bool AskForFilter (       FilterNameListPtr& pSelectedItem  );
@@ -59,11 +58,8 @@ class FilterDialog : public ModalDialog
 
     // member
     private:
-              FixedText       m_ftURL       ;
-              ListBox         m_lbFilters   ;
-              OKButton        m_btnOK       ;
-              CancelButton    m_btnCancel   ;
-              HelpButton      m_btnHelp     ;
+              FixedText       *m_pFtURL       ;
+              ListBox         *m_pLbFilters   ;
         const FilterNameList* m_pFilterNames;
 
 };  // class FilterDialog
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
deleted file mode 100644
index 3379f8ce5865..000000000000
--- a/uui/source/fltdlg.src
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define __RSC
-
-#include "ids.hrc"
-#include "fltdlg.hrc"
-
-ModalDialog DLG_FILTER_SELECT
-{
-    HelpId      = HID_DLG_FILTER_SELECT ;
-    OutputSize  = TRUE ;
-    SVLook      = TRUE ;
-    Size        = MAP_APPFONT ( 250 , 200 ) ;
-    Moveable    = TRUE ;
-    Text [ en-US ] = "Filter Selection" ;
-
-    FixedText FT_URL
-    {
-        Pos       = MAP_APPFONT (   6 ,  6 ) ;
-        Size      = MAP_APPFONT ( 238 , 10 ) ;
-        WordBreak = FALSE ;
-    };
-
-    ListBox LB_FILTERS
-    {
-        HelpID = "uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS";
-        Border      = TRUE ;
-        Pos         = MAP_APPFONT (   6 ,  19 ) ;
-        Size        = MAP_APPFONT ( 182 , 175 ) ;
-        TabStop     = TRUE ;
-        Sort        = TRUE ;
-        AutoHScroll = TRUE;
-    };
-
-    OKButton BTN_OK
-    {
-        Pos         = MAP_APPFONT ( 194 , 19 ) ;
-        Size        = MAP_APPFONT (  50 , 14 ) ;
-        TabStop     = TRUE ;
-        DefButton   = TRUE ;
-    };
-
-    CancelButton BTN_CANCEL
-    {
-        Pos     = MAP_APPFONT ( 194 , 36 ) ;
-        Size    = MAP_APPFONT (  50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    HelpButton BTN_HELP
-    {
-        Pos     = MAP_APPFONT ( 194 , 56 ) ;
-        Size    = MAP_APPFONT (  50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index c43f0183fd8c..dc244161fc76 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -55,10 +55,8 @@ executeFilterDialog(
     {
         SolarMutexGuard aGuard;
 
-        boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-
         boost::scoped_ptr< uui::FilterDialog > xDialog(
-            new uui::FilterDialog(pParent, xManager.get()));
+            new uui::FilterDialog(pParent));
 
         xDialog->SetURL(rURL);
         xDialog->ChangeFilters(&rFilters);
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 2050beee583b..ce1fe5f634bb 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -25,8 +25,6 @@
 
 #define RID_KEEP_PASSWORD                               (RID_UUI_START +  0)
 #define RID_SAVE_PASSWORD                               (RID_UUI_START +  1)
-#define DLG_FILTER_SELECT                               (RID_UUI_START + 10)
-#define DLG_SIMPLE_NAME_CLASH                           (RID_UUI_START + 13)
 #define STR_ERROR_PASSWORDS_NOT_IDENTICAL               (RID_UUI_START + 13)
 #define STR_ERROR_MASTERPASSWORD_WRONG                  (RID_UUI_START + 14)
 // RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 65244d7f5dd6..bfa3994aa926 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -21,7 +21,6 @@
 #include <osl/file.hxx>
 
 #include "ids.hrc"
-#include "nameclashdlg.hrc"
 #include "nameclashdlg.hxx"
 
 // NameClashDialog ---------------------------------------------------------
@@ -29,10 +28,10 @@
 IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
 {
     long nRet = (long) ABORT;
-    if ( &maBtnRename == pBtn )
+    if ( m_pBtnRename == pBtn )
     {
         nRet = (long) RENAME;
-        OUString aNewName = maEDNewName.GetText();
+        OUString aNewName = m_pEDNewName->GetText();
         if ( ( aNewName == maNewName ) || aNewName.isEmpty() )
         {
             MessageDialog aError(NULL, maSameName);
@@ -41,7 +40,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
         }
         maNewName = aNewName;
     }
-    else if ( &maBtnOverwrite == pBtn )
+    else if ( m_pBtnOverwrite == pBtn )
         nRet = (long) OVERWRITE;
 
     EndDialog( nRet );
@@ -55,21 +54,19 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
                                   OUString const & rClashingName,
                                   OUString const & rProposedNewName,
                                   bool bAllowOverwrite )
-    : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ),
-    maFTMessage            ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ),
-    maEDNewName            ( this, ResId( EDIT_NEW_NAME, *pResMgr ) ),
-    maBtnOverwrite         ( this, ResId( BTN_OVERWRITE, *pResMgr ) ),
-    maBtnRename            ( this, ResId( BTN_RENAME, *pResMgr ) ),
-    maBtnCancel            ( this, ResId( BTN_CANCEL, *pResMgr ) ),
-    maBtnHelp              ( this, ResId( BTN_HELP, *pResMgr ) ),
+    : ModalDialog( pParent, "SimpleNameClashDialog", "uui/ui/simplenameclash.ui" ),
     maNewName              ( rClashingName )
 {
-    FreeResource();
+    get(m_pFTMessage, "warning");
+    get(m_pEDNewName, "newname");
+    get(m_pBtnOverwrite, "replace");
+    get(m_pBtnRename, "rename");
+    get(m_pBtnCancel, "cancel");
 
     Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) );
-    maBtnOverwrite.SetClickHdl( aLink );
-    maBtnRename.SetClickHdl( aLink );
-    maBtnCancel.SetClickHdl( aLink );
+    m_pBtnOverwrite->SetClickHdl( aLink );
+    m_pBtnRename->SetClickHdl( aLink );
+    m_pBtnCancel->SetClickHdl( aLink );
 
     OUString aInfo;
     if ( bAllowOverwrite )
@@ -79,7 +76,7 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
     else
     {
         aInfo = ResId(STR_NAME_CLASH_RENAME_ONLY, *pResMgr).toString();
-        maBtnOverwrite.Hide();
+        m_pBtnOverwrite->Hide();
     }
 
     OUString aPath;
@@ -90,11 +87,11 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
 
     aInfo = aInfo.replaceFirst( "%NAME", rClashingName );
     aInfo = aInfo.replaceFirst( "%FOLDER", aPath );
-    maFTMessage.SetText( aInfo );
+    m_pFTMessage->SetText( aInfo );
     if ( !rProposedNewName.isEmpty() )
-        maEDNewName.SetText( rProposedNewName );
+        m_pEDNewName->SetText( rProposedNewName );
     else
-        maEDNewName.SetText( rClashingName );
+        m_pEDNewName->SetText( rClashingName );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.hrc b/uui/source/nameclashdlg.hrc
deleted file mode 100644
index b19bca05ff16..000000000000
--- a/uui/source/nameclashdlg.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef UUI_NAMECLASHDLG_HRC
-#define UUI_NAMECLASHDLG_HRC
-
-#define FT_FILE_EXISTS_WARNING  20
-#define EDIT_NEW_NAME           21
-#define BTN_OVERWRITE           22
-#define BTN_RENAME              23
-#define BTN_CANCEL              24
-#define BTN_HELP                25
-
-#endif // UUI_NAMECLASHDLG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index 9ba5841ceabc..a6369a672f42 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -31,12 +31,12 @@ enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
 
 class NameClashDialog : public ModalDialog
 {
-    FixedText     maFTMessage;
-    Edit          maEDNewName;
-    PushButton    maBtnOverwrite;
-    PushButton    maBtnRename;
-    CancelButton  maBtnCancel;
-    HelpButton    maBtnHelp;
+    FixedText     *m_pFTMessage;
+    Edit          *m_pEDNewName;
+    PushButton    *m_pBtnOverwrite;
+    PushButton    *m_pBtnRename;
+    CancelButton  *m_pBtnCancel;
+
     OUString maSameName;
     OUString maNewName;
 
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
index 79e23fd4afed..3ffe2e41ad91 100644
--- a/uui/source/nameclashdlg.src
+++ b/uui/source/nameclashdlg.src
@@ -20,72 +20,6 @@
 #define __RSC
 
 #include "ids.hrc"
-#include "nameclashdlg.hrc"
-
-#define DLG_WIDTH       250
-#define DLG_HEIGHT       75
-#define BORDER_OFFSET     6
-#define EDIT_HEIGHT      12
-#define BTN_WIDTH        50
-#define BTN_HEIGHT       14
-
-ModalDialog DLG_SIMPLE_NAME_CLASH
-{
-    HelpId      = HID_DLG_SIMPLE_NAME_CLASH ;
-    OutputSize  = TRUE ;
-    SVLook      = TRUE ;
-    Size        = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
-    Moveable    = TRUE ;
-    Text [ en-US ] = "File Exists" ;
-
-    FixedText FT_FILE_EXISTS_WARNING
-    {
-        Pos       = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
-        Size      = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGHT - EDIT_HEIGHT - BTN_HEIGHT - 4*BORDER_OFFSET ) ;
-        WordBreak = TRUE ;
-    };
-
-    Edit EDIT_NEW_NAME
-    {
-        HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME";
-        Border      = TRUE ;
-        Pos         = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGHT - EDIT_HEIGHT - BTN_HEIGHT - 2*BORDER_OFFSET ) ;
-        Size        = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGHT ) ;
-    };
-
-    PushButton BTN_OVERWRITE
-    {
-        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE";
-        Pos         = MAP_APPFONT (  DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
-        Size        = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
-        TabStop     = TRUE ;
-        Text [ en-US ] = "Replace" ;
-    };
-
-    PushButton BTN_RENAME
-    {
-        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME";
-        Pos         = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
-        Size        = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
-        TabStop     = TRUE ;
-        Text [ en-US ] = "Rename" ;
-        DefButton   = TRUE ;
-    };
-
-    CancelButton BTN_CANCEL
-    {
-        Pos     = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
-        Size    = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
-        TabStop = TRUE ;
-    };
-
-    HelpButton BTN_HELP
-    {
-        Pos     = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
-        Size    = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
-        TabStop = TRUE ;
-    };
-};
 
 String STR_RENAME_OR_REPLACE
 {
diff --git a/uui/uiconfig/ui/filterselect.ui b/uui/uiconfig/ui/filterselect.ui
new file mode 100644
index 000000000000..7053bbde59fa
--- /dev/null
+++ b/uui/uiconfig/ui/filterselect.ui
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="FilterSelectDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Filter Selection</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="layout_style">start</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <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="fill">True</property>
+            <property name="pack_type">end</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>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="url">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTreeView" id="filters:border">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/uui/uiconfig/ui/simplenameclash.ui b/uui/uiconfig/ui/simplenameclash.ui
new file mode 100644
index 000000000000..18590bd20c4c
--- /dev/null
+++ b/uui/uiconfig/ui/simplenameclash.ui
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="SimpleNameClashDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">File Exists</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="replace">
+                <property name="label" translatable="yes">Replace</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="rename">
+                <property name="label" translatable="yes">Rename</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="warning">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="newname">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">help</action-widget>
+      <action-widget response="0">replace</action-widget>
+      <action-widget response="0">rename</action-widget>
+      <action-widget response="0">cancel</action-widget>
+    </action-widgets>
+  </object>
+</interface>