Diffstat (limited to 'noncore/apps/oxygen/oxygen.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/oxygen/oxygen.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp index 81897e9..a9c2276 100644 --- a/noncore/apps/oxygen/oxygen.cpp +++ b/noncore/apps/oxygen/oxygen.cpp | |||
@@ -1,53 +1,56 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * ( at your option ) any later version. * | 6 | * ( at your option ) any later version. * |
7 | * * | 7 | * * |
8 | * ***********************************************************************/ | 8 | **************************************************************************/ |
9 | #include "oxygen.h" | 9 | #include "oxygen.h" |
10 | 10 | ||
11 | #include <qmenubar.h> | ||
12 | #include <qstatusbar.h> | ||
13 | #include <qpopupmenu.h> | ||
14 | #include <qlabel.h> | 11 | #include <qlabel.h> |
15 | #include <qapplication.h> | 12 | #include <qapplication.h> |
16 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
17 | #include <qfile.h> | ||
18 | #include <qdir.h> | ||
19 | #include <qvbox.h> | 14 | #include <qvbox.h> |
20 | #include "calcdlg.h" | 15 | #include "calcdlg.h" |
21 | #include "calcdlgui.h" | 16 | #include "calcdlgui.h" |
17 | #include "datawidgetui.h" | ||
22 | 18 | ||
23 | Oxygen::Oxygen() | 19 | Oxygen::Oxygen() |
24 | : QMainWindow() | 20 | : QMainWindow() |
25 | { | 21 | { |
26 | this->setCaption( "Oxygen" ); | 22 | this->setCaption( "Oxygen" ); |
27 | vbox = new QVBox( this ); | 23 | vbox = new QVBox( this ); |
28 | QPushButton *setButton = new QPushButton( "Settings", vbox ); | 24 | QPushButton *setButton = new QPushButton( "Settings", vbox ); |
29 | connect ( setButton, SIGNAL( clicked() ), this, SLOT( slotSettings() ) ); | 25 | connect ( setButton, SIGNAL( clicked() ), this, SLOT( slotSettings() ) ); |
26 | QPushButton *dataButton = new QPushButton( "Data", vbox ); | ||
27 | connect ( dataButton, SIGNAL( clicked() ), this, SLOT( slotData() ) ); | ||
30 | QPushButton *calcButton = new QPushButton( "Calculations", vbox ); | 28 | QPushButton *calcButton = new QPushButton( "Calculations", vbox ); |
31 | connect ( calcButton, SIGNAL( clicked() ), this, SLOT( slotCalculations() ) ); | 29 | connect ( calcButton, SIGNAL( clicked() ), this, SLOT( slotCalculations() ) ); |
32 | QPushButton *pseButton = new QPushButton( "PSE", vbox ); | 30 | QPushButton *pseButton = new QPushButton( "PSE", vbox ); |
33 | connect ( pseButton, SIGNAL( clicked() ), this, SLOT( slotPSE() ) ); | 31 | connect ( pseButton, SIGNAL( clicked() ), this, SLOT( slotPSE() ) ); |
34 | 32 | ||
35 | setCentralWidget( vbox ); | 33 | setCentralWidget( vbox ); |
36 | } | 34 | } |
37 | 35 | ||
38 | 36 | ||
39 | void Oxygen::close() | 37 | void Oxygen::close() |
40 | { | 38 | { |
41 | QApplication::exit(); | 39 | QApplication::exit(); |
42 | } | 40 | } |
43 | 41 | ||
44 | //SLOTS | 42 | //SLOTS |
45 | 43 | ||
46 | void Oxygen::slotCalculations(){ | 44 | void Oxygen::slotCalculations(){ |
47 | calcDlgUI *CalcDlgUI = new calcDlgUI(); | 45 | calcDlgUI *CalcDlgUI = new calcDlgUI(); |
48 | CalcDlgUI->show(); | 46 | CalcDlgUI->show(); |
49 | }; | 47 | }; |
50 | 48 | ||
49 | void Oxygen::slotData(){ | ||
50 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(); | ||
51 | DataWidgetUI->show(); | ||
52 | }; | ||
53 | |||
51 | void Oxygen::slotSettings(){ }; | 54 | void Oxygen::slotSettings(){ }; |
52 | void Oxygen::slotPSE(){ }; | 55 | void Oxygen::slotPSE(){ }; |
53 | 56 | ||