Skip to content

Commit

Permalink
Sarting Configuration Wizard (issue 3393)
Browse files Browse the repository at this point in the history 
By the WikiLab team (https://lab.wiki.br/)
  • Loading branch information
@silasdb
silasdb committed Aug 3, 2018
1 parent 53c2058 commit 96698ad
Show file tree
Hide file tree
Showing 5 changed files with 185 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/Gui/Application.cpp
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/Gui/CMakeLists.txt
View file
Expand Up @@ -205,6 +205,7 @@ set(Gui_MOC_HDRS
DlgActivateWindowImp.h
DlgUnitsCalculatorImp.h
DlgCommandsImp.h
DlgConfigurationWizardImp.h
DlgCustomizeImp.h
DlgCustomizeSpaceball.h
DlgCustomizeSpNavSettings.h
Expand Down Expand Up @@ -326,6 +327,7 @@ SET(Gui_UIC_SRCS
DlgAuthorization.ui
DlgChooseIcon.ui
DlgCommands.ui
DlgConfigurationWizard.ui
DlgCustomizeSpNavSettings.ui
DlgDisplayProperties.ui
DlgEditor.ui
Expand Down Expand Up @@ -1085,6 +1087,7 @@ SET(FreeCADGui_CPP_SRCS
ApplicationPy.cpp
AutoSaver.cpp
BitmapFactory.cpp
DlgConfigurationWizardImp.cpp
Document.cpp
DocumentModel.cpp
DocumentPyImp.cpp
Expand All @@ -1111,6 +1114,7 @@ SET(FreeCADGui_SRCS
Application.h
AutoSaver.h
BitmapFactory.h
DlgConfigurationWizardImp.h
Document.h
DocumentModel.h
DocumentObserver.h
Expand Down
131 changes: 131 additions & 0 deletions src/Gui/DlgConfigurationWizard.ui
View file
@@ -0,0 +1,131 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgConfigurationWizard</class>
<widget class="QDialog" name="Gui::Dialog::DlgConfigurationWizard">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>560</width>
<height>454</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>9</x>
<y>418</y>
<width>541</width>
<height>27</height>
</rect>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>541</width>
<height>401</height>
</rect>
</property>
<layout class="QHBoxLayout" name="_3">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="logo">
<property name="enabled">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text">
<string>Teste teste teste</string>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="tabWidgetStack_3">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>9</x>
<y>9</y>
<width>401</width>
<height>371</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Welcome</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>GUI Language</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_3"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Mouse behaviour</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_2"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default Unit</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox"/>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>
17 changes: 17 additions & 0 deletions src/Gui/DlgConfigurationWizardImp.cpp
View file
@@ -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"
26 changes: 26 additions & 0 deletions src/Gui/DlgConfigurationWizardImp.h
View file
@@ -0,0 +1,26 @@
#ifndef GUI_DIALOG_DLGCONFIGURATIONWIZARDIMP_H
#define GUI_DIALOG_DLGCONFIGURATIONWIZARDIMP_H

#include <QDialog>

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

0 comments on commit 96698ad

Please sign in to comment.