summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/dataTable.cpp29
-rw-r--r--noncore/apps/oxygen/datawidgetui.cpp4
2 files changed, 13 insertions, 20 deletions
diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index f03e973..6c6b9dc 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -7,41 +7,34 @@
* *
**************************************************************************/
#include "oxygen.h"
#include "dataTable.h"
#include <qtable.h>
OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
const char *name) : QTable(numRows, numRows, parent, name)
{
}
-
void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected)
{
- if ( cr.width() == 0 || cr.height() == 0 )
+ if ( cr.width() == 0 || cr.height() == 0 )
return;
- if ( selected &&
- row == currentRow() &&
- col == currentColumn() )
- selected = FALSE;
+ selected = FALSE;
int w = cr.width();
int h = cr.height();
- QTableItem *itm = item( row, col );
- if ( itm ) {
+ QTableItem *itm = item( row, col );
+ QColorGroup colgrp = colorGroup();
+ if ( itm )
+ {
+ if ( row%2 )
+ colgrp.setColor( QColorGroup::Base, QColor( cyan ) );
+ else
+ colgrp.setColor( QColorGroup::Base, QColor( white ) );
p->save();
- itm->paint( p, colorGroup(), cr, selected );
+ itm->paint( p, colgrp, cr, selected );
p->restore();
- } else {
- if ( currentRow()%2 ) //every even row
- p->fillRect( 0, 0, w, h, selected ? colorGroup().brush( QColorGroup::Highlight ) : colorGroup().brush( QColorGroup::Base ) );
- else //every odd row
- p->fillRect( 0, 0, w, h, selected ? colorGroup().brush( QColorGroup::Highlight ) : colorGroup().brush( QColorGroup::Base ) );
}
}
-
-
-
-
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index 0f8a146..c8492e5 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -1,37 +1,37 @@
/***************************************************************************
* *
* 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 <qpe/config.h>
#include "datawidgetui.h"
-#include <qtable.h>
#include <qstring.h>
#include <qcombobox.h>
#include <qlayout.h>
dataWidgetUI::dataWidgetUI() : QDialog()
{
- this->setCaption("foo");
+ this->setCaption("Chemical Data");
QVBoxLayout *vbox = new QVBoxLayout( this );
dataCombo = new QComboBox( this );
DataTable = new OxydataTable( 7,2, this );
+ DataTable->setShowGrid( false );
vbox->addWidget( dataCombo );
vbox->addWidget( DataTable );
DataTable->show();
dataCombo->show();
connect ( dataCombo, SIGNAL( activated(int) ), this, SLOT( slotShowData(int) ) );
Config test( "/home/opie/Settings/oxygendata", Config::File );
//read in all names of the 118 elements
for ( int i = 1 ; i < 119 ; i++ )