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,37 +1,35 @@ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * ( at your option ) any later version. * * * - * ***********************************************************************/ + **************************************************************************/ #include "oxygen.h" -#include <qmenubar.h> -#include <qstatusbar.h> -#include <qpopupmenu.h> #include <qlabel.h> #include <qapplication.h> #include <qpushbutton.h> -#include <qfile.h> -#include <qdir.h> #include <qvbox.h> #include "calcdlg.h" #include "calcdlgui.h" +#include "datawidgetui.h" Oxygen::Oxygen() : QMainWindow() { this->setCaption( "Oxygen" ); vbox = new QVBox( this ); QPushButton *setButton = new QPushButton( "Settings", vbox ); connect ( setButton, SIGNAL( clicked() ), this, SLOT( slotSettings() ) ); + 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 ); } @@ -43,11 +41,16 @@ void Oxygen::close() //SLOTS void Oxygen::slotCalculations(){ calcDlgUI *CalcDlgUI = new calcDlgUI(); CalcDlgUI->show(); }; +void Oxygen::slotData(){ + dataWidgetUI *DataWidgetUI = new dataWidgetUI(); + DataWidgetUI->show(); +}; + void Oxygen::slotSettings(){ }; void Oxygen::slotPSE(){ }; |