Diffstat (limited to 'noncore/apps/oxygen/oxygen.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/oxygen/oxygen.cpp | 49 |
1 files changed, 12 insertions, 37 deletions
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp index b3392e1..bc99d89 100644 --- a/noncore/apps/oxygen/oxygen.cpp +++ b/noncore/apps/oxygen/oxygen.cpp | |||
@@ -19,49 +19,24 @@ | |||
19 | #include <qlabel.h> | 19 | #include <qlabel.h> |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qpushbutton.h> | 21 | #include <qpushbutton.h> |
22 | #include <qvbox.h> | 22 | #include <qvbox.h> |
23 | #include <qtabwidget.h> | ||
23 | #include "calcdlg.h" | 24 | #include "calcdlg.h" |
24 | #include "calcdlgui.h" | 25 | #include "calcdlgui.h" |
25 | #include "datawidgetui.h" | 26 | #include "datawidgetui.h" |
26 | #include "psewidget.h" | 27 | #include "psewidget.h" |
27 | 28 | ||
28 | Oxygen::Oxygen() | 29 | Oxygen::Oxygen() : QMainWindow() |
29 | : QMainWindow() | ||
30 | { | 30 | { |
31 | this->setCaption( tr( "Oxygen" ) ); | 31 | PSEWidget *pse = new PSEWidget(); |
32 | vbox = new QVBox( this ); | ||
33 | QPushButton *dataButton = new QPushButton( "Data", vbox ); | ||
34 | connect ( dataButton, SIGNAL( clicked() ), this, SLOT( slotData() ) ); | ||
35 | QPushButton *calcButton = new QPushButton( "Calculations", vbox ); | ||
36 | connect ( calcButton, SIGNAL( clicked() ), this, SLOT( slotCalculations() ) ); | ||
37 | QPushButton *pseButton = new QPushButton( "PSE", vbox ); | ||
38 | connect ( pseButton, SIGNAL( clicked() ), this, SLOT( slotPSE() ) ); | ||
39 | |||
40 | setCentralWidget( vbox ); | ||
41 | } | ||
42 | |||
43 | |||
44 | void Oxygen::close() const | ||
45 | { | ||
46 | QApplication::exit(); | ||
47 | } | ||
48 | |||
49 | //SLOTS | ||
50 | |||
51 | void Oxygen::slotCalculations() const{ | ||
52 | calcDlgUI *CalcDlgUI = new calcDlgUI(); | 32 | calcDlgUI *CalcDlgUI = new calcDlgUI(); |
53 | CalcDlgUI->show(); | ||
54 | }; | ||
55 | |||
56 | void Oxygen::slotData() const{ | ||
57 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(); | 33 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(); |
58 | DataWidgetUI->showMaximized(); | 34 | |
59 | DataWidgetUI->show(); | 35 | this->setCaption( tr( "Oxygen" ) ); |
60 | }; | 36 | |
61 | 37 | QTabWidget *tabw = new QTabWidget( this , "qtab" ); | |
62 | void Oxygen::slotPSE() const{ | 38 | tabw->addTab( pse, tr( "PSE" )); |
63 | PSEWidget *pse = new PSEWidget(); | 39 | tabw->addTab( DataWidgetUI , tr( "Data" ) ); |
64 | pse->showMaximized(); | 40 | tabw->addTab( CalcDlgUI, tr( "Calculations" ) ); |
65 | pse->show(); | 41 | setCentralWidget( tabw ); |
66 | }; | 42 | } |
67 | |||