Construction of main widgets of SampleView moved to SampleViewDocks

GUI/coregui/Views/SampleDesigner/SampleViewDocks.cpp

@@ -14,14 +14,18 @@
 
 #include "SampleViewDocks.h"
 #include "SampleView.h"
+#include "SampleDesigner.h"
+#include "SampleTreeWidget.h"
+#include "SamplePropertyWidget.h"
+#include "InfoWidget.h"
 
 SampleViewDocks::SampleViewDocks(SampleView* parent)
     : DocksController(parent)
     , m_widgetBox(nullptr)
-    , m_treeWidget(nullptr)
-    , m_propertyWidget(nullptr)
-    , m_sampleDesigner(nullptr)
-    , m_infoWidget(nullptr)
+    , m_treeWidget(new SampleTreeWidget(parent, parent->getSampleModel()))
+    , m_propertyWidget(new SamplePropertyWidget(m_treeWidget->treeView()->selectionModel(), parent))
+    , m_sampleDesigner(new SampleDesigner(parent))
+    , m_infoWidget(new InfoWidget(parent))
 {
 
 }

GUI/coregui/Views/SampleView.cpp

@@ -32,10 +32,9 @@
 
 SampleView::SampleView(MainWindow *mainWindow)
     : Manhattan::FancyMainWindow(mainWindow)
+    , m_models(mainWindow->models())
     , m_docks(new SampleViewDocks(this))
-    , m_sampleDesigner(new SampleDesigner(this))
     , m_toolBar(nullptr)
-    , m_models(mainWindow->models())
 {
     setObjectName("SampleView");
 
@@ -79,12 +78,11 @@ void SampleView::initSubWindows()
 
     m_subWindows[WIDGET_BOX] = new SampleWidgetBox(sampleDesigner(), this);
 
-    m_tree_view = new SampleTreeWidget(this, m_models->sampleModel());
-    m_subWindows[SAMPLE_TREE] = m_tree_view;
+    m_subWindows[SAMPLE_TREE] = m_docks->treeWidget();
 
-    m_subWindows[PROPERTY_EDITOR] = new SamplePropertyWidget(selectionModel(), this);
+    m_subWindows[PROPERTY_EDITOR] = m_docks->propertyWidget();
 
-    InfoWidget *infoWidget = new InfoWidget(this);
+    InfoWidget *infoWidget = m_docks->infoWidget();
     connect(infoWidget, SIGNAL(widgetHeightRequest(int)), this, SLOT(setDockHeightForWidget(int)));
     connect(infoWidget, SIGNAL(widgetCloseRequest()), this, SLOT(onWidgetCloseRequest()));
     infoWidget->setSampleModel(m_models->sampleModel());
@@ -219,7 +217,7 @@ SampleModel *SampleView::getSampleModel()
 
 QTreeView *SampleView::getTreeView()
 {
-    return m_tree_view->treeView();
+    return m_docks->treeWidget()->treeView();
 }
 
 QItemSelectionModel* SampleView::selectionModel()
@@ -229,7 +227,7 @@ QItemSelectionModel* SampleView::selectionModel()
 
 SampleDesigner* SampleView::sampleDesigner()
 {
-    return m_sampleDesigner;
+    return m_docks->sampleDesigner();
 }
 
 

GUI/coregui/Views/SampleView.h

@@ -50,10 +50,13 @@ public slots:
     void setDockHeightForWidget(int height);
     void onWidgetCloseRequest();
 
+    SampleModel *getSampleModel();
+
 protected slots:
     void dockToMinMaxSizes();
     void onDockVisibilityChangeV2(bool status);
 
+
 private:
     //! Stores sizes of dock widget
     struct DockSizeInfo {
@@ -65,17 +68,16 @@ private:
 
     void initSubWindows();
     void connectSignals();
-    void clearSignalMapper();
     void scrollToIndex(const QModelIndex &index);
     QModelIndex getIndexAtColumnZero(const QModelIndex &index);
 
-    SampleModel *getSampleModel();
     QTreeView *getTreeView();
     QItemSelectionModel* selectionModel();
 
+    ApplicationModels* m_models;
+
     SampleViewDocks* m_docks;
 
-    SampleDesigner *m_sampleDesigner;    // main sample view
     SampleDesigner* sampleDesigner();
 
     SampleToolBar *m_toolBar;            // toolbar
@@ -85,8 +87,6 @@ private:
     QMap<QWidget *, QDockWidget *> m_widget_to_dock;
     QMap<QDockWidget *, QWidget *> m_dock_to_widget;
 
-    ApplicationModels* m_models;
-    SampleTreeWidget *m_tree_view;
 
     DockSizeInfo m_dock_info;
 };