1 files changed, 79 insertions, 14 deletions

diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index ab25516..09b0b46 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -1,16 +1,16 @@
 /*
                              This file is part of the OPIE Project
                =.
-             .=l.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
+             .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
@@ -30,28 +30,28 @@
 #include "transaction.h"
 #include "graph.h"
 #include "graphinfo.h"
 
 #include <opie/otabwidget.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 
 #include <qcombobox.h>
 #include <qfile.h>
+#include <qfontmetrics.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include <qlistview.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 #include <qwidget.h>
 
 Checkbook::Checkbook( QWidget *parent, const QString &n, const QString &fd, char symbol )
         : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
         name = n;
         filename = fd;
         filename.append( name );
         filename.append( ".qcb" );
@@ -192,30 +192,32 @@ QWidget *Checkbook::initTransactions()
 
         QGridLayout *layout = new QGridLayout( control );
         layout->setSpacing( 2 );
         layout->setMargin( 4 );
 
         balanceLabel = new QLabel( tr( "Current balance: %10.00" ).arg( currencySymbol ),
                                                                 control );
         QWhatsThis::add( balanceLabel, tr( "This area shows the current balance in this checkbook." ) );
         layout->addMultiCellWidget( balanceLabel, 0, 0, 0, 2 );
 
         tranTable = new QListView( control );
         QWhatsThis::add( tranTable, tr( "This is a listing of all transactions entered for this checkbook.\n\nTo sort entries by a specific field, click on the column name." ) );
-        tranTable->addColumn( tr( "ID" ) );
+        tranTable->addColumn( tr( "Num" ) );
         tranTable->addColumn( tr( "Date" ) );
+        //tranTable->addColumn( tr( "Cleared" ) );
         tranTable->addColumn( tr( "Description" ) );
         int colnum = tranTable->addColumn( tr( "Amount" ) );
         tranTable->setColumnAlignment( colnum, Qt::AlignRight );
         tranTable->setAllColumnsShowFocus( TRUE );
+        tranTable->setSorting( 1 );
         layout->addMultiCellWidget( tranTable, 1, 1, 0, 2 );
         QPEApplication::setStylusOperation( tranTable->viewport(), QPEApplication::RightOnHold );
         connect( tranTable, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
                          this, SLOT( slotEditTran() ) );
 
         QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), control );
         QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
         connect( btn, SIGNAL( clicked() ), this, SLOT( slotNewTran() ) );
         layout->addWidget( btn, 2, 0 );
 
         btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), control );
         QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );
@@ -305,49 +307,51 @@ void Checkbook::loadCheckbook()
                         amount = tran->amount();
                         if ( tran->withdrawal() )
                         {
                                 amount *= -1;
                         }
                         currBalance += amount;
                         stramount.sprintf( "%c%.2f", currencySymbol, amount );
 
                         // Add to transaction list
                         transactions.inSort( tran );
 
                         // Add to transaction table
-                        ( void ) new QListViewItem( tranTable, QString::number( i ), tran->datestr(),
-                                                                                trandesc, stramount );
+                        ( void ) new CBListItem( tranTable, tran->number(), tran->datestr(), trandesc, stramount );
                 }
                 else
                 {
                         delete tran;
                 }
         }
         balanceLabel->setText( tr( "Current balance: %1%2" ).arg( currencySymbol ).arg( currBalance, 0, 'f', 2 ) );
 
         highTranNum = transactions.count();
 }
 
 void Checkbook::adjustBalance( float amount )
 {
         currBalance += amount;
         balanceLabel->setText( tr( "Current balance: %1%2" ).arg( currencySymbol ).arg( currBalance, 0, 'f', 2 ) );
 
 }
 
-TranInfo *Checkbook::findTranByID( int id )
+TranInfo *Checkbook::findTran( const QString &checknum, const QString &date, const QString &desc )
 {
         TranInfo *traninfo = transactions.first();
-        while ( traninfo && traninfo->id() != id )
+        while ( traninfo )
         {
+                if ( traninfo->number() == checknum && traninfo->datestr() == date &&
+                         traninfo->desc() == desc )
+                        break;
                 traninfo = transactions.next();
         }
         return( traninfo );
 }
 
 void Checkbook::accept()
 {
         QFile f( filename );
         if ( f.exists() )
         {
                 f.remove();
         }
@@ -409,47 +413,46 @@ void Checkbook::slotNewTran()
                 float amount = traninfo->amount();
                 if ( traninfo->withdrawal() )
                 {
                         amount *= -1;
                 }
                 QString stramount;
                 stramount.sprintf( "%c%.2f", currencySymbol, amount );
 
                 // Add to transaction list
                 transactions.inSort( traninfo );
 
                 // Add to transaction table
-                ( void ) new QListViewItem( tranTable, QString::number( highTranNum ),
-                                                                        traninfo->datestr(), traninfo->desc(), stramount );
+                ( void ) new CBListItem( tranTable, traninfo->number(), traninfo->datestr(), traninfo->desc(),
+                                                                  stramount );
 
                 adjustBalance( amount );
         }
         else
         {
                 highTranNum--;
                 delete traninfo;
         }
 }
 
 void Checkbook::slotEditTran()
 {
         bool ok;
         QListViewItem *curritem = tranTable->currentItem();
         if ( !curritem )
         {
                 return;
         }
 
-        int tranid = curritem->text( 0 ).toInt( &ok );
-        TranInfo *traninfo = findTranByID( tranid );
+        TranInfo *traninfo = findTran( curritem->text( 0 ), curritem->text( 1 ), curritem->text( 2 ) );
         float origamt = traninfo->amount();
         if ( traninfo->withdrawal() )
         {
                 origamt *= -1;
         }
 
         Transaction *currtran = new Transaction( this, name,
                                                                                          traninfo,
                                                                                          currencySymbol );
         currtran->showMaximized();
         if ( currtran->exec() == QDialog::Accepted )
         {
@@ -473,27 +476,25 @@ void Checkbook::slotEditTran()
                 delete currtran;
         }
 }
 
 void Checkbook::slotDeleteTran()
 {
         QListViewItem *curritem = tranTable->currentItem();
         if ( !curritem )
         {
                 return;
         }
 
-        bool ok;
-        int tranid = curritem->text( 0 ).toInt( &ok );
-        TranInfo *traninfo = findTranByID( tranid );
+        TranInfo *traninfo = findTran( curritem->text( 0 ), curritem->text( 1 ), curritem->text( 2 ) );
 
         if ( QPEMessageBox::confirmDelete ( this, tr( "Delete transaction" ), traninfo->desc() ) )
         {
                 float amount = traninfo->amount();
                 if ( traninfo->withdrawal() )
                 {
                         amount *= -1;
                 }
 
                 transactions.remove( traninfo );
                 delete traninfo;
                 delete curritem;
@@ -585,12 +586,76 @@ void Checkbook::drawCategoryChart( bool withdrawals )
                         { // Found category, add to transaction to category total
                                 cat->addToValue( tran->amount() );
                         }
                         else
                         { // Didn't find category, add category to list
                                 list->append( new DataPointInfo( tran->category(), tran->amount() ) );
                         }
                 }
         }
 
         graphInfo = new GraphInfo( GraphInfo::PieChart, list );
 }
+
+CBListItem::CBListItem( QListView *parent, QString label1, QString label2,
+                                         QString label3, QString label4, QString label5, QString label6, QString label7,
+                                         QString label8 )
+        : QListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+{
+        m_known = FALSE;
+        owner = parent;
+}
+
+void CBListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align )
+{
+        QColorGroup _cg = cg;
+        const QPixmap *pm = listView()->viewport()->backgroundPixmap();
+        if ( pm && !pm->isNull() )
+        {
+                _cg.setBrush( QColorGroup::Base, QBrush( cg.base(), *pm ) );
+                p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() );
+        }
+        else if ( isAltBackground() )
+                _cg.setColor(QColorGroup::Base, QColor( 200, 255, 200 ) );
+
+        QListViewItem::paintCell(p, _cg, column, width, align);
+}
+
+bool CBListItem::isAltBackground()
+{
+        QListView *lv = static_cast<QListView *>( listView() );
+        if ( lv )
+        {
+                CBListItem *above = 0;
+                above = (CBListItem *)( itemAbove() );
+                m_known = above ? above->m_known : true;
+                if ( m_known )
+                {
+                        m_odd = above ? !above->m_odd : false;
+                }
+                else
+                {
+                        CBListItem *item;
+                        bool previous = true;
+                        if ( parent() )
+                        {
+                                item = (CBListItem *)( parent() );
+                                if ( item )
+                                        previous = item->m_odd;
+                                item = (CBListItem *)( parent()->firstChild() );
+                        }
+                        else
+                        {
+                                item = (CBListItem *)( lv->firstChild() );
+                        }
+
+                        while(item)
+                        {
+                                item->m_odd = previous = !previous;
+                                item->m_known = true;
+                                item = (CBListItem *)( item->nextSibling() );
+                        }
+                }
+                return m_odd;
+        }
+        return false;
+}
\ No newline at end of file