author | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
commit | 951d1d4125a80dc814f95d2956853bf53ca52e9a (patch) (side-by-side diff) | |
tree | 46c7a70b80a7eebb54cd59c46204c28335f3821c /noncore/apps/oxygen/oxygen.cpp | |
parent | f0a15a9866f9eddfe10596e63a1e6300b92b9e3f (diff) | |
download | opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.zip opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.gz opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.bz2 |
merge noncore/apps/* except
- advancedfm (ljp, please...)
- odict (tille, please...)
Diffstat (limited to 'noncore/apps/oxygen/oxygen.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/oxygen/oxygen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp index 5999cb0..5bdc2aa 100644 --- a/noncore/apps/oxygen/oxygen.cpp +++ b/noncore/apps/oxygen/oxygen.cpp @@ -1,84 +1,84 @@ /*************************************************************************** application: : Oxygen begin : September 2002 copyright : ( C ) 2002 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * 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 <qapplication.h> #include <qtabwidget.h> #include "calcdlg.h" #include "calcdlgui.h" #include "datawidgetui.h" #include "psewidget.h" -Oxygen::Oxygen() : QMainWindow() +Oxygen::Oxygen( QWidget *parent, const char *name, WFlags f) : QMainWindow( parent, name, f ) { loadNames(); calcDlgUI *CalcDlgUI = new calcDlgUI(); PSEWidget *pse = new PSEWidget(names); dataWidgetUI *DataWidgetUI = new dataWidgetUI(names); - + 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 ); } void Oxygen::loadNames() { names.clear(); names.append( tr("Hydrogen") ); names.append( tr("Helium") ); names.append( tr("Lithium") ); names.append( tr("Beryllium") ); names.append( tr("Boron") ); names.append( tr("Carbon") ); names.append( tr("Nitrogen") ); names.append( tr("Oxygen") ); names.append( tr("Fluorine") ); names.append( tr("Neon") ); names.append( tr("Sodium") ); names.append( tr("Magnesium") ); names.append( tr("Aluminum") ); names.append( tr("Silicon") ); names.append( tr("Phosphorus") ); names.append( tr("Sulfur") ); names.append( tr("Chlorine") ); names.append( tr("Argon") ); names.append( tr("Potassium") ); names.append( tr("Calcium") ); names.append( tr("Scandium") ); names.append( tr("Titanium") ); names.append( tr("Vanadium") ); names.append( tr("Chromium") ); names.append( tr("Manganese") ); names.append( tr("Iron") ); names.append( tr("Cobalt") ); names.append( tr("Nickel") ); names.append( tr("Copper") ); names.append( tr("Zinc") ); names.append( tr("Gallium") ); names.append( tr("Germanium") ); names.append( tr("Arsenic") ); names.append( tr("Selenium") ); names.append( tr("Bromine") ); names.append( tr("Krypton") ); names.append( tr("Rubidium") ); names.append( tr("Strontium") ); |