merge noncore/apps/* except

 - advancedfm (ljp, please...)
 - odict (tille, please...)

1 files changed, 38 insertions, 16 deletions

diff --git a/noncore/apps/checkbook/traninfo.cpp b/noncore/apps/checkbook/traninfo.cpp
index 65c190c..d880bb4 100644
--- a/noncore/apps/checkbook/traninfo.cpp
+++ b/noncore/apps/checkbook/traninfo.cpp
@@ -31,24 +31,25 @@
 #include <qpe/config.h>
 
 QString tempstr;
 
 TranInfo::TranInfo( int id, const QString &desc, const QDate &date, bool withdrawal,
                                         const QString &type, const QString &category, float amount,
-                                        float fee, const QString &number, const QString &notes )
+                                        float fee, const QString &number, const QString &notes, int next )
 {
         i = id;
         d = desc;
         td = date;
         w = withdrawal;
         t = type;
         c = category;
         a = amount;
         f = fee;
         cn = number;
         n = notes;
+    _next=next;
 }
 
 TranInfo::TranInfo( Config config, int entry )
 {
         config.setGroup( QString::number( entry ) );
         QString desc = config.readEntry( "Description", "Not Found" );
@@ -108,38 +109,43 @@ TranInfo::TranInfo( Config config, int entry )
                 a = stramount.toFloat( &ok );
 
                 // Transaction fee
                 stramount = config.readEntry( "TransactionFee", "0.00" );
                 f = stramount.toFloat( &ok );
 
-                // Transaction number
+        // Transaction number
                 cn = config.readEntry( "CheckNumber", "" );
 
                 // Notes
                 n = config.readEntry( "Comments", "" );
+
+        // next
+        _next = config.readNumEntry("Next", -1);
         }
 }
 
+// --- datestr ----------------------------------------------------------------
 const QString &TranInfo::datestr()
 {
-        tempstr = QString::number( td.year() );
-        tempstr.append( '/' );
-        int tempfield = td.month();
-        if ( tempfield < 10 ) tempstr.append( '0' );
-        tempstr.append( QString::number( tempfield ) );
-        tempstr.append( '/' );
-        tempfield = td.day();
-        if ( tempfield < 10 ) tempstr.append( '0' );
-        tempstr.append( QString::number( tempfield ) );
+    int y=td.year();
+    y= y>=2000 && y<=2099 ? y-2000 : y;
+    tempstr.sprintf( "%02d/%02d/%02d", y ,td.month(), td.day() );
+    return( tempstr );
+}
 
-        return( tempstr );
+// --- getIdStr ---------------------------------------------------------------
+const QString &TranInfo::getIdStr()
+{
+    tempstr.sprintf("%04d", i);
+    return( tempstr );
 }
 
-void TranInfo::write( Config *config, int entry )
+// --- write ------------------------------------------------------------------
+void TranInfo::write( Config *config )
 {
-        config->setGroup( QString::number( entry ) );
+        config->setGroup( QString::number( id() ) );
 
         config->writeEntry( "Description", d );
 
         tempstr = QString::number( td.month() );
         tempstr.append( '/' );
         tempstr.append( QString::number( td.day() ) );
@@ -166,17 +172,18 @@ void TranInfo::write( Config *config, int entry )
         tempstr.setNum( a, 'f', 2 );
         config->writeEntry( "Amount", tempstr );
 
         tempstr.setNum( f, 'f', 2 );
         config->writeEntry( "TransactionFee", tempstr );
 
-        config->writeEntry( "CheckNumber", cn );
-
+    config->writeEntry( "CheckNumber", cn );
         config->writeEntry( "Comments", n );
+    config->writeEntry( "Next", _next );
 }
 
+
 int TranInfoList::compareItems( QCollection::Item item1, QCollection::Item item2 )
 {
         QDate d1 = ((TranInfo *)item1)->date();
         QDate d2 = ((TranInfo *)item2)->date();
         int r = -1;
 
@@ -185,6 +192,21 @@ int TranInfoList::compareItems( QCollection::Item item1, QCollection::Item item2
         else if ( d1 == d2 )
                 r = 0;
         else if ( d1 > d2 )
                 r = 1;
         return( r );
 }
+
+// --- toString ---------------------------------------------------------------
+QString TranInfo::toString()
+{
+    QString ret;
+    ret.sprintf("(%4d) %10s %4s %-10s %5.2f %5.2f",
+        id(),
+        (const char *)datestr(),
+        (const char *)number(),
+        (const char *)desc(),
+        (withdrawal() ? -1 : 1) * amount(),
+        fee()
+    );
+    return(ret);
+}