Working on time frame for displaying cleared transactions. Not yet working.

15 files changed, 106 insertions, 31 deletions

diff --git a/noncore/apps/qashmoney/install/CONTROL/opie-qashmoney.control b/noncore/apps/qashmoney/install/CONTROL/opie-qashmoney.control
index ffd11db..b00e3b1 100755
--- a/noncore/apps/qashmoney/install/CONTROL/opie-qashmoney.control
+++ b/noncore/apps/qashmoney/install/CONTROL/opie-qashmoney.control
@@ -1,7 +1,7 @@
 Package: qashmoney
 Priority: optional
-Version: 0.74
+Version: 0.75
 Architecture: arm
 Maintainer: Allen Forsythe qashmoneyman@attbi.com
 Section: Applications
 Description: QashMoney provides an intuitive and fast way to keep track of your accounts and budgets.
diff --git a/noncore/apps/qashmoney/preferencedialogs.cpp b/noncore/apps/qashmoney/preferencedialogs.cpp
index 00d52c6..d7c66d3 100755
--- a/noncore/apps/qashmoney/preferencedialogs.cpp
+++ b/noncore/apps/qashmoney/preferencedialogs.cpp
@@ -55,80 +55,81 @@ void DatePreferences::changeDateFormat ( int index )
   }
 
 void DatePreferences::changeDateSeparator ( int index )
   {
     index ++;
     preferences->changePreference ( 2, index );
   }
 
 void DatePreferences::setDefaultDatePreferences ()
   {
     preferences->setDefaultDatePreferences ();
     dateformat->setCurrentItem ( ( preferences->getPreference ( 1 ) ) - 1 );
     dateseparator->setCurrentItem ( ( preferences->getPreference ( 2 ) ) - 1 );
   }
 
 // START TRANSACTION PREFERENCES
 
 TransactionPreferences::TransactionPreferences ( QWidget* parent ) : QDialog ( parent, 0, TRUE )
 {
     setCaption( tr ( "Transaction" ) );
 
     showclearedtransactions = new QCheckBox ( this );
     showclearedtransactions->setText ( "Show Cleared Transactions" );
 
-    excludetransfers = new QCheckBox ( this );
-    excludetransfers->setText ( "Include Transfers In Limit View" );
-
     limittransactionsbox = new QHBox ( this );
     limittransactionsbox->setSpacing ( 2 );
-    limittransactionslabel = new QLabel ( "Limit All Transactions To", limittransactionsbox );
+    limittransactionslabel = new QLabel ( "Show ", limittransactionsbox );
     limittransactions = new QComboBox ( limittransactionsbox );
+    QLabel *limittransactionslabel2 = new QLabel ( "of cleared transactions. ", limittransactionsbox );
     limittransactions->insertItem ( "14 days" );
     limittransactions->insertItem ( "30 days" );
-    limittransactions->insertItem ( "60 days" );
     limittransactions->insertItem ( "90 days" );
     limittransactions->insertItem ( "180 days" );
     limittransactions->insertItem ( "365 days" );
     limittransactions->insertItem ( "All" );
+    limittransactions->setCurrentItem ( preferences->getPreference ( 7 ) );
+
+    excludetransfers = new QCheckBox ( this );
+    excludetransfers->setText ( "Include Transfers In Limit View" );
 
     if ( preferences->getPreference ( 3 ) == 1 )
       showclearedtransactions->setChecked ( TRUE );
     else
       showclearedtransactions->setChecked ( FALSE );
 
     if ( preferences->getPreference ( 6 ) == 1 )
       excludetransfers->setChecked ( TRUE );
     else
       excludetransfers->setChecked ( FALSE );
 
     defaults = new QPushButton ( QPixmap ( "/opt/QtPalmtop/pics/defaults.png" ), "Defaults", this );
     connect ( defaults, SIGNAL ( released () ), this, SLOT ( setDefaultTransactionPreferences () ) );
 
     layout = new QVBoxLayout ( this, 2, 2 );
     layout->addWidget ( showclearedtransactions );
-    layout->addWidget ( excludetransfers );
     layout->addWidget ( limittransactionsbox );
+    layout->addWidget ( excludetransfers );
     layout->insertSpacing ( 3, 5 );
     layout->addWidget ( defaults );
 
     connect ( showclearedtransactions, SIGNAL ( toggled ( bool ) ), this, SLOT ( changeShowClearedPreference ( bool ) ) );
     connect ( excludetransfers, SIGNAL ( toggled ( bool ) ), this, SLOT ( changeExcludeTranfersPreference ( bool ) ) );
     connect ( limittransactions, SIGNAL ( activated ( int ) ), this, SLOT ( changeLimitTransactionsPreference ( int ) ) );
 }
 
 TransactionPreferences::~TransactionPreferences ()
   {
   }
 
 void TransactionPreferences::changeLimitTransactionsPreference ( int pref )
   {
     preferences->changePreference ( 7, pref );
   }
 
 void TransactionPreferences::changeShowClearedPreference ( bool state )
   {
     if ( state == TRUE )
       preferences->changePreference ( 3, 1 );
     else
       preferences->changePreference ( 3, 0 );
   }
diff --git a/noncore/apps/qashmoney/preferences.cpp b/noncore/apps/qashmoney/preferences.cpp
index 819d5cf..9bf64dd 100755
--- a/noncore/apps/qashmoney/preferences.cpp
+++ b/noncore/apps/qashmoney/preferences.cpp
@@ -39,49 +39,49 @@ void Preferences::addPreferences ()
       // showclearedtransactions preference 0 = no 1 = yes
       rows = 0;
       sqlite_get_table ( db, "select preference from preferences where id = 3;", &results, &rows, &columns, 0 );
       if ( rows == 0 )
         sqlite_exec ( db, "insert into preferences values ( 0, 'showclearedtransactions', 0, 0, 0, NULL );", 0, 0, 0 );
 
       // enable currency support preference 0 = no 1 = yes
       rows = 0;
       sqlite_get_table ( db, "select preference from preferences where id = 4;", &results, &rows, &columns, 0 );
       if ( rows == 0 )
         sqlite_exec ( db, "insert into preferences values ( 0, 'enablecurrencysupport', 0, 0, 0, NULL );", 0, 0, 0 );
 
       // one touch account viewing preference 0 = no 1 = yes
       rows = 0;
       sqlite_get_table ( db, "select preference from preferences where id = 5;", &results, &rows, &columns, 0 );
       if ( rows == 0 )
         sqlite_exec ( db, "insert into preferences values ( 0, 'onetouchviewing', 0, 0, 0, NULL );", 0, 0, 0 );
 
       // exclude transfers from limit view 0 = no 1 = yes
       rows = 0;
       sqlite_get_table ( db, "select preference from preferences where id = 6;", &results, &rows, &columns, 0 );
       if ( rows == 0 )
         sqlite_exec ( db, "insert into preferences values ( 0, 'excludetransfersfromlimit', 0, 0, 0, NULL );", 0, 0, 0 );
 
-      // limit number of transactions to 0 = 14 days 1 = 30 days, 2 = 60 days, 3 = 90 days, 4 = 180 days, 5 = 365 days, 6 = all
+      // limit number of transactions to 0 = 14 days 1 = 30 days, 2 = 90 days, 3 = 180 days, 4 = 365 days 5 = all
       rows = 0;
       sqlite_get_table ( db, "select preference from preferences where id = 7;", &results, &rows, &columns, 0 );
       if ( rows == 0 )
         sqlite_exec ( db, "insert into preferences values ( 0, 'limittransactions', 0, 0, 0, NULL );", 0, 0, 0 );
     }
   }
 
 void Preferences::initializeColumnPreferences ()
   {
     int rows = 0;
     int columns = 0;
     char **results;
 
     // initialize accountname column width
     sqlite_get_table ( db, "select width from columns where id = 1;", &results, &rows, &columns, 0 );
     if ( rows == 0 )
       sqlite_exec ( db, "insert into columns values ( 'accountname', 90, 0, 0, 0, NULL );", 0, 0, 0 );
 
     // initialize accountbalance column width
     sqlite_get_table ( db, "select width from columns where id = 2;", &results, &rows, &columns, 0 );
     if ( rows == 0 )
       sqlite_exec ( db, "insert into columns values ( 'accountbalance', 90, 0, 0, 0, NULL );", 0, 0, 0 );
 
     // initialize transactiondate column width
diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp
index 1ea358c..83eea01 100755
--- a/noncore/apps/qashmoney/qashmoney.cpp
+++ b/noncore/apps/qashmoney/qashmoney.cpp
@@ -122,54 +122,56 @@ void QashMoney::changeTabDisplay ()
         transactiondisplay->listview->addColumn ( "Transaction", 0 );
         transactiondisplay->listview->addColumn ( "Amt", 0);
         transactiondisplay->listview->setColumnAlignment ( 2, Qt::AlignRight );
         transactiondisplay->listview->addColumn ( "", 0 );
 
         if ( accountdisplay->listview->selectedItem()->parent() == 0 && accountdisplay->listview->selectedItem()->childCount() != 0 ) // we selected a parent with children
           {
             // add an extra column for the account name for eac child transaction
             transactiondisplay->listview->addColumn ( "Acct", 0 );
             children = TRUE;
 
             // hide the new transaction button
             transactiondisplay->newtransaction->setEnabled ( FALSE );
           }
         else //we selected a parent without children or a child
           transactiondisplay->newtransaction->setEnabled ( TRUE );
 
         // disable the transactionid column so it can't be red
         transactiondisplay->listview->header()->setResizeEnabled ( FALSE, 3 );
 
         // set the accountid and children variables
         transactiondisplay->setChildren ( children );
         transactiondisplay->setAccountID ( accountid );
 
+        setTransactionDisplayDate ();
+
         // display transactions
         transactiondisplay->listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( transactiondisplay->limitbox->text() );
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext );
+          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext, newdate );
 
         // display transfers
         transfer->displayTransfers ( transactiondisplay->listview, accountid, children );
 
         // open a new preferences object and resize the transaction display columns
         // each column will have a different size based on whether we are looking at a child
         // account or children through a parent
         if ( parentaccountid != -1 || accountdisplay->listview->selectedItem()->childCount() == 0 ) // a parent with no children or a child - three columns
           {
             transactiondisplay->listview->setColumnWidth ( 0, preferences->getColumnPreference ( 3 ) ); // normal transaction date width
             transactiondisplay->listview->setColumnWidthMode ( 0, QListView::Manual );
             transactiondisplay->listview->setColumnWidth ( 1, preferences->getColumnPreference ( 4 ) ); // normal transaction name width
             transactiondisplay->listview->setColumnWidthMode ( 1, QListView::Manual );
             transactiondisplay->listview->setColumnWidth ( 2, preferences->getColumnPreference ( 5 ) ); // normal transaction amount width
             transactiondisplay->listview->setColumnWidthMode ( 2, QListView::Manual );
           }
         else
           {
             transactiondisplay->listview->setColumnWidth ( 0, preferences->getColumnPreference ( 6 ) ); // extended transaction date width
             transactiondisplay->listview->setColumnWidthMode ( 0, QListView::Manual );
             transactiondisplay->listview->setColumnWidth ( 1, preferences->getColumnPreference ( 7 ) ); // extended transaction name width
             transactiondisplay->listview->setColumnWidthMode ( 1, QListView::Manual );
             transactiondisplay->listview->setColumnWidth ( 2, preferences->getColumnPreference ( 8 ) ); // extended transaction amount width
             transactiondisplay->listview->setColumnWidthMode ( 2, QListView::Manual );
@@ -233,86 +235,90 @@ void QashMoney::setTransactionTab ()
   }
 
 void QashMoney::displayDatePreferencesDialog ()
   {
     // this shows a dialog to set preferences for formatting the date
     DatePreferences *pd = new DatePreferences ( this );
     pd->exec ();
     if ( transactiondisplay->isVisible() )
       {
         // set the account id
         int accountid = accountdisplay->listview->selectedItem()->text ( accountdisplay->getIDColumn() ).toInt();
 
         // set children so we can let displayTransfers know if there are children for the selected account
         bool children;
         if ( accountdisplay->listview->selectedItem()->parent() == 0 && accountdisplay->listview->selectedItem()->childCount() != 0 )
           children = TRUE;
         else
           children = FALSE;
 
         // redisplay transactions if they are visible incorporating
         // any changes to the date format
         transactiondisplay->listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( transactiondisplay->limitbox->text() );
+
+        setTransactionDisplayDate();
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext );
+          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext, newdate );
 
         if ( transfer->getNumberOfTransfers() != 0 )
           transfer->displayTransfers ( transactiondisplay->listview, accountid, children );
       }
     else if ( accountdisplay->isVisible() )
       {
         accountdisplay->listview->clearSelection();
         maintabs->setTabEnabled ( tab_2, FALSE );
       }
     else
       budgetdisplay->updateBudgetInformation();
   }
 
 void QashMoney::displayTransactionPreferencesDialog ()
   {
     // display a dialog for setting preferences for transactions
     TransactionPreferences *td = new TransactionPreferences ( this );
     td->exec ();
     if ( transactiondisplay->isVisible() )
       {
         // set the account id
         int accountid = accountdisplay->listview->selectedItem()->text ( accountdisplay->getIDColumn() ).toInt();
 
         // set children so we can let displayTransfers know if there are children for the selected account
         bool children;
         if ( accountdisplay->listview->selectedItem()->parent() == 0 && accountdisplay->listview->selectedItem()->childCount() != 0 )
           children = TRUE;
         else
           children = FALSE;
 
         // redisplay transactions incorporating any transaction preference changes
         transactiondisplay->listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( transactiondisplay->limitbox->text() );
+
+        setTransactionDisplayDate();
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext );
+          transaction->displayTransactions ( transactiondisplay->listview, accountid, children, displaytext, newdate );
 
         if ( transfer->getNumberOfTransfers() != 0 )
           transfer->displayTransfers ( transactiondisplay->listview, accountid, children );
       }
     else
       {
         accountdisplay->listview->clearSelection();
         maintabs->setTabEnabled ( tab_2, FALSE );
       }
   }
 
 void QashMoney::displayAccountPreferencesDialog ()
   {
     // display a dialog for setting preferences for accounts
     AccountPreferences *ap = new AccountPreferences ( this );
     ap->exec ();
 
     if ( accountdisplay->isVisible() && account->getNumberOfAccounts() != 0 )
       {
         accountdisplay->listview->clear();
         account->displayAccounts ( accountdisplay->listview );
         accountdisplay->listview->clearSelection();
         maintabs->setTabEnabled ( tab_2, FALSE );
       }
@@ -331,26 +337,54 @@ void QashMoney::showTransactions ()
     maintabs->setCurrentPage ( 1 );
   }
 
 void QashMoney::enableOneTouchViewing ()
   {
     if ( preferences->getPreference ( 5 ) == 1 )
       connect ( accountdisplay->listview, SIGNAL ( selectionChanged () ), this, SLOT ( showTransactions () ) );
     else
       disconnect ( accountdisplay->listview, SIGNAL ( selectionChanged () ), this, SLOT ( showTransactions () ) );
   }
 
 void QashMoney::disableOneTouchViewing ()
   {
     disconnect ( accountdisplay->listview, SIGNAL ( selectionChanged () ), this, SLOT ( showTransactions () ) );
   }
 
 void QashMoney::toggleOneTouchViewing ( bool state )
   {
     if ( state == TRUE )
       disableOneTouchViewing();
     else
       enableOneTouchViewing();
   }
 
-
+void QashMoney::setTransactionDisplayDate ()
+  {
+    // determine how many days of transactions to show
+    int limittype = preferences->getPreference ( 7 );
+    if ( limittype != 5 ) // set today's date if we are not showing all transactions
+      {
+        QDate today = QDate::currentDate ();
+        switch ( limittype ) // if we are not showing all transactions
+          {
+            case 0:  // viewing two weeks
+              newdate = today.addDays ( -14 );
+              break;
+            case 1:  // viewing one month
+              newdate = today.addDays ( -30 );
+              break;
+            case 2: // three months
+              newdate = today.addDays ( -90 );
+              break;
+            case 3: // six months
+              newdate = today.addDays ( -180 );
+              break;
+            case 4: // one year
+              newdate = today.addDays ( -365 );
+              break;
+          }
+      }
+    else
+      newdate = QDate ( 1, 1, 1000 );
+  }
 
diff --git a/noncore/apps/qashmoney/qashmoney.h b/noncore/apps/qashmoney/qashmoney.h
index cf0bd42..ec2c7ec 100755
--- a/noncore/apps/qashmoney/qashmoney.h
+++ b/noncore/apps/qashmoney/qashmoney.h
@@ -1,61 +1,64 @@
 #ifndef QASHMONEY_H
 #define QASHMONEY_H
 
 #include <qpe/qpemenubar.h>
 #include <qpopupmenu.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
+#include <qdatetime.h>
 
 #include "accountdisplay.h"
 #include "transactiondisplay.h"
 #include "budgetdisplay.h"
 #include "account.h"
 #include "preferences.h"
 #include "transaction.h"
 #include "transfer.h"
 #include "memory.h"
 #include "budget.h"
 
 class QashMoney : public QWidget
   {
     Q_OBJECT
 
     public:
       QashMoney ();
       ~QashMoney();
 
       QTabWidget* maintabs;
       QWidget* tab;
       QWidget* tab_2;
       QWidget* tab_3;
 
       QPEMenuBar *mainmenu;
       QPopupMenu *preferencesmenu;
       QPopupMenu *utilitiesmenu;
 
     public slots:
       void displayDatePreferencesDialog ();
       void displayTransactionPreferencesDialog ();
       void displayAccountPreferencesDialog ();
       void displayMemoryDialog ();
       void setTransactionTab ();
 
     private slots:
       void changeTabDisplay ();
       void showTransactions ();
       void enableOneTouchViewing ();
       void disableOneTouchViewing ();
       void toggleOneTouchViewing ( bool );
+      void setTransactionDisplayDate ();
 
     private:
       QVBoxLayout *layout;
       QVBoxLayout *tabslayout;
       AccountDisplay *accountdisplay;
       TransactionDisplay *transactiondisplay;
       BudgetDisplay *budgetdisplay;
       int tabheight;
+      QDate newdate;
 
   };
 
 #endif
 
diff --git a/noncore/apps/qashmoney/qmaccounts.db b/noncore/apps/qashmoney/qmaccounts.db
index 449bcab..76db78b 100755
--- a/noncore/apps/qashmoney/qmaccounts.db
+++ b/noncore/apps/qashmoney/qmaccounts.db
diff --git a/noncore/apps/qashmoney/qmbudgets.db b/noncore/apps/qashmoney/qmbudgets.db
index d798f0c..ef75719 100755
--- a/noncore/apps/qashmoney/qmbudgets.db
+++ b/noncore/apps/qashmoney/qmbudgets.db
diff --git a/noncore/apps/qashmoney/qmmemory.db b/noncore/apps/qashmoney/qmmemory.db
index 5c23122..c6b7920 100755
--- a/noncore/apps/qashmoney/qmmemory.db
+++ b/noncore/apps/qashmoney/qmmemory.db
diff --git a/noncore/apps/qashmoney/qmpreferences.db b/noncore/apps/qashmoney/qmpreferences.db
index a4e96f5..91596cb 100755
--- a/noncore/apps/qashmoney/qmpreferences.db
+++ b/noncore/apps/qashmoney/qmpreferences.db
diff --git a/noncore/apps/qashmoney/qmtransactions.db b/noncore/apps/qashmoney/qmtransactions.db
index 9e4acc9..a5eb4f3 100755
--- a/noncore/apps/qashmoney/qmtransactions.db
+++ b/noncore/apps/qashmoney/qmtransactions.db
diff --git a/noncore/apps/qashmoney/qmtransfers.db b/noncore/apps/qashmoney/qmtransfers.db
index c31df1a..3ca9f78 100755
--- a/noncore/apps/qashmoney/qmtransfers.db
+++ b/noncore/apps/qashmoney/qmtransfers.db
diff --git a/noncore/apps/qashmoney/transaction.cpp b/noncore/apps/qashmoney/transaction.cpp
index af7d18f..5ecc7ed 100755
--- a/noncore/apps/qashmoney/transaction.cpp
+++ b/noncore/apps/qashmoney/transaction.cpp
@@ -1,34 +1,35 @@
 // RESERVEDONE COLUMN NAME REPRESENTS THE LINEITEMID AND SHOULD BE CHANGED IN
 // FUTURE VERSIONS OF QASHMONEY
 
 // RESERVEDTWO REPRESENTS THE TRANSACTION DESCRIPTION
 
 #include "transaction.h"
 #include "account.h"
 #include "transactiondisplay.h"
 
 #include <stdlib.h>
+#include <iostream.h>
 
 extern Account *account;
 extern Preferences *preferences;
 
 Transaction::Transaction ()
   {
     tdb = sqlite_open ( "qmtransactions.db", 0, NULL );
   }
 
 Transaction::~Transaction ()
   {
     sqlite_close ( tdb );
   }
 
 void Transaction::addTransaction ( QString description, QString payee, int accountid, int parentid, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid )
   {
     sqlite_exec_printf ( tdb, "insert into transactions values ( '%q', %i, %i, %i, %i, %i, %i, %.2f, %i, %i, 0, 0, 0, 0, 0, 0, %i, '%q', 0,
     0, 0, 0, NULL );", 0, 0, 0, ( const char * ) payee, accountid, parentid, number, day, month, year, amount, cleared, budgetid, lineitemid, ( const char * ) description );
   }
 
 void Transaction::updateTransaction ( QString description, QString payee, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid, int transactionid )
   {
     sqlite_exec_printf ( tdb, "update transactions set reservedtwo = '%q', payee = '%q', number = %i, day = %i, month = %i, year = %i, amount = %.2f,
       cleared = %i, budgetid = %i, reservedone = %i where transid = %i;", 0, 0, 0, ( const char * ) description, ( const char * ) payee, number, day, month, year,
@@ -133,84 +134,79 @@ int Transaction::getLineItemID ( int id )
 int Transaction::getDay ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select day from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString daystring = results [ 1 ];
     return daystring.toInt();
   }
 
 int Transaction::getMonth ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select month from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString monthstring = results [ 1 ];
     return monthstring.toInt();
   }
 
 int Transaction::getYear ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select year from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString yearstring = results [ 1 ];
     return yearstring.toInt();
   }
 
-void Transaction::displayTransactions ( QListView *listview, int id, bool children, const char *limit )
+void Transaction::displayTransactions ( QListView *listview, int id, bool children, const char *limit, QDate displaydate )
   {
     int showcleared = preferences->getPreference ( 3 );
+    int year = ( displaydate.year() ) - 1;
 
     // select the transactions to display
     // two different statements are used based on
     // whether we are showing cleared transactions
     char **results;
     int rows, columns;
     if ( showcleared == 0 )
       {
         if ( account->getParentAccountID ( id ) == -1 && children == TRUE )
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and year >= %i parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
         else
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 year >= %i accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
       }
     else
       {
       if ( account->getParentAccountID ( id ) == -1 && children == TRUE )
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where year >= %i and parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
       else
         sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
       }
 
     // iterate through the result list and display each item
     int counter = 7;
     while ( counter < ( ( rows + 1 ) * columns ) )
       {
-        // construct the date
-        //QString daystring = results [ counter ];
-        //int day = results [ counter ].toInt ();
-        //QString monthstring = results [ counter + 1 ];
-        //int month = results [ counter + 1 ].toInt ();
-        //QString yearstring = results [ counter + 2 ];
-        //int year = results [ counter + 2 ].toInt ();
-        QString date = preferences->getDate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
+        QDate displaydate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
+        QString date = preferences->getDate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
 
         // construct transaction name, amount, id
         QString payee = results [ counter + 3 ];
         QString amount = results [ counter + 4 ];
         QString transferid = results [ counter + 5 ];
 
         //determine the account name of the child accounts that we're displaying
         QString accountname = account->getAccountName ( atoi ( results [ counter + 6 ] ) );
 
         // fill in values
         if ( account->getParentAccountID ( id ) != -1 ) // use these constructors if we're showing a child account
           {
             if ( showcleared == 1 && getCleared ( transferid.toInt() ) == 1 )
               ColorListItem *item = new ColorListItem ( listview, date, payee, amount, transferid);
             else
               QListViewItem *item = new QListViewItem ( listview, date, payee, amount, transferid );
           }
        else
          {
             if ( showcleared == 1 && getCleared ( transferid.toInt() ) == 1 )
               ColorListItem *item = new ColorListItem ( listview, date, payee, amount, transferid, accountname );
             else
               QListViewItem *item = new QListViewItem ( listview, date, payee, amount, transferid, accountname );
          }
diff --git a/noncore/apps/qashmoney/transaction.h b/noncore/apps/qashmoney/transaction.h
index 5db011c..7297bb1 100755
--- a/noncore/apps/qashmoney/transaction.h
+++ b/noncore/apps/qashmoney/transaction.h
@@ -1,69 +1,70 @@
 #ifndef TRANSACTION_H
 #define TRANSACTION_H
 
 #include <qstring.h>
 #include <qlistview.h>
+#include <qdatetime.h>
 #include <sqlite.h>
 
 #include "preferences.h"
 
 class Transaction
   {
     public:
 
       Transaction ();
       ~Transaction ();
 
       // This function adds a new transaction to the database.  It takes the  payee, accountid,
       // budgetid, number, day, month, year, amount, cleared
       void addTransaction ( QString description, QString payee, int accountid, int parentid, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid );
 
       // This updates an already existing transaction
       void updateTransaction ( QString, QString, int, int, int, int, float, int, int, int, int );
 
       // Deletes a transaction.  Takes the transid as its parameter
       void deleteTransaction ( int );
 
       // Returns the number of transactions
       int getNumberOfTransactions ();
 
       // this is an overloaded function that returns the number of
       // transactions for an account
       int getNumberOfTransactions ( int );
 
       // deletes all transactions for the provided accountid
       void deleteAllTransactions ( int accountid );
 
       QString getBudgetTotal ( int budgetid, int lineitemid, int year, int month, int viewtype );
       QString getActualTotal ( int budgetid, int year, int month, int viewtype );
 
       // These two functions clear budget ids is either a line item or an entire budget is deleted
       void clearBudgetIDs ( int, int );
       void clearBudgetIDs ( int );
 
     public slots:
 
-      void displayTransactions ( QListView *, int, bool, const char * );
+      void displayTransactions ( QListView *, int, bool, const char *, QDate );
       QString getPayee ( int );
       QString getTransactionDescription ( int );
       QString getNumber ( int );
       QString getAmount ( int );
       QString getAbsoluteAmount ( int );
       int getCleared ( int );
       void setCleared ( int id, int cleared );
       int getBudgetID ( int id );
       int getLineItemID ( int id );
       int getDay ( int );
       int getMonth ( int );
       int getYear ( int );
       int getAccountID ( int id );
 
     private:
 
       sqlite *tdb;
   };
 
 #endif
 
 
 
diff --git a/noncore/apps/qashmoney/transactiondisplay.cpp b/noncore/apps/qashmoney/transactiondisplay.cpp
index 14f5641..ae6223d 100755
--- a/noncore/apps/qashmoney/transactiondisplay.cpp
+++ b/noncore/apps/qashmoney/transactiondisplay.cpp
@@ -106,50 +106,51 @@ void TransactionDisplay::addTransaction ()
           cleared = 1;
         else
           cleared = 0;
 
         float amount = newtransaction->transactionamount->text().toFloat();
         if ( newtransaction->depositbox->isChecked() == FALSE )
           amount = amount * -1;
 
        // add the transaction name to the memory items
        memory->addMemoryItem ( newtransaction->transactionname->currentText() );
 
         // add the transaction
         if ( newtransaction->getDateEdited () == TRUE )
           transaction->addTransaction ( newtransaction->getDescription(), newtransaction->transactionname->currentText(), accountid, account->getParentAccountID ( accountid ),
             newtransaction->transactionnumber->text().toInt(), newtransaction->getDay(), newtransaction->getMonth(), newtransaction->getYear(), amount, cleared, newtransaction->getCurrentBudget(),
             newtransaction->getCurrentLineItem() );
         else
           transaction->addTransaction ( newtransaction->getDescription(), newtransaction->transactionname->currentText(), accountid, account->getParentAccountID ( accountid ),
             newtransaction->transactionnumber->text().toInt(), defaultday, defaultmonth, defaultyear, amount, cleared, newtransaction->getCurrentBudget(), newtransaction->getCurrentLineItem() );
 
         // redisplay transactions
         listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( limitbox->text() );
+        setTransactionDisplayDate ();
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( listview, accountid, children, displaytext );
+          transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
 
         // redisplay transfers
         if ( transfer->getNumberOfTransfers() > 0 )
           transfer->displayTransfers ( listview, accountid, children );
 
         // add the transaction amount to the account it's associated with
         // and update its parent account balance if necessary
         account->updateAccountBalance ( accountid );
         if ( account->getParentAccountID ( accountid ) != -1 )
           account->changeParentAccountBalance ( account->getParentAccountID ( accountid ) );
 
         // format then reset the account balance
         redisplayAccountBalance ();
       }
   }
 
 void TransactionDisplay::checkListViewEdit ()
   {
     if ( listview->selectedItem() == 0 )
       QMessageBox::warning ( this, "QashMoney", "Please select a transaction\nto edit.");
     else if ( listview->currentItem()->text ( getIDColumn() ).toInt() < 0 )
       editTransfer ();
     else
       editTransaction();
@@ -344,125 +345,128 @@ void TransactionDisplay::editTransaction ()
           cleared = 0;
 
         float amount = newtransaction->transactionamount->text().toFloat();
         if ( newtransaction->depositbox->isChecked() == FALSE )
           amount = amount * -1;
 
        // add the transaction name to the memory items
        memory->addMemoryItem ( newtransaction->transactionname->currentText() );
 
         // update the transaction
         transaction->updateTransaction ( newtransaction->getDescription(), newtransaction->transactionname->currentText(), newtransaction->transactionnumber->text().toInt(),
           newtransaction->getDay(), newtransaction->getMonth(), newtransaction->getYear(),
           amount, cleared, newtransaction->getCurrentBudget(), newtransaction->getCurrentLineItem(), transactionid );
 
         updateAndDisplay ( transaction->getAccountID ( transactionid ) );
       }
   }
 
 void TransactionDisplay::updateAndDisplay ( int id )
   {
     // redisplay transactions
     listview->clear();
     QString displaytext = "%";
     displaytext.prepend ( limitbox->text() );
+    setTransactionDisplayDate ();
     if ( transaction->getNumberOfTransactions() > 0 )
-      transaction->displayTransactions ( listview, accountid, children, displaytext );
+      transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
 
     // redisplay transfers
     if ( transfer->getNumberOfTransfers() > 0 )
       transfer->displayTransfers ( listview, accountid, children );
 
     // add the transaction amount to the account it's associated with
     // and update its parent account balance if necessary
     account->updateAccountBalance ( id );
     if ( account->getParentAccountID ( id ) != -1 )
       account->changeParentAccountBalance ( account->getParentAccountID ( id ) );
 
     // format then reset the account balance
     redisplayAccountBalance ();
   }
 
 void TransactionDisplay::checkListViewDelete ()
   {
     if ( listview->selectedItem() == 0 )
       QMessageBox::warning ( this, "QashMoney", "Please select a transaction to\ndelete.");
     else
       deleteTransaction ();
   }
 
 void TransactionDisplay::deleteTransaction ()
   {
     int transactionid = listview->currentItem()->text ( getIDColumn() ).toInt();
 
     if ( transactionid > 0 ) // takes care of deleting transactions
       {
         // check if we are viewing child transactions through a parent
         // in that case we will have to update balances for the parent
         // which is represented by accountid and the child account
         // which will be represented by childaccountid
         int childaccountid = -1;
         if ( listview->columns() == 5 )
           childaccountid = transaction->getAccountID ( transactionid );
 
         transaction->deleteTransaction ( transactionid );
 
         listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( limitbox->text() );
+        setTransactionDisplayDate ();
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( listview, accountid, children, displaytext );
+          transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
 
         if ( transfer->getNumberOfTransfers() > 0 )
           transfer->displayTransfers ( listview, accountid, children );
 
         // if we are viewing different child accounts through the parent account
         // ie if there are five columns and the parentid is -1
         // update the accountid ( which is the parent ) and update the child account
         // balance.  Get its accountid from the transactionid
         account->updateAccountBalance ( accountid ); // will update either a parent or child
         if ( account->getParentAccountID ( accountid ) != -1 ) // update its parent if there is one
           account->changeParentAccountBalance ( account->getParentAccountID ( accountid ) );
         if ( childaccountid != -1 ) // we've set childaccountid
           account->updateAccountBalance ( childaccountid );
 
         // format then reset the account balance
         redisplayAccountBalance ();
       }
     else // takes care of deleting transfers
       {
         // get the accountids before we delete the transfer
         int fromaccountid = transfer->getFromAccountID ( transactionid );
         int toaccountid = transfer->getToAccountID ( transactionid );
 
         // delete the transfer and redisplay transactions
         transfer->deleteTransfer ( transactionid );
 
         listview->clear();
         QString displaytext = "%";
         displaytext.prepend ( limitbox->text() );
+        setTransactionDisplayDate ();
         if ( transaction->getNumberOfTransactions() > 0 )
-          transaction->displayTransactions ( listview, accountid, children, displaytext );
+          transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
 
         if ( transfer->getNumberOfTransfers() > 0 )
           transfer->displayTransfers ( listview, accountid, children );
 
         // for the from account
         account->updateAccountBalance ( fromaccountid );
         if ( account->getParentAccountID ( fromaccountid ) != -1 )
           account->changeParentAccountBalance ( account->getParentAccountID ( fromaccountid ) );
 
         // for the to account
         account->updateAccountBalance ( toaccountid );
         if ( account->getParentAccountID ( toaccountid ) != -1 )
           account->changeParentAccountBalance ( account->getParentAccountID ( toaccountid ) );
 
         // format then reset the account balance
         redisplayAccountBalance ();
       }
   }
 
 void TransactionDisplay::checkListViewToggle ()
   {
     if ( listview->selectedItem() == 0 )
       QMessageBox::warning ( this, "QashMoney", "Please select a transaction to\nclear or reset.");
     else
@@ -471,50 +475,51 @@ void TransactionDisplay::checkListViewToggle ()
 
 void TransactionDisplay::toggleTransaction ()
   {
     //get the transaction of the selected transaction to determine if its a transaction or transfer
     int transactionid = listview->currentItem()->text ( getIDColumn() ).toInt();
 
     if ( transactionid > 0 ) // if this is a transaction
       {
         if ( transaction->getCleared ( transactionid ) == 0 )
           transaction->setCleared ( transactionid, 1 );
         else
           transaction->setCleared ( transactionid, 0 );
       }
     else
       {
         if ( transfer->getCleared ( transactionid ) == 0 )
           transfer->setCleared ( transactionid, 1 );
         else
           transfer->setCleared ( transactionid, 0 );
       }
 
     listview->clear();
     QString displaytext = "%";
     displaytext.prepend ( limitbox->text() );
+    setTransactionDisplayDate ();
     if ( transaction->getNumberOfTransactions() > 0 )
-      transaction->displayTransactions ( listview, accountid, children, displaytext );
+      transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
 
     if ( transfer->getNumberOfTransfers() != 0 )
       transfer->displayTransfers ( listview, accountid, children );
   }
 
 void TransactionDisplay::redisplayAccountBalance ()
   {
     QString accountbalance = account->getAccountBalance ( accountid );
     balance->setText ( accountbalance );
   }
 
 void TransactionDisplay::setChildren ( bool c )
   {
     children = c;
   }
 
 void TransactionDisplay::setAccountID ( int id )
   {
     accountid = id;
   }
 
 ColorListItem::ColorListItem ( QListView *parent ) : QListViewItem ( parent )
   {
   }
@@ -530,57 +535,89 @@ ColorListItem::ColorListItem ( QListView *parent, QString label1, QString label2
   }
 
 void ColorListItem::paintCell ( QPainter *p, const QColorGroup &cg, int column, int width, int alignment )
   {
     QColorGroup _cg ( cg );
     _cg.setColor ( QColorGroup::Text, Qt::red );
     QListViewItem::paintCell ( p, _cg, column, width, alignment );
   }
 
 void TransactionDisplay::saveColumnSize ( int column, int oldsize, int newsize )
   {
     if ( listview->columns() == 4 )
       preferences->changeColumnPreference ( column + 3, newsize );
     else if ( listview->columns() == 5 && column != 4 )
       preferences->changeColumnPreference ( column + 6, newsize );
     else
       preferences->changeColumnPreference ( 9, newsize );
   }
 
 void TransactionDisplay::limitDisplay ( const QString &text )
   {
     listview->clear ();
     QString displaytext = "%";
     displaytext.prepend ( text );
-    transaction->displayTransactions ( listview, accountid, children, displaytext );
+    setTransactionDisplayDate ();
+    if ( transaction->getNumberOfTransactions() > 0 )
+      transaction->displayTransactions ( listview, accountid, children, displaytext, displaydate );
+
     if ( displaytext.length() == 1 || preferences->getPreference ( 6 ) == 1 )
       transfer->displayTransfers ( listview, accountid, children );
   }
 
 int TransactionDisplay::getIDColumn ()
   {
     int counter;
     int columns = listview->columns();
     for ( counter = 0; counter <= columns; counter++ )
       if ( listview->header()->label ( counter ).length() == 0 )
         return counter;
   }
 
 void TransactionDisplay::showTransactionNotes ()
   {
     if ( listview->selectedItem() == 0 || listview->currentItem()->text ( getIDColumn() ).toInt() < 0  )
       QMessageBox::warning ( this, "QashMoney", "Please select a valid\ntransaction to view notes.");
     else
       {
         int transactionid = listview->selectedItem()->text ( getIDColumn() ).toInt ();
         QDialog *description = new QDialog ( this, "description", TRUE );
         description->setCaption ( "Notes" );
         QMultiLineEdit *notes = new QMultiLineEdit ( description );
         notes->setFixedSize ( ( int ) (this->width() * 0.75 ), ( int ) ( this->height() * 0.5 ) );
         notes->setWrapColumnOrWidth ( ( int ) (this->width() * 0.75 ) );
         notes->setWordWrap ( QMultiLineEdit::WidgetWidth );
         notes->setEnabled ( FALSE );
         notes->setText ( transaction->getTransactionDescription ( transactionid ) );
         description->show();
       }
   }
 
+void TransactionDisplay::setTransactionDisplayDate ()
+  {
+    // determine how many days of transactions to show
+    int limittype = preferences->getPreference ( 7 );
+    if ( limittype != 5 ) // set today's date if we are not showing all transactions
+      {
+        QDate today = QDate::currentDate ();
+        switch ( limittype ) // if we are not showing all transactions
+          {
+            case 0:  // viewing two weeks
+              displaydate = today.addDays ( -14 );
+              break;
+            case 1:  // viewing one month
+              displaydate = today.addDays ( -30 );
+              break;
+            case 2: // three months
+              displaydate = today.addDays ( -90 );
+              break;
+            case 3: // six months
+              displaydate = today.addDays ( -180 );
+              break;
+            case 4: // one year
+              displaydate = today.addDays ( -365 );
+              break;
+          }
+      }
+    else
+      displaydate = QDate ( 1, 1, 1000 );
+  }
diff --git a/noncore/apps/qashmoney/transactiondisplay.h b/noncore/apps/qashmoney/transactiondisplay.h
index 79f20ba..1746f6c 100755
--- a/noncore/apps/qashmoney/transactiondisplay.h
+++ b/noncore/apps/qashmoney/transactiondisplay.h
@@ -1,77 +1,80 @@
 #ifndef TRANSACTIONDISPLAY_H
 #define TRANSACTIONDISPLAY_H
 
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qlineedit.h>
+#include <qdatetime.h>
 
 class TransactionDisplay : public QWidget
   {
     Q_OBJECT
 
   public:
     TransactionDisplay ( QWidget* parent );
 
     QListView* listview;
     QPushButton* newtransaction;
     QPushButton* edittransaction;
     QPushButton* deletetransaction;
     QPushButton* toggletransaction;
     QPushButton* viewtransactionnotes;
 
     QLabel *name;
     QLabel *balance;
     QLineEdit *limitbox;
     QLineEdit *amount;
     QLineEdit *date;
 
     int getIDColumn ();
 
   public slots:
     void setChildren ( bool );
     void setAccountID ( int );
     void showTransactionNotes ();
 
   private slots:
     void addTransaction ();
     void editTransaction ();
     void editTransfer ();
     void deleteTransaction ();
     void toggleTransaction ();
     void checkListViewDelete ();
     void checkListViewEdit ();
     void checkListViewToggle ();
     void saveColumnSize ( int column, int oldsize, int newsize );
     void limitDisplay ( const QString & );
     void showCalculator ();
     void showCalendar ();
+    void setTransactionDisplayDate ();
 
   private:
     int accountid, fromaccount, fromparent, toaccount, toparent, day, month, year, transferid;
+    QDate displaydate;
     bool children;
     QBoxLayout *layout;
     QHBox *firstline;
     QHBox *secondline;
     void redisplayAccountBalance ();
     void updateAndDisplay ( int accountid );
   };
 
 #endif
 
 #ifndef COLORLISTITEM_H
 #define COLORLISTITEM_H
 
 class ColorListItem : public QListViewItem
   {
     public:
 
       ColorListItem ( QListView *parent );
       ColorListItem ( QListView *parent, QString label1, QString label2, QString label3, QString label4 );
       ColorListItem ( QListView *parent, QString label1, QString label2, QString label3, QString label4, QString label5 );
 
       virtual void paintCell ( QPainter *p, const QColorGroup &cg, int column, int width, int alignment );
   };