1 files changed, 15 insertions, 19 deletions

diff --git a/noncore/apps/checkbook/transaction.cpp b/noncore/apps/checkbook/transaction.cpp
index c94b989..138d0e6 100644
--- a/noncore/apps/checkbook/transaction.cpp
+++ b/noncore/apps/checkbook/transaction.cpp
@@ -19,46 +19,47 @@
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "transaction.h"
 #include "traninfo.h"
+#include "cfg.h"
 
 #include <qpe/datebookmonth.h>
 
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 
 Transaction::Transaction( QWidget *parent, const QString &acctname, TranInfo *info,
-                                                        const QString &symbol )
+                                                        Cfg *pCfg )
         : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
         QString tempstr = tr( "Transaction for " );
         tempstr.append( acctname );
         setCaption( tempstr );
 
         tran = info;
-        currencySymbol = symbol;
+        _pCfg=pCfg;
 
         QVBoxLayout *vb = new QVBoxLayout( this );
 
         QScrollView *sv = new QScrollView( this );
         vb->addWidget( sv, 0, 0 );
         sv->setResizePolicy( QScrollView::AutoOneFit );
         sv->setFrameStyle( QFrame::NoFrame );
 
         QWidget *container = new QWidget( sv->viewport() );
         sv->addChild( container );
 
         QGridLayout *layout = new QGridLayout( container );
@@ -221,53 +222,48 @@ void Transaction::accept()
         bool ok;
         tran->setAmount( amtEdit->text().toFloat( &ok ) );
         tran->setFee( feeEdit->text().toFloat( &ok ) );
         tran->setNumber( numEdit->text() );
         tran->setNotes( noteEdit->text() );
         
         QDialog::accept();
 }
 
 void Transaction::slotWithdrawalClicked()
 {
         catList->clear();
-        catList->insertItem( tr( "Automobile" ) );
-        catList->insertItem( tr( "Bills" ) );
-        catList->insertItem( tr( "CDs" ) );
-        catList->insertItem( tr( "Clothing" ) );
-        catList->insertItem( tr( "Computer" ) );
-        catList->insertItem( tr( "DVDs" ) );
-        catList->insertItem( tr( "Electronics" ) );
-        catList->insertItem( tr( "Entertainment" ) );
-        catList->insertItem( tr( "Food" ) );
-        catList->insertItem( tr( "Gasoline" ) );
-        catList->insertItem( tr( "Misc" ) );
-        catList->insertItem( tr( "Movies" ) );
-        catList->insertItem( tr( "Rent" ) );
-        catList->insertItem( tr( "Travel" ) );
+    CategoryList *pCatList=_pCfg->getCategoryList();
+    for(Category *pCat=pCatList->first(); pCat; pCat=pCatList->next()) {
+        if( !pCat->isIncome() )
+            catList->insertItem( pCat->getName() );
+    }
         catList->setCurrentItem( 0 );
+
         typeList->clear();
         typeList->insertItem( tr( "Debit Charge" ) );
         typeList->insertItem( tr( "Written Check" ) );
         typeList->insertItem( tr( "Transfer" ) );
         typeList->insertItem( tr( "Credit Card" ) );
 }
 
 void Transaction::slotDepositClicked()
 {
         catList->clear();
-        catList->insertItem( tr( "Work" ) );
-        catList->insertItem( tr( "Family Member" ) );
-        catList->insertItem( tr( "Misc. Credit" ) );
+        CategoryList *pCatList=_pCfg->getCategoryList();
+    for(Category *pCat=pCatList->first(); pCat; pCat=pCatList->next()) {
+        if( pCat->isIncome() )
+            catList->insertItem( pCat->getName() );
+    }
         catList->setCurrentItem( 0 );
+
         typeList->clear();
         typeList->insertItem( tr( "Written Check" ) );
         typeList->insertItem( tr( "Automatic Payment" ) );
         typeList->insertItem( tr( "Transfer" ) );
         typeList->insertItem( tr( "Cash" ) );
 }
 
 void Transaction::slotDateChanged( int y, int m, int d )
 {
         QDate date;
         date.setYMD( y, m, d );
         dateBtn->setText( TimeString::shortDate( date ) );