1 files changed, 29 insertions, 30 deletions

diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 4b81c6d..20b42b5 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -30,2 +30,4 @@
 #include "transaction.h"
+#include "graph.h"
+#include "graphinfo.h"
 
@@ -52,3 +54,5 @@ Checkbook::Checkbook( QWidget *parent, const QString &n, const QString &fd, char
         name = n;
-        filename = fd + name + ".qcb";
+        filename = fd;
+        filename.append( name );
+        filename.append( ".qcb" );
         filedir = fd;
@@ -59,3 +63,6 @@ Checkbook::Checkbook( QWidget *parent, const QString &n, const QString &fd, char
         {
-                setCaption( name + " - " + tr( "Checkbook" ) );
+                QString tempstr = name;
+                tempstr.append( " - " );
+                tempstr.append( tr( "Checkbook" ) );
+                setCaption( tempstr );
         }
@@ -244,9 +251,10 @@ QWidget *Checkbook::initCharts()
 
-        QWidget *graphWidget = new QWidget( control );
-        QWhatsThis::add( graphWidget, tr( "Graph not implemented yet." ) );
+        GraphInfo* info = new GraphInfo( GraphInfo::BarChart, 0x0, tr( "Graph Title" ),
+                                                                         tr( "X-Axis" ), tr( "Y-Axis" ) );
+        graphWidget = new Graph( control, info );
+        QWhatsThis::add( graphWidget, tr( "Charting is not implemented yet." ) );
         layout->addMultiCellWidget( graphWidget, 0, 0, 0, 1 );
-        graphWidget->setBackgroundMode( QWidget::PaletteBase );
 
         QPushButton *btn = new QPushButton( Resource::loadPixmap( "checkbook/drawbtn" ), tr( "Draw" ), control );
-        QWhatsThis::add( btn, tr( "Click here to draw the graph." ) );
+        QWhatsThis::add( btn, tr( "Click here to draw the chart." ) );
         connect( btn, SIGNAL( clicked() ), this, SLOT( slotDrawGraph() ) );
@@ -278,4 +286,4 @@ void Checkbook::loadCheckbook()
         bankEdit->setText( config.readEntry( "Bank", "" ) );
-        acctNumEdit->setText( config.readEntry( "Number", "" ) );
-        pinNumEdit->setText( config.readEntry( "PINNumber", "" ) );
+        acctNumEdit->setText( config.readEntryCrypt( "Number", "" ) );
+        pinNumEdit->setText( config.readEntryCrypt( "PINNumber", "" ) );
         balanceEdit->setText( config.readEntry( "Balance", "0.0" ) );
@@ -311,7 +319,3 @@ void Checkbook::loadCheckbook()
                         // Add to transaction table
-                        QDate date = tran->date();
-                        QString datestr = QString::number( date.month() ) + "/" +
-                                                          QString::number( date.day() ) + "/" +
-                                                          QString::number( date.year() );
-                        ( void ) new QListViewItem( tranTable, QString::number( i ), datestr,
+                        ( void ) new QListViewItem( tranTable, QString::number( i ), tran->datestr(),
                                                                                 trandesc, stramount );
@@ -359,4 +363,4 @@ void Checkbook::accept()
         config->writeEntry( "Bank", bankEdit->text() );
-        config->writeEntry( "Number", acctNumEdit->text() );
-        config->writeEntry( "PINNumber", pinNumEdit->text() );
+        config->writeEntryCrypt( "Number", acctNumEdit->text() );
+        config->writeEntryCrypt( "PINNumber", pinNumEdit->text() );
         config->writeEntry( "Balance", balanceEdit->text() );
@@ -381,4 +385,9 @@ void Checkbook::slotNameChanged( const QString &newname )
         name = newname;
-        filename = filedir + newname + ".qcb";
-        setCaption( name + " - " + tr( "Checkbook" ) );
+        filename = filedir;
+        filename.append( newname );
+        filename.append( ".qcb" );
+        QString tempstr = name;
+        tempstr.append( " - " );
+        tempstr.append( tr( "Checkbook" ) );
+        setCaption( tempstr );
 }
@@ -416,9 +425,4 @@ void Checkbook::slotNewTran()
                 // Add to transaction table
-
-                QDate date = traninfo->date();
-                QString datestr = QString::number( date.month() ) + "/" +
-                                                  QString::number( date.day() ) + "/" +
-                                                  QString::number( date.year() );
-                ( void ) new QListViewItem( tranTable, QString::number( highTranNum ), datestr,
-                                                                        traninfo->desc(), stramount );
+                ( void ) new QListViewItem( tranTable, QString::number( highTranNum ),
+                                                                        traninfo->datestr(), traninfo->desc(), stramount );
 
@@ -456,7 +460,3 @@ void Checkbook::slotEditTran()
         {
-                QDate date = traninfo->date();
-                QString datestr = QString::number( date.month() ) + "/" +
-                                                  QString::number( date.day() ) + "/" +
-                                                  QString::number( date.year() );
-                curritem->setText( 1, datestr );
+                curritem->setText( 1, traninfo->datestr() );
 
@@ -491,3 +491,2 @@ void Checkbook::slotDeleteTran()
         int tranid = curritem->text( 0 ).toInt( &ok );
-        //TranInfo *traninfo = transactions.at( tranid - 1 );
         TranInfo *traninfo = findTranByID( tranid );