Auto status change to "Under Review"
| @@ -37,10 +37,20 | |||||
| 37 | //#include "cdfcodec.h" |
|
37 | //#include "cdfcodec.h" | |
| 38 | //#include "amdatxtcodec.h" |
|
38 | //#include "amdatxtcodec.h" | |
| 39 | //#include <qlopplotmanager.h> |
|
39 | //#include <qlopplotmanager.h> | |
| 40 |
|
40 | #include <QAction> | ||
|
|
41 | #include <QToolBar> | |||
|
|
42 | #include <memory.h> | |||
| 41 | MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow) |
|
43 | MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow) | |
| 42 | { |
|
44 | { | |
| 43 | m_Ui->setupUi(this); |
|
45 | m_Ui->setupUi(this); | |
|
|
46 | ||||
|
|
47 | QToolBar *actionToolbar = new QToolBar(this); | |||
|
|
48 | actionToolbar->setOrientation(Qt::Vertical); | |||
|
|
49 | actionToolbar->addAction("ACTION"); | |||
|
|
50 | actionToolbar->addAction("ACTION 2"); | |||
|
|
51 | actionToolbar->addAction("ACTION 3"); | |||
|
|
52 | m_Ui->leftInspectorSidePane->layout()->addWidget(actionToolbar); | |||
|
|
53 | ||||
| 44 | /* QLopGUI::registerMenuBar(menuBar()); |
|
54 | /* QLopGUI::registerMenuBar(menuBar()); | |
| 45 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); |
|
55 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); | |
| 46 | this->m_progressWidget = new QWidget(); |
|
56 | this->m_progressWidget = new QWidget(); | |
| @@ -32,6 +32,40 | |||||
| 32 | <height>16777215</height> |
|
32 | <height>16777215</height> | |
| 33 | </size> |
|
33 | </size> | |
| 34 | </property> |
|
34 | </property> | |
|
|
35 | <layout class="QHBoxLayout" name="horizontalLayout"> | |||
|
|
36 | <item> | |||
|
|
37 | <widget class="QWidget" name="leftInspectorWidget" native="true"> | |||
|
|
38 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | |||
|
|
39 | <item> | |||
|
|
40 | <widget class="QWidget" name="widget" native="true"> | |||
|
|
41 | <layout class="QVBoxLayout" name="verticalLayout"> | |||
|
|
42 | <item> | |||
|
|
43 | <widget class="QWidget" name="dateSourceWidget" native="true"/> | |||
|
|
44 | </item> | |||
|
|
45 | <item> | |||
|
|
46 | <widget class="QWidget" name="dateTimeWidget" native="true"/> | |||
|
|
47 | </item> | |||
|
|
48 | <item> | |||
|
|
49 | <widget class="QWidget" name="variableInspectorWidget" native="true"/> | |||
|
|
50 | </item> | |||
|
|
51 | </layout> | |||
|
|
52 | </widget> | |||
|
|
53 | </item> | |||
|
|
54 | <item> | |||
|
|
55 | <widget class="QWidget" name="leftInspectorSidePane" native="true"> | |||
|
|
56 | <layout class="QVBoxLayout" name="verticalLayout_2"/> | |||
|
|
57 | </widget> | |||
|
|
58 | </item> | |||
|
|
59 | </layout> | |||
|
|
60 | </widget> | |||
|
|
61 | </item> | |||
|
|
62 | <item> | |||
|
|
63 | <widget class="QWidget" name="viewWidget" native="true"/> | |||
|
|
64 | </item> | |||
|
|
65 | <item> | |||
|
|
66 | <widget class="QWidget" name="rightInspectorWidget" native="true"/> | |||
|
|
67 | </item> | |||
|
|
68 | </layout> | |||
| 35 | </widget> |
|
69 | </widget> | |
| 36 | <widget class="QMenuBar" name="menuBar"> |
|
70 | <widget class="QMenuBar" name="menuBar"> | |
| 37 | <property name="geometry"> |
|
71 | <property name="geometry"> | |
| @@ -39,7 +73,7 | |||||
| 39 | <x>0</x> |
|
73 | <x>0</x> | |
| 40 | <y>0</y> |
|
74 | <y>0</y> | |
| 41 | <width>800</width> |
|
75 | <width>800</width> | |
| 42 |
<height> |
|
76 | <height>26</height> | |
| 43 | </rect> |
|
77 | </rect> | |
| 44 | </property> |
|
78 | </property> | |
| 45 | </widget> |
|
79 | </widget> | |
General Comments 8
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * M core/CMakeLists.txt
You need to be logged in to leave comments.
Login now