diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 0ede49bef5a4..5fef36d52e41 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -119,6 +119,8 @@
#include "ViewProviderTextDocument.h"
#include "ViewProviderGroupExtension.h"
+#include "DlgConfigurationWizardImp.h"
+
#include "Language/Translator.h"
#include "TaskView/TaskView.h"
#include "TaskView/TaskDialogPython.h"
@@ -1836,6 +1838,11 @@ void Application::runApplication(void)
// stop splash screen and set immediately the active window that may be of interest
// for scripts using Python binding for Qt
mw.stopSplasher();
+
+ // shows the configuration wizard
+ Gui::Dialog::DlgConfigurationWizardImp dlgConfigWizard(&mw);
+ dlgConfigWizard.exec();
+
mainApp.setActiveWindow(&mw);
// Activate the correct workbench
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index a37188eefa76..804ddcad2baa 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -205,6 +205,7 @@ set(Gui_MOC_HDRS
DlgActivateWindowImp.h
DlgUnitsCalculatorImp.h
DlgCommandsImp.h
+ DlgConfigurationWizardImp.h
DlgCustomizeImp.h
DlgCustomizeSpaceball.h
DlgCustomizeSpNavSettings.h
@@ -326,6 +327,7 @@ SET(Gui_UIC_SRCS
DlgAuthorization.ui
DlgChooseIcon.ui
DlgCommands.ui
+ DlgConfigurationWizard.ui
DlgCustomizeSpNavSettings.ui
DlgDisplayProperties.ui
DlgEditor.ui
@@ -1085,6 +1087,7 @@ SET(FreeCADGui_CPP_SRCS
ApplicationPy.cpp
AutoSaver.cpp
BitmapFactory.cpp
+ DlgConfigurationWizardImp.cpp
Document.cpp
DocumentModel.cpp
DocumentPyImp.cpp
@@ -1111,6 +1114,7 @@ SET(FreeCADGui_SRCS
Application.h
AutoSaver.h
BitmapFactory.h
+ DlgConfigurationWizardImp.h
Document.h
DocumentModel.h
DocumentObserver.h
diff --git a/src/Gui/DlgConfigurationWizard.ui b/src/Gui/DlgConfigurationWizard.ui
new file mode 100644
index 000000000000..08a2af2e6e5c
--- /dev/null
+++ b/src/Gui/DlgConfigurationWizard.ui
@@ -0,0 +1,131 @@
+
+
+ Gui::Dialog::DlgConfigurationWizard
+
+
+
+ 0
+ 0
+ 560
+ 454
+
+
+
+
+ 0
+ 0
+
+
+
+ Dialog
+
+
+
+
+ 9
+ 418
+ 541
+ 27
+
+
+
+ QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset
+
+
+
+
+
+ 10
+ 10
+ 541
+ 401
+
+
+
+
+ 6
+
+
+ 0
+
+ -
+
+
+ true
+
+
+ QFrame::Box
+
+
+ Teste teste teste
+
+
+
+ -
+
+
+ 0
+
+
+
+
+
+ 9
+ 9
+ 401
+ 371
+
+
+
+
-
+
+
+ Welcome
+
+
+
+ -
+
+
-
+
+
+ GUI Language
+
+
+
+ -
+
+
+ -
+
+
+ Mouse behaviour
+
+
+
+ -
+
+
+ -
+
+
+ Default Unit
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Gui/DlgConfigurationWizardImp.cpp b/src/Gui/DlgConfigurationWizardImp.cpp
new file mode 100644
index 000000000000..2c041e68be15
--- /dev/null
+++ b/src/Gui/DlgConfigurationWizardImp.cpp
@@ -0,0 +1,17 @@
+#include "PreCompiled.h"
+#include "DlgConfigurationWizardImp.h"
+#include "ui_DlgConfigurationWizard.h"
+
+using namespace Gui::Dialog;
+
+DlgConfigurationWizardImp::DlgConfigurationWizardImp(QWidget* parent, Qt::WindowFlags fl)
+ : QDialog(parent, fl), ui(new Ui_DlgConfigurationWizard)
+{
+ ui->setupUi(this);
+}
+
+DlgConfigurationWizardImp::~DlgConfigurationWizardImp()
+{
+}
+
+#include "moc_DlgConfigurationWizardImp.cpp"
diff --git a/src/Gui/DlgConfigurationWizardImp.h b/src/Gui/DlgConfigurationWizardImp.h
new file mode 100644
index 000000000000..766017b65c2b
--- /dev/null
+++ b/src/Gui/DlgConfigurationWizardImp.h
@@ -0,0 +1,26 @@
+#ifndef GUI_DIALOG_DLGCONFIGURATIONWIZARDIMP_H
+#define GUI_DIALOG_DLGCONFIGURATIONWIZARDIMP_H
+
+#include
+
+namespace Gui {
+namespace Dialog {
+
+class Ui_DlgConfigurationWizard;
+
+class GuiExport DlgConfigurationWizardImp : public QDialog
+{
+ Q_OBJECT
+
+public:
+ DlgConfigurationWizardImp(QWidget* parent = 0, Qt::WindowFlags fl = 0);
+ ~DlgConfigurationWizardImp();
+
+private:
+ Ui_DlgConfigurationWizard* ui;
+};
+
+} // namespace Dialog
+} // namespace Gui
+
+#endif // GUI_DIALOG_DLGCONFIGURATIONWIZARDIMP_H