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 @@ -21,4 +21,5 @@ #include <qpushbutton.h> #include <qvbox.h> +#include <qtabwidget.h> #include "calcdlg.h" #include "calcdlgui.h" @@ -26,42 +27,16 @@ #include "psewidget.h" -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 ); +} |