diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
index a77d8818b47..c0c66db5fe4 100644
--- a/libs/widgets/CMakeLists.txt
+++ b/libs/widgets/CMakeLists.txt
@@ -1,189 +1,176 @@
 add_subdirectory( tests )
 add_subdirectory( pics )
 
 include_directories(${KOTEXT_INCLUDES} ${KOODF_INCLUDES} ${PIGMENT_INCLUDES})
 include_directories(${CMAKE_SOURCE_DIR}/libs/widgetutils)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 if (LIBATTICA_FOUND)
     include_directories(${LIBATTICA_INCLUDE_DIR})
 endif ()
 
 set(kowidgets_LIB_SRCS
     KoGradientEditWidget.cpp
     KoResourcePaths.cpp
     KoVBox.cpp
     KoDialog.cpp
     KoGlobal.cpp
     KoZoomWidget.cpp
     KoTagToolButton.cpp
     KoTagChooserWidget.cpp
     KoTagFilterWidget.cpp
     KoResourceTaggingManager.cpp
     KoResourceItemChooserContextMenu.cpp
     KoAspectButton.cpp
     KoCsvImportDialog.cpp
     KoPageLayoutDialog.cpp
     KoPageLayoutWidget.cpp
     KoPagePreviewWidget.cpp
     KoPositionSelector.cpp
     KoSliderCombo.cpp
     KoColorPopupButton.cpp
     KoConfigAuthorPage.cpp
     KoUnitDoubleSpinBox.cpp
     KoZoomAction.cpp
     KoZoomController.cpp
     KoZoomInput.cpp
     KoZoomHandler.cpp
     KoZoomMode.cpp
     KoDpi.cpp
     KoGlobal.cpp
-    KoFileDialog.cpp
     KoColorPatch.cpp
     KoColorPopupAction.cpp
     KoColorSetWidget.cpp
     KoColorSlider.cpp
     KoDualColorButton.cpp
     KoEditColorSetDialog.cpp
     KoTriangleColorSelector.cpp
     KoResourcePopupAction.cpp
     KoStrokeConfigWidget.cpp
     KoFillConfigWidget.cpp
     KoShadowConfigWidget.cpp
     KoIconToolTip.cpp
     KoResourceItemChooser.cpp
     KoResourceItemChooserSync.cpp
     KoResourceSelector.cpp
     KoResourceModel.cpp
     KoResourceItemDelegate.cpp
     KoResourceItemView.cpp
     KoResourceTagStore.cpp
     KoRuler.cpp
     KoRulerController.cpp
     KoItemToolTip.cpp
     KoCheckerBoardPainter.cpp
     KoResourceServerAdapter.cpp
     KoResourceServerProvider.cpp
     KoLineStyleSelector.cpp
     KoLineStyleItemDelegate.cpp
     KoLineStyleModel.cpp
     KoMarkerModel.cpp
     KoMarkerItemDelegate.cpp
     KoMarkerSelector.cpp
     KoDockWidgetTitleBar.cpp
     KoDockWidgetTitleBarButton.cpp
     KoViewItemContextBar.cpp
     KoContextBarButton.cpp
     KoResourceFiltering.cpp
     KoResourceModelBase.cpp
 
     KoToolBoxButton.cpp
     KoToolBox.cpp
     KoToolBoxDocker.cpp
     KoToolBoxFactory.cpp
     KoToolDocker.cpp
     
     KoModeBox.cpp
     KoModeBoxDocker.cpp
     KoModeBoxFactory.cpp
 
     KoDocumentInfoDlg.cpp
     KoDocumentInfoPropsPage.cpp
 
     KoGlobal.cpp
     KoTableView.cpp
     
     KoIconUtils.cpp
 
     WidgetsDebug.cpp
 
 )
 
 ki18n_wrap_ui( kowidgets_LIB_SRCS
     KoConfigAuthorPage.ui
     KoCsvImportDialog.ui
     koDocumentInfoAboutWidget.ui
     koDocumentInfoAuthorWidget.ui
     KoEditColorSet.ui
     KoPageLayoutWidget.ui
     KoShadowConfigWidget.ui
 )
 
 
 add_library(kowidgets SHARED ${kowidgets_LIB_SRCS})
 generate_export_header(kowidgets BASE_NAME kowidgets)
 
 target_link_libraries(kowidgets kotext pigmentcms kowidgetutils KF5::GuiAddons KF5::WidgetsAddons KF5::ConfigCore KF5::Codecs KF5::IconThemes )
 
 if(GHNS)
     target_link_libraries(kowidgets KF5::NewStuff)
 endif ()
 
 if(X11_FOUND)
     target_link_libraries(kowidgets Qt5::X11Extras ${X11_LIBRARIES})
 endif()
 
 
 target_link_libraries(kowidgets LINK_INTERFACE_LIBRARIES kotext pigmentcms kowidgetutils)
 
 set_target_properties(kowidgets PROPERTIES
     VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
 )
 
 install(TARGETS kowidgets  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install( FILES
     KoGlobal.h
     KoResourceItemChooserContextMenu.h
     KoGenericRegistryModel.h
     KoPageLayoutDialog.h
     KoPageLayoutWidget.h
     KoPagePreviewWidget.h
     KoPositionSelector.h
     ${CMAKE_CURRENT_BINARY_DIR}/kowidgets_export.h
     KoZoomAction.h
     KoZoomController.h
     KoZoomInput.h
     KoDpi.h
     KoZoomHandler.h
     KoZoomMode.h
     KoGlobal.h
-    KoFileDialog.h
     KoColorPatch.h
     KoStrokeConfigWidget.h
     KoFillConfigWidget.h
     KoShadowConfigWidget.h
     KoColorPopupAction.h
     KoColorSetWidget.h
     KoColorSlider.h
     KoDualColorButton.h
     KoEditColorSetDialog.h
     KoTriangleColorSelector.h
     KoResourceItemChooser.h
     KoResourceSelector.h
     KoResourceServer.h
     KoResourceServerAdapter.h
     KoResourceServerObserver.h
     KoResourceServerProvider.h
     KoResourceTagStore.h
     KoLineStyleSelector.h
     KoDockWidgetTitleBar.h
     KoDockWidgetTitleBarButton.h
 
     KoResourceModelBase.h
 
     KoGlobal.h
 
     DESTINATION
     ${INCLUDE_INSTALL_DIR}/calligra
 COMPONENT Devel)
-
-set(filedialogtester_SRCS
-    KoFileDialogTester.cpp
-    main.cpp
-)
-ki18n_wrap_ui(filedialogtester_SRCS
-    KoFileDialogTester.ui
-)
-
-add_executable(filedialogtester ${filedialogtester_SRCS})
-target_link_libraries(filedialogtester kowidgets)
diff --git a/libs/widgets/main.cpp b/libs/widgets/main.cpp
deleted file mode 100644
index eb6861fa077..00000000000
--- a/libs/widgets/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "KoFileDialogTester.h"
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    KoFileDialogTester w;
-    w.show();
-    
-    return a.exec();
-}
diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
index 4ede32d8878..01f079630a8 100644
--- a/libs/widgetutils/CMakeLists.txt
+++ b/libs/widgetutils/CMakeLists.txt
@@ -1,36 +1,38 @@
 add_subdirectory(tests)
 
 set(kowidgetutils_LIB_SRCS
     KoGroupButton.cpp
     KoProgressBar.cpp
     KoProgressUpdater.cpp
     KoUpdater.cpp
     KoUpdaterPrivate_p.cpp
     KoProperties.cpp
+    KoFileDialog.cpp
 )
 
 
 add_library(kowidgetutils SHARED ${kowidgetutils_LIB_SRCS})
 generate_export_header(kowidgetutils BASE_NAME kowidgetutils)
 
 # KDE is only used for i18n
 target_link_libraries(kowidgetutils Qt5::Core Qt5::Gui Qt5::Xml Qt5::Widgets KF5::I18n)
 target_link_libraries(kowidgetutils LINK_INTERFACE_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
 
 set_target_properties(kowidgetutils
     PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
 )
 
 install(TARGETS kowidgetutils ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
     KoGroupButton.h
     KoProgressBar.h
     KoProgressProxy.h
     KoProgressUpdater.h
     KoUpdater.h
     KoProperties.h
+    KoFileDialog.h
     ${CMAKE_CURRENT_BINARY_DIR}/kowidgetutils_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/calligra
     COMPONENT Devel
 )
diff --git a/libs/widgets/KoFileDialog.cpp b/libs/widgetutils/KoFileDialog.cpp
similarity index 100%
rename from libs/widgets/KoFileDialog.cpp
rename to libs/widgetutils/KoFileDialog.cpp
diff --git a/libs/widgets/KoFileDialog.h b/libs/widgetutils/KoFileDialog.h
similarity index 98%
rename from libs/widgets/KoFileDialog.h
rename to libs/widgetutils/KoFileDialog.h
index 7562aaf0f26..4b69e4fb2ec 100644
--- a/libs/widgets/KoFileDialog.h
+++ b/libs/widgetutils/KoFileDialog.h
@@ -1,155 +1,155 @@
 /* This file is part of the KDE project
    Copyright (C) 2013 - 2014 Yue Liu <yue.liu@mail.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #ifndef KOFILEDIALOG_H
 #define KOFILEDIALOG_H
 
-#include "kowidgets_export.h"
+#include "kowidgetutils_export.h"
 
 #include <QFileDialog>
 #include <QString>
 #include <QUrl>
 #include <QStringList>
 #include <QList>
 
 
 /**
  * Wrapper around QFileDialog providing native file dialogs
  * on KDE/Gnome/Windows/OSX/etc.
  */
-class KOWIDGETS_EXPORT KoFileDialog : public QObject
+class KOWIDGETUTILS_EXPORT KoFileDialog : public QObject
 {
     Q_OBJECT
 
 public:
     enum DialogType {
         OpenFile,
         OpenFiles,
         OpenDirectory,
         ImportFile,
         ImportFiles,
         ImportDirectory,
         SaveFile
     };
 
     /**
      * @brief constructor
      * @param parent The parent of the file dialog
      * @param dialogType usage of the file dialog
      * @param dialogName the name for the file dialog. This will be used to open
      * the filedialog in the last open location, instead the specified directory.
      *
      * @return The name of the entry user selected in the file dialog
      *
      */
     KoFileDialog(QWidget *parent,
                  KoFileDialog::DialogType type,
                  const QString &dialogName);
 
     ~KoFileDialog();
 
     void setCaption(const QString &caption);
 
     /**
      * @brief setDefaultDir set the default directory to defaultDir
      *
      * @param defaultDir a path to a file or directory
      */
     void setDefaultDir(const QString &defaultDir, bool override = false);
 
     /**
      * @brief setOverrideDir override both the default dir and the saved dir found by dialogName
      * @param overrideDir a path to a file or directory
      */
     void setOverrideDir(const QString &overrideDir);
 
     /**
      * @brief setImageFilters sets the name filters for the file dialog to all
      * image formats Qt's QImageReader supports.
      */
     void setImageFilters();
 
     void setNameFilter(const QString &filter);
 
     /**
      * @brief setNameFilters set a list of description/extension pairs.
      *
      * These are not registered mimetypes. In contrast with Qt's filedialog namefilters,
      * you can only have _one_ pair per line. I.e.
      *
      * Gif Image (*gif)
      * Tiff Image (*tif)
      *
      * And NOT Images (*gif *tif)
      *
      * @param filterList
      * @param defaultFilter
      */
     void setNameFilters(const QStringList &filterList,
                         QString defaultFilter = QString());
     void setMimeTypeFilters(const QStringList &filterList,
                             QString defaultFilter = QString());
     void setHideNameFilterDetailsOption();
 
     QStringList nameFilters() const;
 
     QStringList filenames();
     QString filename();
 
     /**
      * @brief selectedNameFilter returns the name filter the user selected, either
      *    directory or by clicking on it.
      * @return
      */
     QString selectedNameFilter() const;
 
     QString selectedMimeType() const;
 
 private Q_SLOTS:
 
     void filterSelected(const QString &filter);
 
 private:
     /**
      * @brief splitNameFilter take a single line of a QDialog name filter and split it
      *   into several lines. This is needed because a single line name filter can contain
      *   more than one mimetype, making it impossible to figure out the correct extension.
      *
      *   The methods takes care of some duplicated extensions, like jpeg and jpg.
      * @param nameFilter the namefilter to be split
      * @param mimeList a pointer to the list with mimes that shouldn't be added.
      * @return a stringlist of all name filters.
      */
     static QStringList splitNameFilter(const QString &nameFilter, QStringList *mimeList);
 
     void createFileDialog();
 
     QString getUsedDir(const QString &dialogName);
     void saveUsedDir(const QString &fileName, const QString &dialogName);
 
     const QStringList getFilterStringListFromMime(const QStringList &mimeList,
                                                   bool withAllSupportedEntry = false);
 
 
 
     class Private;
     Private * const d;
 };
 
 #endif /* KOFILEDIALOG_H */
diff --git a/libs/widgetutils/tests/CMakeLists.txt b/libs/widgetutils/tests/CMakeLists.txt
index a11f3f47658..326970f4358 100644
--- a/libs/widgetutils/tests/CMakeLists.txt
+++ b/libs/widgetutils/tests/CMakeLists.txt
@@ -1,9 +1,15 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/libs/widgetutils )
 
 ########### next target ###############
 
 set(kopropertiestest_SRCS KoPropertiesTest.cpp )
 kde4_add_unit_test(KoPropertiesTest TESTNAME libs-widgetutils-KoPropertiesTest ${kopropertiestest_SRCS})
 target_link_libraries(KoPropertiesTest  kowidgetutils KF5::I18n Qt5::Test)
 
+########### next target ###############
+
+set(kofiledialogtester_SRCS KoFileDialogTester.cpp)
+qt5_wrap_ui(kofiledialogtester_SRCS KoFileDialogTester.ui)
+add_executable(kofiledialogtester ${kofiledialogtester_SRCS})
+target_link_libraries(kofiledialogtester kowidgetutils)
diff --git a/libs/widgets/KoFileDialogTester.cpp b/libs/widgetutils/tests/KoFileDialogTester.cpp
similarity index 95%
rename from libs/widgets/KoFileDialogTester.cpp
rename to libs/widgetutils/tests/KoFileDialogTester.cpp
index a1b63c96224..667f0adf395 100644
--- a/libs/widgets/KoFileDialogTester.cpp
+++ b/libs/widgetutils/tests/KoFileDialogTester.cpp
@@ -1,328 +1,338 @@
 /* This file is part of the KDE project
  * Copyright (C) Boudewijn Rempt <boud@valdyas.org>, (C) 2014
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include "KoFileDialogTester.h"
 
+#include "KoFileDialogTester.h"
 #include "ui_KoFileDialogTester.h"
 
+#include <QApplication>
 #include <QDesktopServices>
 #include <QListWidget>
 #include <QCheckBox>
 #include <QRadioButton>
 
 #include <KoFileDialog.h>
 
 KoFileDialogTester::KoFileDialogTester(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::KoFileDialogTester)
 {
     ui->setupUi(this);
 
     connect(ui->bnOpenFile, SIGNAL(clicked()), SLOT(testOpenFile()));
     connect(ui->bnOpenFiles, SIGNAL(clicked()), SLOT(testOpenFiles()));
     connect(ui->bnOpenDirectory, SIGNAL(clicked()), SLOT(testOpenDirectory()));
     connect(ui->bnImportFile, SIGNAL(clicked()), SLOT(testImportFile()));
     connect(ui->bnImportFiles, SIGNAL(clicked()), SLOT(testImportFiles()));
     connect(ui->bnImportDirectory, SIGNAL(clicked()), SLOT(testImportDirectory()));
     connect(ui->bnSaveFile, SIGNAL(clicked()), SLOT(testSaveFile()));
 
     m_nameFilters << "Documents (*.odt *.doc *.txt)"
                 << "Images (*.png *.jpg *.jpeg)"
                 << "Presentations (*.ppt *.odp)"
                 << "Patterns (*.pat *.jpg *.gif *.png *.tif *.xpm *.bmp)"
                 << "Palettes (*.gpl *.pal *.act *.aco *.colors)";
 
     m_mimeFilter = QStringList()
             << "application/x-krita" << "image/x-exr" << "image/openraster" << "image/x-tga" << "image/vnd.adobe.photoshop"
             << "image/x-xcf" << "image/x-portable-pixmap" << "image/x-portable-graymap"
             << "image/x-portable-bitmap" << "image/png" << "image/jp2"
             << "image/tiff" << "application/vnd.oasis.opendocument.graphics"
             << "application/pdf" << "image/jpeg" << "image/bmp" << "image/x-xpixmap"
             << "image/gif" << "image/x-xbitmap" << "application/x-krita-flipbook"
             << "image/x-adobe-dng" << "image/x-xfig" << "image/svg+xml" << "image/svg+xml-compressed"
             << "image/x-eps" << "image/eps" << "application/eps" << "application/x-eps" << "application/postscript"
             << "image/x-wmf" << "application/x-karbon"
             << "image/tiff" << "application/vnd.oasis.opendocument.graphics"
             ;
 }
 
 KoFileDialogTester::~KoFileDialogTester()
 {
     delete ui;
 }
 
 
 
 void KoFileDialogTester::testOpenFile()
 {
     ui->listResults->clear();
     KoFileDialog dlg(this, KoFileDialog::OpenFile, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: OpenFile"));
+    dlg.setCaption("Testing: OpenFile");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
     }
     else {
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QString url = dlg.filename();
     ui->listResults->addItem(url);
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 
 }
 
 void KoFileDialogTester::testOpenFiles()
 {
     ui->listResults->clear();
     KoFileDialog dlg(this, KoFileDialog::OpenFiles, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: OpenFile"));
+    dlg.setCaption("Testing: OpenFile");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
           if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
 
     }
     else {
            if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QStringList urls = dlg.filenames();
     foreach(const QString &url, urls) {
         ui->listResults->addItem(url);
     }
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
 
 void KoFileDialogTester::testOpenDirectory()
 {
     ui->listResults->clear();
     KoFileDialog dlg(this, KoFileDialog::OpenDirectory, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: OpenDirectory"));
+    dlg.setCaption("Testing: OpenDirectory");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
          if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
 
     }
     else {
          if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QString url = dlg.filename();
     ui->listResults->addItem(url);
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
 
 
 void KoFileDialogTester::testImportFile()
 {
     ui->listResults->clear();
 
     KoFileDialog dlg(this, KoFileDialog::ImportFile, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: ImportFile"));
+    dlg.setCaption("Testing: ImportFile");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
          if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
 
     }
     else {
 
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QString url = dlg.filename();
     ui->listResults->addItem(url);
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
 
 void KoFileDialogTester::testImportFiles()
 {
     ui->listResults->clear();
     KoFileDialog dlg(this, KoFileDialog::ImportFiles, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: ImportFiles"));
+    dlg.setCaption("Testing: ImportFiles");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
          if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
 
     }
     else {
 
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QStringList urls = dlg.filenames(); foreach(const QString &url, urls) {
         ui->listResults->addItem(url);
     }
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
 
 void KoFileDialogTester::testImportDirectory()
 {
     ui->listResults->clear();
     KoFileDialog dlg(this, KoFileDialog::ImportDirectory, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: Import Directory"));
+    dlg.setCaption("Testing: Import Directory");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
 
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
 
     }
     else {
             if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QString url = dlg.filename();
     ui->listResults->addItem(url);
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
 
 void KoFileDialogTester::testSaveFile()
 {
     ui->listResults->clear();
 
     KoFileDialog dlg(this, KoFileDialog::SaveFile, ui->txtUniqueKey->text());
-    dlg.setCaption(i18n("Testing: SaveFile"));
+    dlg.setCaption("Testing: SaveFile");
     dlg.setDefaultDir(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (ui->radioName->isChecked()) {
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setNameFilters(m_nameFilters, m_nameFilters.last());
         }
         else {
             dlg.setNameFilters(m_nameFilters);
         }
     }
     else {
 
         if (ui->chkSetDefaultFilter->isChecked()) {
             dlg.setMimeTypeFilters(m_mimeFilter, m_mimeFilter[4]);
         }
         else {
             dlg.setMimeTypeFilters(m_mimeFilter);
         }
 
     }
 
     if (ui->chkHideNameFilterDetailsOption->isChecked()) {
         dlg.setHideNameFilterDetailsOption();
     }
 
     QString url = dlg.filename();
     ui->listResults->addItem(url);
     ui->lblMime->setText(dlg.selectedMimeType());
     ui->txtFilter->setText(dlg.selectedNameFilter());
 }
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    KoFileDialogTester w;
+    w.show();
+
+    return a.exec();
+}
diff --git a/libs/widgets/KoFileDialogTester.h b/libs/widgetutils/tests/KoFileDialogTester.h
similarity index 100%
rename from libs/widgets/KoFileDialogTester.h
rename to libs/widgetutils/tests/KoFileDialogTester.h
diff --git a/libs/widgets/KoFileDialogTester.ui b/libs/widgetutils/tests/KoFileDialogTester.ui
similarity index 99%
rename from libs/widgets/KoFileDialogTester.ui
rename to libs/widgetutils/tests/KoFileDialogTester.ui
index acd67cd88b8..85c6accb9eb 100644
--- a/libs/widgets/KoFileDialogTester.ui
+++ b/libs/widgetutils/tests/KoFileDialogTester.ui
@@ -1,214 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KoFileDialogTester</class>
  <widget class="QWidget" name="KoFileDialogTester">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>355</width>
     <height>396</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="9" column="1">
     <widget class="QLabel" name="lblMime">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="8" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QPushButton" name="bnOpenFile">
      <property name="text">
       <string>Open File</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QPushButton" name="bnOpenFiles">
      <property name="text">
       <string>Open Files</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Unique key:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="txtUniqueKey">
        <property name="text">
         <string>blablabla</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="4" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Filter:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="txtFilter">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>TextLabel</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="5" column="1" rowspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Results:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QListWidget" name="listResults"/>
      </item>
     </layout>
    </item>
    <item row="1" column="1" rowspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Filter Type</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QRadioButton" name="radioMime">
         <property name="text">
          <string>Mime</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="radioName">
         <property name="text">
          <string>Named</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkHideNameFilterDetailsOption">
         <property name="text">
-         <string>hide name filter details option</string>
+         <string>Hide name filter details option</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="chkSetDefaultFilter">
         <property name="text">
          <string>Set default filter</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QPushButton" name="bnSaveFile">
      <property name="text">
       <string>Save File</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QPushButton" name="bnImportFiles">
      <property name="text">
       <string>Import Files</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QPushButton" name="bnImportFile">
      <property name="text">
       <string>Import File</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QPushButton" name="bnOpenDirectory">
      <property name="text">
       <string>Open Directory</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QPushButton" name="bnImportDirectory">
      <property name="text">
       <string>Import Directory</string>
      </property>
     </widget>
    </item>
   </layout>
   <zorder>bnImportFile</zorder>
   <zorder>bnOpenFile</zorder>
   <zorder>bnOpenFiles</zorder>
   <zorder>bnOpenDirectory</zorder>
   <zorder>bnImportFiles</zorder>
   <zorder>bnImportDirectory</zorder>
   <zorder>bnSaveFile</zorder>
   <zorder>groupBox</zorder>
   <zorder>lblMime</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>