1 files changed, 75 insertions, 16 deletions

diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index c53e889..a42c824 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -28,55 +28,57 @@
 
 #include "checkbook.h"
 #include "cbinfo.h"
 #include "transaction.h"
 #include "traninfo.h"
 #include "graph.h"
 #include "graphinfo.h"
 #include "password.h"
 #include "mainwindow.h"
 #include "cfg.h"
 
 #include <opie/otabwidget.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
+#include <qpopupmenu.h>
 
-#define COL_ID      0
-#define COL_NUM     1
-#define COL_DATE    2
-#define COL_DESC    3
-#define COL_AMOUNT  4
-#define COL_BAL     5
+#define COL_ID          0
+#define COL_SORTDATE    1
+#define COL_NUM         2
+#define COL_DATE        3
+#define COL_DESC        4
+#define COL_AMOUNT      5
+#define COL_BAL         6
 
 // --- Checkbook --------------------------------------------------------------
 Checkbook::Checkbook( QWidget *parent, CBInfo *i, Cfg *cfg )
         : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
         info = i;
     _pCfg=cfg;
 
     // Title bar
         if ( info->name() != "" )
         {
                 QString tempstr = info->name();
                 tempstr.append( " - " );
                 tempstr.append( tr( "Checkbook" ) );
                 setCaption( tempstr );
         }
         else
         {
                 setCaption( tr( "New checkbook" ) );
         }
 
 
         // Setup layout to make everything pretty
         QVBoxLayout *layout = new QVBoxLayout( this );
@@ -203,62 +205,67 @@ QWidget *Checkbook::initTransactions()
         QGridLayout *layout = new QGridLayout( control );
         layout->setSpacing( 2 );
         layout->setMargin( 4 );
 
     // Sort selector
     QLabel *label = new QLabel( tr( "Sort by:" ), control );
         QWhatsThis::add( label, tr( "Select checkbook sorting here." ) );
         layout->addMultiCellWidget( label, 0, 0, 0, 1 );
     _cbSortType=new QComboBox( control );
     _cbSortType->insertItem( tr("Entry Order") );
     _cbSortType->insertItem( tr("Date") );
     _cbSortType->insertItem( tr("Number") );
     layout->addMultiCellWidget( _cbSortType, 0, 0, 1, 2 );
     connect( _cbSortType, SIGNAL( activated(const QString &) ), this, SLOT( slotSortChanged( const QString & ) ) );
 
     // Table
     tranTable = new QListView( control );
     QFont fnt(QPEApplication::font());
     fnt.setPointSize( fnt.pointSize()-1 );
     tranTable->setFont( fnt );
         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->setColumnWidthMode( COL_ID, QListView::Manual );
     tranTable->setColumnWidth( COL_ID, 0);
+    tranTable->addColumn( tr( "SortDate" ) );
+    tranTable->setColumnWidthMode( COL_SORTDATE, QListView::Manual );
+    tranTable->setColumnWidth( COL_SORTDATE, 0);
     tranTable->addColumn( tr( "Num" ) );
         tranTable->addColumn( tr( "Date" ) );
         //tranTable->addColumn( tr( "Cleared" ) );
         tranTable->addColumn( tr( "Description" ) );
         int column = tranTable->addColumn( tr( "Amount" ) );
         tranTable->setColumnAlignment( column, Qt::AlignRight );
     column=tranTable->addColumn( tr("Balance") );
     tranTable->setColumnAlignment( column, 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() ) );
+                  this, SLOT( slotMenuTran(QListViewItem *, const QPoint &) ) );
+    connect( tranTable, SIGNAL( doubleClicked( QListViewItem * ) ),
+                  this, SLOT( slotEditTran() ) );
     _sortCol=COL_ID;
 
     // Buttons
         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." ) );
         connect( btn, SIGNAL( clicked() ), this, SLOT( slotEditTran() ) );
         layout->addWidget( btn, 2, 1 );
 
         btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), control );
         QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );
         connect( btn, SIGNAL( clicked() ), this, SLOT( slotDeleteTran() ) );
         layout->addWidget( btn, 2, 2 );
 
         return( control );
 }
 
 
 // --- initCharts -------------------------------------------------------------
 QWidget *Checkbook::initCharts()
@@ -315,108 +322,110 @@ void Checkbook::loadCheckbook()
                 }
         }
     if( i<=0 ) {
         typeList->insertItem( temptext, 0 );
         typeList->setCurrentItem(0);
     }
         bankEdit->setText( info->bank() );
         acctNumEdit->setText( info->account() );
         pinNumEdit->setText( info->pin() );
         temptext.setNum( info->startingBalance(), 'f', 2 );
         balanceEdit->setText( temptext );
         notesEdit->setText( info->notes() );
 
         // Load transactions
         float amount;
     QString stramount;
     for ( TranInfo *tran = tranList->first(); tran; tran = tranList->next() )
         {
                 amount = tran->amount();
                 if ( tran->withdrawal() )
                 {
                         amount *= -1;
                 }
                 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
-        ( void ) new CBListItem( tran, tranTable, tran->getIdStr(), tran->number(), tran->datestr(), tran->desc(), stramount );
+        ( void ) new CBListItem( tran, tranTable, tran->getIdStr(), tran->datestr(false), tran->number(), tran->datestr(true), tran->desc(), stramount );
         }
 
     // set sort order
     bool bOk=false;
     for(int i=0; i<_cbSortType->count(); i++) {
         if( _cbSortType->text(i)==info->getSortOrder() ) {
             _cbSortType->setCurrentItem(i);
             slotSortChanged( info->getSortOrder() );
             bOk=true;
             break;
         }
     }
     if( !bOk ) {
         _cbSortType->setCurrentItem(0);
         slotSortChanged( _cbSortType->currentText() );
     }
 
     // calc running balance
     adjustBalance();
 }
 
+
 // --- adjustBalance ----------------------------------------------------------
 void Checkbook::adjustBalance()
 {
         // update running balance in register
     QString sRunning;
     float bal=info->startingBalance();
     for(CBListItem *item=(CBListItem *)tranTable->firstChild(); item; item=(CBListItem *)item->nextSibling() ) {
         TranInfo *tran=item->getTranInfo();
         bal=bal + (tran->withdrawal() ? -1 : 1)*tran->amount() - tran->fee();
         sRunning.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), bal );
         item->setText( COL_BAL, sRunning);
     }
 }
 
 // --- resort -----------------------------------------------------------------
 void Checkbook::resort()
 {
     tranTable->setSorting(_sortCol);
     tranTable->sort();
     tranTable->setSorting(-1);
 }
 
 
 // --- accept -----------------------------------------------------------------
 void Checkbook::accept()
 {
         info->setName( nameEdit->text() );
         info->setType( typeList->currentText() );
         info->setBank( bankEdit->text() );
         info->setAccount( acctNumEdit->text() );
         info->setPin( pinNumEdit->text() );
         bool ok;
         info->setStartingBalance( balanceEdit->text().toFloat( &ok ) );
         info->setNotes( notesEdit->text() );
 
         QDialog::accept();
 }
 
+// --- slotPasswordClicked ----------------------------------------------------
 void Checkbook::slotPasswordClicked()
 {
         if ( info->password().isNull() && passwordCB->isChecked() )
         {
                 Password *pw = new Password( this, tr( "Enter password" ), tr( "Please enter your password:" ) );
                 if ( pw->exec() != QDialog::Accepted  )
                 {
                         passwordCB->setChecked( FALSE );
                         delete pw;
                         return;
                 }
                 info->setPassword( pw->password );
                 delete pw;
 
                 pw = new Password( this, tr( "Confirm password" ), tr( "Please confirm your password:" ) );
                 if ( pw->exec() != QDialog::Accepted || pw->password != info->password() )
                 {
                         passwordCB->setChecked( FALSE );
                         info->setPassword( QString::null );
                 }
 
                 delete pw;
         }
         else if ( !info->password().isNull() && !passwordCB->isChecked() )
@@ -443,116 +452,164 @@ void Checkbook::slotNameChanged( const QString &newname )
         info->setName( newname );
 
         // TODO - need filedir
         //QString namestr = filedir;
         //namestr.append( newname );
         //namestr.append( ".qcb" );
         //info->setFilename( namestr );
 
         QString namestr = newname;
         namestr.append( " - " );
         namestr.append( tr( "Checkbook" ) );
         setCaption( namestr );
 }
 
 
 // ---slotStartingBalanceChanged ----------------------------------------------
 void Checkbook::slotStartingBalanceChanged( const QString &newbalance )
 {
         bool ok;
         info->setStartingBalance( newbalance.toFloat( &ok ) );
         adjustBalance();
 }
 
 
+// --- slotNewTran ------------------------------------------------------------
 void Checkbook::slotNewTran()
 {
         TranInfo *traninfo = new TranInfo( info->getNextNumber() );
     if( !_dLastNew.isNull() )
         traninfo->setDate(_dLastNew);
 
-        Transaction *currtran = new Transaction( this, info->name(),
+        Transaction *currtran = new Transaction( this, true, info->name(),
                                                                                          traninfo,
                                                                                          _pCfg );
         currtran->showMaximized();
         if ( currtran->exec() == QDialog::Accepted )
         {
                 // Add to transaction list
                 info->addTransaction( traninfo );
 
                 // Add to transaction table
                 float amount;
                 QString stramount;
                 amount = (traninfo->withdrawal() ? -1 : 1)*traninfo->amount();
                 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
-                ( void ) new CBListItem( traninfo, tranTable, traninfo->getIdStr(),
-                                 traninfo->number(), traninfo->datestr(), traninfo->desc(),
+                ( void ) new CBListItem( traninfo, tranTable, traninfo->getIdStr(), traninfo->datestr(false),
+                                 traninfo->number(), traninfo->datestr(true), traninfo->desc(),
                                                                  stramount );
         resort();
                 adjustBalance();
 
         // save last date
         _dLastNew = traninfo->date();
+
+        // save description in list of payees, if not in there
+        QStringList *pLst=&_pCfg->getPayees();
+        if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) {
+            pLst->append( traninfo->desc() );
+            pLst->sort();
+            _pCfg->setDirty(true);
+        }
         }
         else
         {
                 delete traninfo;
         }
 }
 
+
+// --- slotEditTran -----------------------------------------------------------
 void Checkbook::slotEditTran()
 {
         QListViewItem *curritem = tranTable->currentItem();
         if ( !curritem )
                 return;
-        
+
         TranInfo *traninfo=info->findTransaction( curritem->text(COL_ID) );
 
-        Transaction *currtran = new Transaction( this, info->name(),
+        Transaction *currtran = new Transaction( this, false, info->name(),
                                                                                          traninfo,
                                                                                          _pCfg );
         currtran->showMaximized();
         if ( currtran->exec() == QDialog::Accepted )
         {
                 curritem->setText( COL_NUM, traninfo->number() );
-                curritem->setText( COL_DATE, traninfo->datestr() );
+        curritem->setText( COL_SORTDATE, traninfo->datestr(false) );
+                curritem->setText( COL_DATE, traninfo->datestr(true) );
                 curritem->setText( COL_DESC, traninfo->desc() );
 
                 float amount = traninfo->amount();
                 if ( traninfo->withdrawal() )
                 {
                         amount *= -1;
                 }
                 QString stramount;
                 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
                 curritem->setText( COL_AMOUNT, stramount );
         resort();
         adjustBalance();
+
+        // save description in list of payees, if not in there
+        QStringList *pLst=&_pCfg->getPayees();
+        if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) {
+            pLst->append( traninfo->desc() );
+            pLst->sort();
+            _pCfg->setDirty(true);
+        }
         }
 
         delete currtran;
 }
 
+// --- slotMenuTran -----------------------------------------------------------
+void Checkbook::slotMenuTran(QListViewItem *item, const QPoint &pnt)
+{
+    // active item?
+    if( !item )
+        return;
+
+    // Display menu
+    QPopupMenu m;
+        m.insertItem( QWidget::tr( "Edit" ), 1 );
+        m.insertItem( QWidget::tr( "New" ), 2 );
+        m.insertItem( QWidget::tr( "Delete" ), 3 );
+        int r = m.exec( pnt );
+    switch(r) {
+    case 1:
+        slotEditTran();
+        break;
+    case 2:
+        slotNewTran();
+        break;
+    case 3:
+        slotDeleteTran();
+        break;
+    }
+}
+
+
+// --- slotDeleteTran ---------------------------------------------------------
 void Checkbook::slotDeleteTran()
 {
         QListViewItem *curritem = tranTable->currentItem();
         if ( !curritem )
                 return;
 
         TranInfo *traninfo = info->findTransaction( curritem->text(COL_ID) );
 
         if ( QPEMessageBox::confirmDelete ( this, tr( "Delete transaction" ), traninfo->desc() ) )
         {
                 info->removeTransaction( traninfo );
                 delete curritem;
         adjustBalance();
         }
 }
 
 void Checkbook::slotDrawGraph()
 {
         if ( graphInfo )
         {
                 delete graphInfo;
         }
 
         switch ( graphList->currentItem() )
@@ -570,49 +627,49 @@ void Checkbook::slotDrawGraph()
 }
 
 void Checkbook::drawBalanceChart()
 {
         DataPointList *list = new DataPointList();
 
         float balance = info->startingBalance();
         float amount;
         QString label;
         int i = 0;
         int count = tranList->count();
 
         for ( TranInfo *tran = tranList->first(); tran; tran = tranList->next() )
         {
                 i++;
                 balance -= tran->fee();
                 amount = tran->amount();
                 if ( tran->withdrawal() )
                 {
                         amount *= -1;
                 }
                 balance += amount;
                 if ( i == 1 || i == count / 2 || i == count )
                 {
-                        label = tran->datestr();
+                        label = tran->datestr(true);
                 }
                 else
                 {
                         label = "";
                 }
                 list->append( new DataPointInfo( label, balance ) );
         }
 
         graphInfo = new GraphInfo( GraphInfo::BarChart, list );
 }
 
 void Checkbook::drawCategoryChart( bool withdrawals )
 {
         DataPointList *list = new DataPointList();
 
         TranInfo *tran = tranList->first();
         if ( tran && tran->withdrawal() == withdrawals )
         {
                 list->append( new DataPointInfo( tran->category(), tran->amount() ) );
         }
         tran = tranList->next();
 
         DataPointInfo *cat;
         for ( ; tran; tran = tranList->next() )
@@ -645,48 +702,49 @@ CBListItem::CBListItem( TranInfo *pTran, QListView *parent, QString label1, QStr
                                          QString label3, QString label4, QString label5, QString label6, QString label7,
                                          QString label8 )
         : QListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
 {
     _pTran=pTran;
         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, cg.background() );
 
         QListViewItem::paintCell(p, _cg, column, width, align);
 }
 
+// --- CBListItem::isAltBackground --------------------------------------------
 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
@@ -702,29 +760,30 @@ bool CBListItem::isAltBackground()
                         }
                 }
                 return m_odd;
         }
         return false;
 }
 
 
 // --- slotTab ----------------------------------------------------------------
 void Checkbook::slotTab(QWidget *tab)
 {
     if( !tab || !info ) return;
     info->setLastTab( tab->name() );
 }
 
 
 // --- slotSortChanged ---------------------------------------------------------
 void Checkbook::slotSortChanged( const QString &selc )
 {
     if( selc==tr("Entry Order") ) {
         _sortCol=COL_ID;
     } else if( selc==tr("Number") ) {
         _sortCol=COL_NUM;
     } else if( selc==tr("Date") ) {
-        _sortCol=COL_DATE;
+        _sortCol=COL_SORTDATE;
     }
     info->setSortOrder( selc );
     resort();
 }
+