1 files changed, 10 insertions, 5 deletions

diff --git a/noncore/apps/qashmoney/accountdisplay.cpp b/noncore/apps/qashmoney/accountdisplay.cpp
index b2c0838..64f4ea8 100755
--- a/noncore/apps/qashmoney/accountdisplay.cpp
+++ b/noncore/apps/qashmoney/accountdisplay.cpp
@@ -1,74 +1,76 @@
 #include <qdatetime.h>
 #include <qmessagebox.h>
 #include <qheader.h>
+#include <iostream.h>
 
 #include "accountdisplay.h"
 #include "newaccount.h"
 #include "transaction.h"
 #include "transferdialog.h"
 #include "preferences.h"
 #include "transfer.h"
 
 extern Account *account;
 extern Transaction *transaction;
 extern Transfer *transfer;
 extern Preferences *preferences;
 
 AccountDisplay::AccountDisplay ( QWidget *parent ) : QWidget ( parent )
   {
     cleared = 0;
 
     firstline = new QHBox ( this );
     firstline->setSpacing ( 2 );
 
     newaccount = new QPushButton ( firstline );
     newaccount->setPixmap ( QPixmap ("/opt/QtPalmtop/pics/new.png") );
     connect ( newaccount, SIGNAL ( released () ), this, SLOT ( addAccount () ) );
 
     editaccount = new QPushButton ( firstline );
     editaccount->setPixmap ( QPixmap ("/opt/QtPalmtop/pics/edit.png") );
     connect ( editaccount, SIGNAL ( released () ), this, SLOT ( editAccount () ) );
 
     deleteaccount = new QPushButton ( firstline );
     deleteaccount->setPixmap( QPixmap ( "/opt/QtPalmtop/pics/delete.png") );
     connect ( deleteaccount, SIGNAL ( released () ), this, SLOT ( deleteAccount () ) );
 
     transferbutton = new QPushButton ( firstline );
     transferbutton->setPixmap( QPixmap ( "/opt/QtPalmtop/pics/transfer.png") );
     transferbutton->setToggleButton ( TRUE );
     connect ( transferbutton, SIGNAL ( toggled ( bool ) ), this, SLOT ( accountTransfer ( bool ) ) );
 
     listview = new QListView ( this );
     listview->setAllColumnsShowFocus ( TRUE );
     listview->setShowSortIndicator ( TRUE );
     listview->setRootIsDecorated ( TRUE );
     listview->setMultiSelection ( FALSE );
     connect ( listview, SIGNAL ( expanded ( QListViewItem * ) ), this, SLOT ( setAccountExpanded ( QListViewItem * ) ) );
     connect ( listview, SIGNAL ( collapsed ( QListViewItem * ) ), this, SLOT ( setAccountCollapsed ( QListViewItem * ) ) );
 
     listview->header()->setTracking ( FALSE );
     connect ( listview->header(), SIGNAL ( sizeChange ( int, int, int ) ), this, SLOT ( saveColumnSize ( int, int, int ) ) );
+    connect ( listview->header(), SIGNAL ( clicked ( int ) ), this, SLOT ( saveSortingPreference ( int ) ) );
 
     layout = new QVBoxLayout ( this, 2, 5 );
     layout->addWidget ( firstline );
     layout->addWidget ( listview );
   }
 
 void AccountDisplay::setTabs ( QWidget *newtab2, QTabWidget *newtabs )
   {
     tab2 = newtab2;
     maintabs = newtabs;
   }
 
 void AccountDisplay::addAccount ()
   {
     // initialize local variables
     int parentid = 0;
     type = 0;
     QString parentlist [ listview->childCount() + 1 ] [ 3 ] ;
 
     // create new account window for entering data
     NewAccount *newaccount = new NewAccount ( this );
     int width = this->width();
     newaccount->accountbox->setMaximumWidth ( ( int ) ( width * 0.5 ) );
     newaccount->datebox->setMaximumWidth ( ( int ) ( width * 0.4 ) );
@@ -247,56 +249,54 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item )
           firstaccountid = item->text ( getIDColumn() ).toInt(); // set first account if we've selected a valid account
         else
           if ( item->text ( getIDColumn() ).toInt() != firstaccountid ) // set the second account if its not equal to the first
             secondaccountid = item->text ( getIDColumn() ).toInt();
       }
 
     // open transfer window if both accounts are set
     if ( firstaccountid != -1 && secondaccountid != -1 )
       {
         // construct the transferdialog window
         TransferDialog *td = new TransferDialog ( this, firstaccountid, secondaccountid );
 
         // enter today's date in the date box as default
         QDate today = QDate::currentDate ();
         int defaultday = today.day();
         int defaultmonth = today.month();
         int defaultyear  = today.year();
         td->date->setText ( preferences->getDate ( defaultyear, defaultmonth, defaultday ) );
 
         if ( td->exec() == QDialog::Accepted )
           {
             // set the cleared integer if the checkbox is checked
             if ( td->clearedcheckbox->isChecked() == TRUE )
               cleared = 1;
-
+            cout << "Year from transferdialog = " << td->getYear() << endl;
             // add the transfer with a new date if its been edited or use the default date
             if ( td->getDateEdited () == TRUE )
-              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid,
-              account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared );
+              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared );
             else
-              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid,
-                account->getParentAccountID ( secondaccountid ), defaultday, defaultmonth, defaultyear, td->amount->text().toFloat(), cleared );
+              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), defaultday, defaultmonth, defaultyear, td->amount->text().toFloat(), cleared );
 
             // update account balances of both accounts and parents if necessary
             account->updateAccountBalance ( firstaccountid );
              if ( account->getParentAccountID ( firstaccountid ) != -1 )
                account->changeParentAccountBalance ( account->getParentAccountID ( firstaccountid ) );
             account->updateAccountBalance ( secondaccountid );
             if ( account->getParentAccountID ( secondaccountid ) != -1 )
                account->changeParentAccountBalance ( account->getParentAccountID ( secondaccountid ) );
 
             // redisplay accounts
             account->displayAccounts ( listview );
           }
         else
           {
             firstaccountid = -1;
             secondaccountid = -1;
             listview->clearSelection ();
 	    listview->setMultiSelection ( FALSE );
             disconnect ( listview, SIGNAL ( clicked ( QListViewItem * ) ), this, SLOT ( getTransferAccounts ( QListViewItem * ) ) );
           }
 
        // reset the accounts display window
        transferbutton->toggle(); // toggling this button with clear the window as well
 
@@ -326,48 +326,53 @@ void AccountDisplay::enableAccounts ()
 
 void AccountDisplay::saveColumnSize ( int column, int oldsize, int newsize )
   {
     switch ( column )
       {
         case 0:
           if ( listview->columns() == 3 )
             preferences->changeColumnPreference ( 1, newsize );
           else
             preferences->changeColumnPreference ( 10, newsize );
           break;
         case 1:
           if ( listview->columns() == 3 )
             preferences->changeColumnPreference ( 2, newsize );
           else
             preferences->changeColumnPreference ( 11, newsize );
           break;
         case 2:
             preferences->changeColumnPreference ( 12, newsize );
           break;
       }
 
   }
 
+void AccountDisplay::saveSortingPreference ( int column )
+  {
+    preferences->changeSortingPreference ( 1, column );
+  }
+
 int AccountDisplay::getIDColumn ()
   {
     int counter;
     int columns = listview->columns();
     for ( counter = 0; counter <= columns; counter++ )
       if ( listview->header()->label ( counter ).length() == 0 )
         return counter;
   }
 
 void AccountDisplay::editAccount ()
   {
     if ( listview->selectedItem() == 0 )
       QMessageBox::warning ( this, "QashMoney", "Please select an account\nto edit.");
     else
       {
         // set the accountid
         int accountid = listview->selectedItem()->text ( getIDColumn() ).toInt();
 
         //construct new dialog box
         QDialog *editaccountwindow = new QDialog ( this, 0, TRUE );
         editaccountwindow->setCaption ( "Edit Account" );
 
         // construct the items which will go in the dialog bix
         QLabel *namelabel = new QLabel ( "Account Name", editaccountwindow );