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 | |||
@@ -7,8 +7,5 @@ | |||
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> |
@@ -16,4 +13,2 @@ | |||
16 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
17 | #include <qfile.h> | ||
18 | #include <qdir.h> | ||
19 | #include <qvbox.h> | 14 | #include <qvbox.h> |
@@ -21,2 +16,3 @@ | |||
21 | #include "calcdlgui.h" | 16 | #include "calcdlgui.h" |
17 | #include "datawidgetui.h" | ||
22 | 18 | ||
@@ -29,2 +25,4 @@ Oxygen::Oxygen() | |||
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 ); |
@@ -50,2 +48,7 @@ void Oxygen::slotCalculations(){ | |||
50 | 48 | ||
49 | void Oxygen::slotData(){ | ||
50 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(); | ||
51 | DataWidgetUI->show(); | ||
52 | }; | ||
53 | |||
51 | void Oxygen::slotSettings(){ }; | 54 | void Oxygen::slotSettings(){ }; |