kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: [skip ci] include generated ui files from within source file

Browse Source
This commit is contained in:
wmayer
2020-11-15 13:17:52 +01:00
parent bfa2ac9d31
commit d8a36bc1b2
2 changed files with 559 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1104
src/Mod/Part/Gui/DlgPrimitives.cpp
View File

File diff suppressed because it is too large Load Diff

9
src/Mod/Part/Gui/DlgPrimitives.h
View File

@@ -23,12 +23,11 @@
#ifndef PARTGUI_DLGPRIMITIVES_H
#define PARTGUI_DLGPRIMITIVES_H
#include <memory>
#include <QEventLoop>
#include <QPointer>
#include <App/DocumentObserver.h>
#include <Gui/TaskView/TaskDialog.h>
#include <Mod/Part/Gui/ui_DlgPrimitives.h>
#include <Mod/Part/Gui/ui_Location.h>
class gp_Ax2;
class SoPickedPoint;
@@ -62,6 +61,7 @@ public:
QEventLoop loop;
};
class Ui_DlgPrimitives;
class DlgPrimitives : public QWidget
{
Q_OBJECT
@@ -98,10 +98,11 @@ private:
void connectSignalMapper(QWidget *sender, const char *signal, QSignalMapper* mapper);
private:
Ui_DlgPrimitives ui;
std::unique_ptr<Ui_DlgPrimitives> ui;
App::DocumentObjectWeakPtrT featurePtr;
};
class Ui_Location;
class Location : public QWidget
{
Q_OBJECT
@@ -119,7 +120,7 @@ private:
static void pickCallback(void * ud, SoEventCallback * n);
int mode;
QPointer<QWidget> activeView;
Ui_Location ui;
std::unique_ptr<Ui_Location> ui;
App::DocumentObjectWeakPtrT featurePtr;
};