@@ -21,6 +21,11 | |||||
21 | ----------------------------------------------------------------------------*/ |
|
21 | ----------------------------------------------------------------------------*/ | |
22 | #include "MainWindow.h" |
|
22 | #include "MainWindow.h" | |
23 | #include "ui_MainWindow.h" |
|
23 | #include "ui_MainWindow.h" | |
|
24 | ||||
|
25 | #include <DataSource/DataSourceController.h> | |||
|
26 | #include <DataSource/DataSourceWidget.h> | |||
|
27 | #include <SqpApplication.h> | |||
|
28 | ||||
24 | #include <QAction> |
|
29 | #include <QAction> | |
25 | #include <QDate> |
|
30 | #include <QDate> | |
26 | #include <QDateTime> |
|
31 | #include <QDateTime> | |
@@ -57,6 +62,11 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::Main | |||||
57 | this->menuBar()->addAction("File"); |
|
62 | this->menuBar()->addAction("File"); | |
58 | auto mainToolBar = this->addToolBar("MainToolBar"); |
|
63 | auto mainToolBar = this->addToolBar("MainToolBar"); | |
59 | mainToolBar->addAction("A1"); |
|
64 | mainToolBar->addAction("A1"); | |
|
65 | ||||
|
66 | // Widgets / controllers connections | |||
|
67 | connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)), | |||
|
68 | m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &))); | |||
|
69 | ||||
60 | /* QLopGUI::registerMenuBar(menuBar()); |
|
70 | /* QLopGUI::registerMenuBar(menuBar()); | |
61 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); |
|
71 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); | |
62 | this->m_progressWidget = new QWidget(); |
|
72 | this->m_progressWidget = new QWidget(); |
@@ -49,7 +49,7 public slots: | |||||
49 |
|
49 | |||
50 | signals: |
|
50 | signals: | |
51 | /// Signal emitted when a structure has been set for a data source |
|
51 | /// Signal emitted when a structure has been set for a data source | |
52 |
void dataSourceItemSet( |
|
52 | void dataSourceItemSet(DataSourceItem &dataSourceItem); | |
53 |
|
53 | |||
54 | private: |
|
54 | private: | |
55 | void waitForFinish(); |
|
55 | void waitForFinish(); |
General Comments 0
You need to be logged in to leave comments.
Login now