apply patch to HEAD

12 files changed, 239 insertions, 34 deletions

diff --git a/noncore/apps/checkbook/cfg.cpp b/noncore/apps/checkbook/cfg.cpp
index 1e0ec5c..0d5d9ed 100644
--- a/noncore/apps/checkbook/cfg.cpp
+++ b/noncore/apps/checkbook/cfg.cpp
@@ -43,6 +43,7 @@ Cfg::Cfg()
     _showLocks=FALSE;
     _showBalances=FALSE;
     _pCategories=new CategoryList();
+    _bDirty=false;
 }
 
 // --- readStringList ---------------------------------------------------------
@@ -52,8 +53,6 @@ Cfg::Cfg()
 // entries.
 void Cfg::readStringList(Config &cfg, const char *sKey, QStringList &lst)
 {
-qDebug( "%s", sKey );
-
     QString sEntry;
     int iCount;
 
@@ -86,6 +85,7 @@ void Cfg::readConfig(Config &config)
     _openLastBook = config.readBoolEntry( "OpenLastBook", FALSE );
     _sLastBook = config.readEntry("LastBook", "");
     _showLastTab = config.readBoolEntry( "ShowLastTab", FALSE );
+    _bSavePayees = config.readBoolEntry( "SavePayees", FALSE );
 
     // Account types
     readStringList(config, "AccType", _AccountTypes);
@@ -100,6 +100,9 @@ void Cfg::readConfig(Config &config)
         config.write();
     }
 
+    // Payees
+    readStringList(config, "Payee", _Payees);
+
     // Read Categories
     QStringList lst;
     readStringList(config, "Category", lst);
@@ -131,6 +134,9 @@ void Cfg::readConfig(Config &config)
     } else {
         setCategories(lst);
     }
+
+    // not dirty
+    _bDirty=false;
 }
 
 
@@ -166,16 +172,21 @@ void Cfg::writeConfig(Config &config)
     config.writeEntry( "OpenLastBook", _openLastBook );
     config.writeEntry( "LastBook", _sLastBook );
     config.writeEntry( "ShowLastTab", _showLastTab );
+    config.writeEntry( "SavePayees", _bSavePayees );
 
     // write account types
     writeStringList(config, "AccType", _AccountTypes);
 
+    // write payees
+    writeStringList(config, "Payee", _Payees);
+
     // write categories
     QStringList lst=getCategories();
     writeStringList(config, "Category", lst );
 
     // commit write
     config.write();
+    _bDirty=false;
 }
 
 
diff --git a/noncore/apps/checkbook/cfg.h b/noncore/apps/checkbook/cfg.h
index 2b69368..20692b4 100644
--- a/noncore/apps/checkbook/cfg.h
+++ b/noncore/apps/checkbook/cfg.h
@@ -77,6 +77,11 @@ class Cfg
         void setCurrencySymbol(const char *n) { _currencySymbol=n; }
         QStringList &getAccountTypes() { return(_AccountTypes); }
 
+        // --- Payees
+        QStringList &getPayees() { return(_Payees); }
+        bool getSavePayees() { return(_bSavePayees); }
+        void setSavePayees(bool bSave) { _bSavePayees=bSave; }
+
         // --- Categories
         QStringList getCategories();
         void setCategories(QStringList &lst);
@@ -98,23 +103,30 @@ class Cfg
         // --- writes data to config file
         void writeConfig(Config &cfg);
 
+        // --- dirty flag
+        bool isDirty() { return(_bDirty); }
+        void setDirty(bool bDirty) { _bDirty=bDirty; }
+
+    protected:
         // --- reads list from config file
         static void readStringList(Config &cfg, const char *sKey, QStringList &lst);
 
         // --- writes list in configuration file
         static void writeStringList(Config &cfg, const char *sKey, QStringList &lst);
 
-
-
     private:
         QString  _currencySymbol;
 		bool _showLocks;
 		bool _showBalances;
         bool _openLastBook;
         bool _showLastTab;
+        bool _bDirty;
+        bool _bSavePayees;
         QString _sLastBook;
         QStringList _AccountTypes;
         CategoryList *_pCategories;
+        QStringList _Payees;
+
 };
 
 #endif
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
@@ -49,13 +49,15 @@
 #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_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 )
@@ -224,6 +226,9 @@ QWidget *Checkbook::initTransactions()
     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" ) );
@@ -237,6 +242,8 @@ QWidget *Checkbook::initTransactions()
 	layout->addMultiCellWidget( tranTable, 1, 1, 0, 2 );
 	QPEApplication::setStylusOperation( tranTable->viewport(), QPEApplication::RightOnHold );
 	connect( tranTable, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
+	 	 this, SLOT( slotMenuTran(QListViewItem *, const QPoint &) ) );
+    connect( tranTable, SIGNAL( doubleClicked( QListViewItem * ) ),
 			 this, SLOT( slotEditTran() ) );
     _sortCol=COL_ID;
 
@@ -336,7 +343,7 @@ void Checkbook::loadCheckbook()
 			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
@@ -358,6 +365,7 @@ void Checkbook::loadCheckbook()
     adjustBalance();
 }
 
+
 // --- adjustBalance ----------------------------------------------------------
 void Checkbook::adjustBalance()
 {
@@ -396,6 +404,7 @@ void Checkbook::accept()
 	QDialog::accept();
 }
 
+// --- slotPasswordClicked ----------------------------------------------------
 void Checkbook::slotPasswordClicked()
 {
 	if ( info->password().isNull() && passwordCB->isChecked() )
@@ -464,13 +473,14 @@ void Checkbook::slotStartingBalanceChanged( const QString &newbalance )
 }
 
 
+// --- 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();
@@ -484,14 +494,22 @@ void Checkbook::slotNewTran()
 		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
 	{
@@ -499,6 +517,8 @@ void Checkbook::slotNewTran()
 	}
 }
 
+
+// --- slotEditTran -----------------------------------------------------------
 void Checkbook::slotEditTran()
 {
 	QListViewItem *curritem = tranTable->currentItem();
@@ -507,14 +527,15 @@ void Checkbook::slotEditTran()
 	
 	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();
@@ -527,11 +548,47 @@ void Checkbook::slotEditTran()
 		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();
@@ -591,7 +648,7 @@ void Checkbook::drawBalanceChart()
 		balance += amount;
 		if ( i == 1 || i == count / 2 || i == count )
 		{
-			label = tran->datestr();
+			label = tran->datestr(true);
 		}
 		else
 		{
@@ -666,6 +723,7 @@ void CBListItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int
 	QListViewItem::paintCell(p, _cg, column, width, align);
 }
 
+// --- CBListItem::isAltBackground --------------------------------------------
 bool CBListItem::isAltBackground()
 {
 	QListView *lv = static_cast<QListView *>( listView() );
@@ -723,8 +781,9 @@ void Checkbook::slotSortChanged( const QString &selc )
     } else if( selc==tr("Number") ) {
         _sortCol=COL_NUM;
     } else if( selc==tr("Date") ) {
-        _sortCol=COL_DATE;
+        _sortCol=COL_SORTDATE;
     }
     info->setSortOrder( selc );
     resort();
 }
+
diff --git a/noncore/apps/checkbook/checkbook.h b/noncore/apps/checkbook/checkbook.h
index 1b6a2d3..e18f00c 100644
--- a/noncore/apps/checkbook/checkbook.h
+++ b/noncore/apps/checkbook/checkbook.h
@@ -48,6 +48,7 @@ class QString;
 class TranInfo;
 class TranInfoList;
 class Cfg;
+class QMouseEvent;
 
 
 // --- Checkbook --------------------------------------------------------------
@@ -62,6 +63,9 @@ class Checkbook : public QDialog
         // resort
         void resort();
 
+        // members
+        TranInfoList *getTranList() { return(tranList); }
+
 	private:
 		CBInfo *info;
 		TranInfoList *tranList;
@@ -109,11 +113,13 @@ class Checkbook : public QDialog
 		void slotStartingBalanceChanged( const QString & );
 		void slotNewTran();
 		void slotEditTran();
+        void slotMenuTran(QListViewItem *, const QPoint &);
 		void slotDeleteTran();
 		void slotDrawGraph();
         void slotSortChanged( const QString & );
 };
 
+
 // --- CBListItem -------------------------------------------------------------
 class CBListItem :  public QListViewItem
 {
diff --git a/noncore/apps/checkbook/configuration.cpp b/noncore/apps/checkbook/configuration.cpp
index 3f5662d..dfae446 100644
--- a/noncore/apps/checkbook/configuration.cpp
+++ b/noncore/apps/checkbook/configuration.cpp
@@ -76,6 +76,12 @@ Configuration::Configuration( QWidget *parent, Cfg &cfg )
     QStringList lst=cfg.getCategories();
     _listEditCategories->addData( lst );
     _mainWidget->addTab( _listEditCategories, tr( "&Categories" ) );
+
+    // Payees tab
+    _listEditPayees=new ListEdit(_mainWidget, "PAYEES");
+    _listEditPayees->addColumnDef( new ColumnDef( tr("Payee"), (ColumnDef::ColumnType)(ColumnDef::typeString | ColumnDef::typeUnique), tr("New Payee")) );
+    _listEditPayees->addData( cfg.getPayees() );
+    _mainWidget->addTab( _listEditPayees, tr("&Payees") );
 }
 
 Configuration::~Configuration()
@@ -138,6 +144,12 @@ QWidget *Configuration::initSettings(Cfg &cfg)
     lastTabCB->setChecked( cfg.isShowLastTab() );
     layout->addMultiCellWidget( lastTabCB, 4, 4, 0, 1 );
 
+    savePayees = new QCheckBox( tr("Save new description as payee"), container );
+    QWhatsThis::add( savePayees, tr("Click here to save new descriptions in the list of payess.") );
+    savePayees->setMaximumHeight(fh+5);
+    savePayees->setChecked( cfg.getSavePayees() );
+    layout->addMultiCellWidget( savePayees, 5, 5, 0, 1 );
+
     return(control);
 }
 
@@ -150,6 +162,7 @@ void Configuration::saveConfig(Cfg &cfg)
     cfg.setShowBalances( balCB->isChecked() );
     cfg.setOpenLastBook( openLastBookCB->isChecked() );
     cfg.setShowLastTab( lastTabCB->isChecked() );
+    cfg.setSavePayees( savePayees->isChecked() );
 
     // Typelist
     _listEditTypes->storeInList( cfg.getAccountTypes() );
@@ -158,4 +171,7 @@ void Configuration::saveConfig(Cfg &cfg)
     QStringList lst;
     _listEditCategories->storeInList( lst );
     cfg.setCategories( lst );
+
+    // Payees
+    _listEditPayees->storeInList( cfg.getPayees() );
 }
diff --git a/noncore/apps/checkbook/configuration.h b/noncore/apps/checkbook/configuration.h
index 5893502..663514d 100644
--- a/noncore/apps/checkbook/configuration.h
+++ b/noncore/apps/checkbook/configuration.h
@@ -52,9 +52,11 @@ class Configuration : public QDialog
 		QCheckBox *balCB;
         QCheckBox *openLastBookCB;
         QCheckBox *lastTabCB;
+        QCheckBox *savePayees;
         QTabWidget *_mainWidget;
         ListEdit *_listEditTypes;
         ListEdit *_listEditCategories;
+        ListEdit *_listEditPayees;
 
         // saves settings in config struct
         void saveConfig(Cfg &cfg);
diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp
index 99a6531..37f05f0 100644
--- a/noncore/apps/checkbook/listedit.cpp
+++ b/noncore/apps/checkbook/listedit.cpp
@@ -116,6 +116,10 @@ void ListEdit::slotAdd()
     QPoint pnt;
     slotClick(_currentItem, pnt, 0);
     _typeTable->setSelected( _currentItem, true );
+
+    // make it selected
+    _typeEdit->setCursorPosition(0);
+    _typeEdit->setSelection(0, _typeEdit->text().length() );
 }
 
 // --- slotDel -------------------------------------------------------------
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 8d64cad..bf00102 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -58,7 +58,6 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
 
 	// Load configuration options
 	Config config( "checkbook" );
-qDebug( "Reading config" );
     _cfg.readConfig( config );
 
 
@@ -314,6 +313,12 @@ void MainWindow::openBook(QListViewItem *curritem)
 			tempstr.sprintf( "%s%.2f", _cfg.getCurrencySymbol().latin1(), cb->balance() );
 			curritem->setText( posName + 1, tempstr );
 		}
+
+        // write config, if needed
+        if( _cfg.isDirty() ) {
+            Config config("checkbook");
+            _cfg.writeConfig( config );
+        }
 	}
 	delete currcb;
 }
diff --git a/noncore/apps/checkbook/traninfo.cpp b/noncore/apps/checkbook/traninfo.cpp
index d880bb4..506f567 100644
--- a/noncore/apps/checkbook/traninfo.cpp
+++ b/noncore/apps/checkbook/traninfo.cpp
@@ -29,6 +29,7 @@
 #include "traninfo.h"
 
 #include <qpe/config.h>
+#include <qpe/timestring.h>
 
 QString tempstr;
 
@@ -124,14 +125,17 @@ TranInfo::TranInfo( Config config, int entry )
 }
 
 // --- datestr ----------------------------------------------------------------
-const QString &TranInfo::datestr()
+const QString &TranInfo::datestr(bool bDisplayDate)
 {
-    int y=td.year();
-    y= y>=2000 && y<=2099 ? y-2000 : y;
-    tempstr.sprintf( "%02d/%02d/%02d", y ,td.month(), td.day() );
+    if( bDisplayDate ) {
+        tempstr=TimeString::numberDateString( td );
+    } else {
+        tempstr.sprintf( "%04d-%02d-%02d", td.year() ,td.month(), td.day() );
+    }
     return( tempstr );
 }
 
+
 // --- getIdStr ---------------------------------------------------------------
 const QString &TranInfo::getIdStr()
 {
@@ -210,3 +214,14 @@ QString TranInfo::toString()
     );
     return(ret);
 }
+
+
+// --- findMostRecentByDesc ---------------------------------------------------
+TranInfo *TranInfoList::findMostRecentByDesc( const QString &desc )
+{
+    for(TranInfo *cur=last(); cur; cur=prev()) {
+        if( cur->desc()==desc )
+            return( cur );
+    }
+    return(NULL);
+}
\ No newline at end of file
diff --git a/noncore/apps/checkbook/traninfo.h b/noncore/apps/checkbook/traninfo.h
index 0abdc61..cbe0238 100644
--- a/noncore/apps/checkbook/traninfo.h
+++ b/noncore/apps/checkbook/traninfo.h
@@ -49,7 +49,7 @@ class TranInfo
 
 		const QString &desc()		const { return d; }
 		const QDate   &date()		const { return td; }
-		const QString &datestr();
+		const QString &datestr(bool = false);
 		bool           withdrawal()	const { return w; }
 		const QString &type()		const { return t; }
 		const QString &category()	const { return c; }
@@ -93,6 +93,9 @@ class TranInfo
 
 class TranInfoList : public QList<TranInfo>
 {
+    public:
+        TranInfo *findMostRecentByDesc( const QString &desc );
+
 	protected:
 		int compareItems( QCollection::Item, QCollection::Item );
 };
diff --git a/noncore/apps/checkbook/transaction.cpp b/noncore/apps/checkbook/transaction.cpp
index 138d0e6..9379da0 100644
--- a/noncore/apps/checkbook/transaction.cpp
+++ b/noncore/apps/checkbook/transaction.cpp
@@ -29,8 +29,10 @@
 #include "transaction.h"
 #include "traninfo.h"
 #include "cfg.h"
+#include "checkbook.h"
 
 #include <qpe/datebookmonth.h>
+#include <qpe/resource.h>
 
 #include <qbuttongroup.h>
 #include <qcombobox.h>
@@ -41,14 +43,15 @@
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 
-Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *info,
-							Cfg *pCfg )
+Transaction::Transaction( QWidget *parent, bool bNew, const QString &acctname,
+							 TranInfo *info, Cfg *pCfg )
 	: QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
 	QString tempstr = tr( "Transaction for " );
 	tempstr.append( acctname );
 	setCaption( tempstr );
 
+    _bNew=bNew;
 	tran = info;
 	_pCfg=pCfg;
 
@@ -114,9 +117,12 @@ Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *in
 	label = new QLabel( tr( "Description:" ), container );
 	QWhatsThis::add( label, tr( "Enter description of transaction here." ) );
 	layout->addWidget( label, 2, 0 );
-	descEdit = new QLineEdit( container );
-	QWhatsThis::add( descEdit, tr( "Enter description of transaction here." ) );
-	layout->addMultiCellWidget( descEdit, 2, 2, 1, 3 );
+    _cbDesc=new QComboBox( true, container );
+    _cbDesc->insertStringList( _pCfg->getPayees() );
+	QWhatsThis::add( _cbDesc, tr( "Enter description of transaction here." ) );
+	layout->addMultiCellWidget( _cbDesc, 2, 2, 1, 3 );
+    connect( _cbDesc, SIGNAL( activated(const QString &) ), this, SLOT( slotActivated(const QString &) ) );
+
 
 	// Category
 	label = new QLabel( tr( "Category:" ), container );
@@ -134,6 +140,7 @@ Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *in
 	QWhatsThis::add( typeList, tr( "Select transaction type here.\n\nThe options available vary based on whether the transaction is a deposit or withdrawal." ) );
 	layout->addMultiCellWidget( typeList, 4, 4, 1, 3 );
 
+
 	// Amount
 	label = new QLabel( tr( "Amount:" ), container );
 	QWhatsThis::add( label, tr( "Enter the amount of transaction here.\n\nThe value entered should always be positive." ) );
@@ -158,6 +165,22 @@ Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *in
 	QWhatsThis::add( noteEdit, tr( "Enter any additional information for this transaction here." ) );
 	layout->addMultiCellWidget( noteEdit, 8, 8, 0, 3 );
 
+    // init date
+    initFromInfo( info );
+
+    // not new handlers
+    connect( withBtn, SIGNAL( toggled(bool) ), this, SLOT( slotNotNew() ) );
+    connect( depBtn, SIGNAL( toggled(bool) ), this, SLOT( slotNotNew() ) );
+    connect( catList, SIGNAL(activated(const QString &)), this, SLOT( slotNotNew() ) );
+    connect( typeList, SIGNAL(activated(const QString &)), this, SLOT( slotNotNew() ) );
+    connect( amtEdit, SIGNAL(textChanged(const QString &)), this, SLOT( slotNotNew() ) );
+    connect( feeEdit, SIGNAL(textChanged(const QString &)), this, SLOT( slotNotNew() ) );
+    connect( noteEdit, SIGNAL(textChanged()), this, SLOT( slotNotNew() ) );
+}
+
+// --- initFromInfo -----------------------------------------------------------
+void Transaction::initFromInfo(TranInfo *info, bool bPopulateOld)
+{
 	// Populate current values if provided
 	if ( info )
 	{
@@ -171,13 +194,27 @@ Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *in
 			depBtn->setChecked( TRUE );
 			slotDepositClicked();
 		}
+
+        if( !bPopulateOld ) {
 		QDate dt = info->date();
 		slotDateChanged( dt.year(), dt.month(), dt.day() );
 		datePicker->setDate( dt );
 		numEdit->setText( info->number() );
-		descEdit->setText( info->desc() );
+        }
 		QString temptext = info->category();
-		int i = catList->count();
+
+        // set description field
+        int i;
+        for(i=_cbDesc->count()-1; i>=0; i--) {
+            if( _cbDesc->text(i)==info->desc() ) {
+                _cbDesc->setCurrentItem(i);
+                break;
+            }
+        }
+        if( i<=0 )
+            _cbDesc->setEditText( info->desc() );
+
+		i = catList->count();
 		while ( i > 0 )
 		{
 			i--;
@@ -208,13 +245,16 @@ Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *in
 	}
 }
 
+
+// --- ~Transaction -----------------------------------------------------------
 Transaction::~Transaction()
 {
 }
 
+// --- accept -----------------------------------------------------------------
 void Transaction::accept()
 {
-	tran->setDesc( descEdit->text() );
+	tran->setDesc( _cbDesc->currentText() );
 	tran->setDate( datePicker->selectedDate() );
 	tran->setWithdrawal( withBtn->isChecked() );
 	tran->setType( typeList->currentText() );
@@ -262,9 +302,37 @@ void Transaction::slotDepositClicked()
 	typeList->insertItem( tr( "Cash" ) );
 }
 
+// --- slotDateChanged --------------------------------------------------------
 void Transaction::slotDateChanged( int y, int m, int d )
 {
 	QDate date;
 	date.setYMD( y, m, d );
 	dateBtn->setText( TimeString::shortDate( date ) );
 }
+
+
+
+// --- slotActivated ----------------------------------------------------------
+// Search for the most recent transaction with this description/payee and
+// fill amount etc here, as long the new flag is set
+void Transaction::slotActivated(const QString &arg )
+{
+    if( !_bNew ) return;
+    TranInfoList *pTl=((Checkbook *)parentWidget())->getTranList();
+    if( pTl ) {
+        TranInfo *pTi=pTl->findMostRecentByDesc( arg );
+        if( pTi ) {
+            initFromInfo( pTi, true );
+            amtEdit->setFocus();
+            amtEdit->setSelection(0, amtEdit->text().length() );
+            amtEdit->setCursorPosition(0);
+        }
+    }
+}
+
+// slotNotNew -----------------------------------------------------------------
+void Transaction::slotNotNew()
+{
+    qDebug("Not new");
+    _bNew=false;
+}
diff --git a/noncore/apps/checkbook/transaction.h b/noncore/apps/checkbook/transaction.h
index fbe9cd3..130d769 100644
--- a/noncore/apps/checkbook/transaction.h
+++ b/noncore/apps/checkbook/transaction.h
@@ -47,12 +47,14 @@ class Transaction : public QDialog
 	Q_OBJECT
 
 	public:
-		Transaction( QWidget *, const QString &, TranInfo *, Cfg *);
+		Transaction( QWidget *, bool, const QString &, TranInfo *, Cfg *);
 		~Transaction();
 
+        void initFromInfo(TranInfo *, bool=false);
+
 	private:
 		TranInfo *tran;
-
+        bool _bNew;
 		Cfg *_pCfg;
 
 		QRadioButton   *withBtn;
@@ -60,7 +62,7 @@ class Transaction : public QDialog
 		QPushButton    *dateBtn;
 		DateBookMonth  *datePicker;
 		QLineEdit      *numEdit;
-		QLineEdit      *descEdit;
+        QComboBox      *_cbDesc;
 		QComboBox      *catList;
 		QComboBox      *typeList;
 		QLineEdit      *amtEdit;
@@ -74,6 +76,8 @@ class Transaction : public QDialog
 		void slotWithdrawalClicked();
 		void slotDepositClicked();
 		void slotDateChanged( int, int, int );
+        void slotActivated(const QString & );
+        void slotNotNew();
 };
 
 #endif