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
@@ -22,2 +22,3 @@
 #include <qvbox.h>
+#include <qtabwidget.h>
 #include "calcdlg.h"
@@ -27,41 +28,15 @@
 
-Oxygen::Oxygen()
-  : QMainWindow()
+Oxygen::Oxygen() : QMainWindow()
 {
-    this->setCaption( tr( "Oxygen" ) );
-    vbox = new QVBox( this );
-    QPushButton *dataButton = new QPushButton( "Data", vbox );
-    connect ( dataButton, SIGNAL( clicked() ), this, SLOT( slotData() ) );
-    QPushButton *calcButton = new QPushButton( "Calculations", vbox );
-    connect ( calcButton, SIGNAL( clicked() ), this, SLOT( slotCalculations() ) );
-    QPushButton *pseButton = new QPushButton( "PSE", vbox );
-    connect ( pseButton, SIGNAL( clicked() ), this, SLOT( slotPSE() ) );
-
-    setCentralWidget( vbox );
-}
-
-
-void Oxygen::close() const
-{
-  QApplication::exit();
-}
-
-//SLOTS
-
-void Oxygen::slotCalculations() const{ 
+    PSEWidget *pse = new PSEWidget();
     calcDlgUI *CalcDlgUI = new calcDlgUI();
-    CalcDlgUI->show();
-};
-
-void Oxygen::slotData() const{ 
     dataWidgetUI *DataWidgetUI = new dataWidgetUI();
-    DataWidgetUI->showMaximized();
-    DataWidgetUI->show();
-};
-
-void Oxygen::slotPSE() const{
-    PSEWidget *pse = new PSEWidget();
-    pse->showMaximized();
-    pse->show();
-};
-
+    
+    this->setCaption( tr( "Oxygen" ) );
+    
+    QTabWidget *tabw = new QTabWidget( this , "qtab" );
+    tabw->addTab( pse, tr( "PSE" ));
+    tabw->addTab( DataWidgetUI , tr( "Data" ) );
+    tabw->addTab( CalcDlgUI, tr( "Calculations" ) );
+     setCentralWidget( tabw );
+}