summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-09-30 13:05:45 (UTC)
committer cniehaus <cniehaus>2002-09-30 13:05:45 (UTC)
commitb753c264b7acd26aba9f5a73c1fa0a7deb0b73a3 (patch) (side-by-side diff)
treea5579c7242791b2602a764a781051c7f9a298be1
parentece83520d6bf5c481275a3d4a8e792749119fa08 (diff)
downloadopie-b753c264b7acd26aba9f5a73c1fa0a7deb0b73a3.zip
opie-b753c264b7acd26aba9f5a73c1fa0a7deb0b73a3.tar.gz
opie-b753c264b7acd26aba9f5a73c1fa0a7deb0b73a3.tar.bz2
fixed one typo
I tried to fix the layouting problem but I give up. /me is to lame
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/calcdlg.ui4
-rw-r--r--noncore/apps/oxygen/dataTable.cpp10
-rw-r--r--noncore/apps/oxygen/dataTable.h3
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp1
-rw-r--r--noncore/apps/oxygen/psewidget.cpp1
5 files changed, 15 insertions, 4 deletions
diff --git a/noncore/apps/oxygen/calcdlg.ui b/noncore/apps/oxygen/calcdlg.ui
index a8ed170..c817a47 100644
--- a/noncore/apps/oxygen/calcdlg.ui
+++ b/noncore/apps/oxygen/calcdlg.ui
@@ -8,13 +8,13 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>241</width>
+ <width>237</width>
<height>318</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form1</string>
@@ -73,13 +73,13 @@
<property stdset="1">
<name>name</name>
<cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>chemical Formula</string>
+ <string>Chemical Formula</string>
</property>
</widget>
<widget>
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 98d3bd8..82b425e 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -40,13 +40,12 @@ OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
QFont bf;
bf.setBold( true );
bf.setPointSize( bf.pointSize()+2 );
middle->setFont( bf );
DataTable = new OxydataTable( 9,2, this );
- //DataTable->setColumnWidth ( 1 , ( parent->width())-10 );
setTable();
qgrid->addWidget( hbox,0,0 );
qgrid->addWidget( DataTable,1,0 );
}
@@ -80,13 +79,22 @@ void OxydataWidget::setTable() const
DataTable->setText( 3,0, tr( "Electronegativity" )) ;
DataTable->setText( 4,0, tr( "Atomic radius" )) ;
DataTable->setText( 5,0, tr( "Ionizationenergie" )) ;
DataTable->setText( 6,0, tr( "Density" )) ;
DataTable->setText( 7,0, tr( "Boilingpoint" ) );
DataTable->setText( 8,0, tr( "Meltingpoint" ) );
+}
+
+void OxydataWidget::setLayout()
+{
+#warning this is not working and I have no idea why!
+// DataTable->setColumnWidth ( 0 , this->width()/2 );
+// DataTable->setColumnWidth ( 1 , this->width()/2 );
+ DataTable->setColumnWidth ( 0 , 110 );
+ DataTable->setColumnWidth ( 1 , 110 );
}
OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
const char *name) : QTable(numRows, numCols,parent, name)
{
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h
index a4a3b18..f2eb71d 100644
--- a/noncore/apps/oxygen/dataTable.h
+++ b/noncore/apps/oxygen/dataTable.h
@@ -31,16 +31,17 @@ class OxydataWidget : public QWidget
Q_OBJECT
public:
OxydataWidget(QWidget *parent=0);
QLabel *left, *middle, *right;
+ void setLayout();
private:
- OxydataTable *DataTable;
void setTable() const;
+ OxydataTable *DataTable;
public slots:
void setElement( int );
};
/*
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index c7afa32..99c4fd7 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -42,11 +42,12 @@ dataWidgetUI::dataWidgetUI() : QWidget()
dataCombo->insertItem( QString::number( i )+" - "+foo );
}
OxydataWidget *oxyDW = new OxydataWidget(this);
connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
oxyDW->setElement( 0 );
+ oxyDW->setLayout();
qgrid->addWidget( dataCombo, 0,0);
qgrid->addWidget( oxyDW , 1,0 );
}
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index ba9b71a..18b41c3 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -46,12 +46,13 @@ PSEWidget::PSEWidget() : QWidget()
PSEframe.current()->setPalette( QPalette( PSEColor( configobj.readEntry( "Block" ) ) ) );
connect( PSEframe.current(), SIGNAL( num(QString) ), this, SLOT( slotShowElement(QString) ));
}
oxyDW = new OxydataWidget(this);
oxyDW->setElement( 0 );
+ oxyDW->setLayout();
vlay->addLayout( grid );
vlay->addWidget( oxyDW );
}
QColor PSEWidget::PSEColor( QString block )