summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/oxygen/calcdlg.ui92
-rw-r--r--noncore/apps/oxygen/calcdlgui.cpp1
-rw-r--r--noncore/apps/oxygen/dataTable.cpp4
-rw-r--r--noncore/apps/oxygen/oxygen.cpp45
-rw-r--r--noncore/apps/oxygen/oxygen.h8
5 files changed, 33 insertions, 117 deletions
diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui
index b4e54f1..2d30164 100644
--- a/noncore/apps/oxygen/calcdlg.ui
+++ b/noncore/apps/oxygen/calcdlg.ui
@@ -10,89 +10,54 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>253</width>
- <height>352</height>
+ <width>245</width>
+ <height>318</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
- <string>Calculations</string>
- </property>
- <property>
- <name>layoutMargin</name>
- </property>
- <property>
- <name>layoutSpacing</name>
+ <string>Form1</string>
</property>
<widget>
<class>QTabWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>TabWidgetMain</cstring>
+ <cstring>TabWidget3</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>250</width>
- <height>350</height>
+ <width>240</width>
+ <height>320</height>
</rect>
</property>
- <property>
- <name>layoutMargin</name>
- </property>
- <property>
- <name>layoutSpacing</name>
- </property>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>tabMain</cstring>
+ <cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
- <string>Molweight</string>
+ <string>Tab 1</string>
</attribute>
<widget>
- <class>QFrame</class>
- <property stdset="1">
- <name>name</name>
- <cstring>FrameSystemTime</cstring>
- </property>
- <property stdset="1">
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>240</width>
- <height>310</height>
- </rect>
- </property>
- <property stdset="1">
- <name>frameShape</name>
- <enum>StyledPanel</enum>
- </property>
- <property stdset="1">
- <name>frameShadow</name>
- <enum>Raised</enum>
- </property>
- <widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>Layout6</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>240</width>
- <height>310</height>
+ <width>230</width>
+ <height>290</height>
</rect>
</property>
<vbox>
<property stdset="1">
@@ -106,13 +71,13 @@
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_4</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Formula:</string>
+ <string>TextLabel2</string>
</property>
</widget>
<widget>
<class>QLineEdit</class>
@@ -124,9 +89,9 @@
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>Layout3</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
@@ -143,9 +108,9 @@
<cstring>calculate</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Calculate</string>
+ <string>PushButton3</string>
</property>
</widget>
<widget>
<class>QPushButton</class>
@@ -154,22 +119,22 @@
<cstring>clear_fields</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Clear</string>
+ <string>PushButton4</string>
</property>
</widget>
</hbox>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_4</cstring>
+ <cstring>TextLabel3</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Result:</string>
+ <string>TextLabel3</string>
</property>
</widget>
<widget>
<class>QLineEdit</class>
@@ -185,46 +150,31 @@
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Elemental composition (%):</string>
+ <string>TextLabel1</string>
</property>
</widget>
<widget>
<class>QMultiLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>anal_display</cstring>
</property>
- <property stdset="1">
- <name>readOnly</name>
- <bool>true</bool>
- </property>
</widget>
</vbox>
</widget>
</widget>
- </widget>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>tabNtp</cstring>
+ <cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
- <string>Nernst</string>
+ <string>Tab 2</string>
</attribute>
- <grid>
- <property stdset="1">
- <name>margin</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>2</number>
- </property>
- </grid>
</widget>
</widget>
</widget>
</UI>
diff --git a/noncore/apps/oxygen/calcdlgui.cpp b/noncore/apps/oxygen/calcdlgui.cpp
index b6dfff3..ca3a9f2 100644
--- a/noncore/apps/oxygen/calcdlgui.cpp
+++ b/noncore/apps/oxygen/calcdlgui.cpp
@@ -23,9 +23,8 @@
#include <qpushbutton.h>
calcDlgUI::calcDlgUI() : CalcDlg()
{
- this->showMaximized();
kmolcalc = new KMolCalc;
connect( calculate, SIGNAL( clicked() ), this, SLOT( calc() ) );
connect( clear_fields, SIGNAL( clicked() ), this, SLOT( clear() ) );
result->setReadOnly( true );
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 45c2ffd..e027c16 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -42,10 +42,10 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
bf.setPointSize( bf.pointSize()+2 );
middle->setFont( bf );
DataTable = new OxydataTable( 9,2, this );
- DataTable->setColumnWidth ( 1 , 118 );
- DataTable->setColumnWidth ( 0 , 118 );
+// DataTable->setColumnWidth ( 1 , 118 );
+// DataTable->setColumnWidth ( 0 , 118 );
setTable();
qgrid->addWidget( hbox,0,0 );
qgrid->addWidget( DataTable,1,0 );
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
@@ -19,49 +19,24 @@
#include <qlabel.h>
#include <qapplication.h>
#include <qpushbutton.h>
#include <qvbox.h>
+#include <qtabwidget.h>
#include "calcdlg.h"
#include "calcdlgui.h"
#include "datawidgetui.h"
#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 );
+}
diff --git a/noncore/apps/oxygen/oxygen.h b/noncore/apps/oxygen/oxygen.h
index 2a10666..782cc3e 100644
--- a/noncore/apps/oxygen/oxygen.h
+++ b/noncore/apps/oxygen/oxygen.h
@@ -8,19 +8,11 @@
**************************************************************************/
#include <qmainwindow.h>
-class QVBox;
-
class Oxygen : public QMainWindow
{
Q_OBJECT
public:
Oxygen();
- QVBox *vbox;
- private slots:
- void slotCalculations() const;
- void slotData() const;
- void slotPSE() const;
- void close() const;
};