You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(18) |
Aug
(25) |
Sep
(13) |
Oct
(5) |
Nov
(8) |
Dec
(6) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
|
Feb
|
Mar
(17) |
Apr
|
May
(1) |
Jun
(56) |
Jul
(17) |
Aug
(23) |
Sep
(35) |
Oct
|
Nov
(2) |
Dec
(21) |
2003 |
Jan
(23) |
Feb
(14) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2004 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(26) |
Nov
|
Dec
(1) |
2006 |
Jan
|
Feb
(20) |
Mar
(10) |
Apr
|
May
(14) |
Jun
|
Jul
|
Aug
|
Sep
(7) |
Oct
|
Nov
|
Dec
|
From: Matija N. <mn...@us...> - 2006-09-17 15:59:49
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20048/src Modified Files: AccountsDB.cpp AccountsDB.h EditAccountForm.cpp EditRateForm.cpp EditScheduledTransForm.cpp EditSplitForm.cpp EditTransactionForm.h FreeCoins.cpp GenericDB.cpp GenericInputForm.cpp MiscFunc.cpp SplitsDB.cpp TransactionsForm.cpp TransactionsTable.cpp Log Message: reinterpret_cast cleanups Index: AccountsDB.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/AccountsDB.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** AccountsDB.cpp 26 Feb 2006 21:38:22 -0000 1.23 --- AccountsDB.cpp 17 Sep 2006 15:59:43 -0000 1.24 *************** *** 131,135 **** } ! UInt32 AccountsDB::createAccount(char *name, UInt32 parent_uid, AccountType type) { --- 131,135 ---- } ! UInt32 AccountsDB::createAccount(Char *name, UInt32 parent_uid, AccountType type) { *************** *** 273,277 **** else { handle=DmGetResource (strRsc,BALANCE_UPDATE_STR); ! t.payee=reinterpret_cast<char*> (MemHandleLock (handle)); } --- 273,277 ---- else { handle=DmGetResource (strRsc,BALANCE_UPDATE_STR); ! t.payee=reinterpret_cast<Char*> (MemHandleLock (handle)); } *************** *** 295,299 **** ! UInt32 AccountsDB::findAccountByName(char* n, UInt16 categ) { UInt16 recordNo; --- 295,299 ---- ! UInt32 AccountsDB::findAccountByName(Char* n, UInt16 categ) { UInt16 recordNo; *************** *** 442,446 **** MemHandle str_handle = DmGetResource (strRsc,ACC_OPEN_STR); ! updateBalance(acc_uid, bal,reinterpret_cast<char*> (MemHandleLock (str_handle)) ); unlock_release (str_handle); } --- 442,446 ---- MemHandle str_handle = DmGetResource (strRsc,ACC_OPEN_STR); ! updateBalance(acc_uid, bal,reinterpret_cast<Char*> (MemHandleLock (str_handle)) ); unlock_release (str_handle); } Index: AccountsDB.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/AccountsDB.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -r1.47 -r1.48 *** AccountsDB.h 7 Apr 2004 11:33:44 -0000 1.47 --- AccountsDB.h 17 Sep 2006 15:59:43 -0000 1.48 *************** *** 131,135 **** @param parent_uid the uid of the parent for the new account @param acc_type the type of the account */ ! UInt32 createAccount(char *name, UInt32 parent_uid, AccountType acc_type); public: --- 131,135 ---- @param parent_uid the uid of the parent for the new account @param acc_type the type of the account */ ! UInt32 createAccount(Char *name, UInt32 parent_uid, AccountType acc_type); public: *************** *** 148,152 **** @param categ category of the account @return unique id of the account or 0 if the account could not be found */ ! UInt32 findAccountByName(char* n, UInt16 categ) DB_SECTION1; /** returns a formated account name in buf --- 148,152 ---- @param categ category of the account @return unique id of the account or 0 if the account could not be found */ ! UInt32 findAccountByName(Char* n, UInt16 categ) DB_SECTION1; /** returns a formated account name in buf Index: EditAccountForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditAccountForm.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** EditAccountForm.cpp 29 May 2006 21:07:56 -0000 1.42 --- EditAccountForm.cpp 17 Sep 2006 15:59:43 -0000 1.43 *************** *** 52,59 **** //if the balance is invalid it will be set to 0 by default ! newbal=String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); //get the credit limit ! account.credit_limit=String2Pence((Char*) GetTextPtr(EDIT_ACC_CREDIT)); //get the description --- 52,59 ---- //if the balance is invalid it will be set to 0 by default ! newbal=String2Pence(GetTextPtr(EDIT_ACC_BALANCE)); //get the credit limit ! account.credit_limit=String2Pence(GetTextPtr(EDIT_ACC_CREDIT)); //get the description *************** *** 325,329 **** Int32 bal; Char *s; ! bal = -String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); s = Pence2String(bal); SetFieldTextFromStr(EDIT_ACC_BALANCE,s); --- 325,329 ---- Int32 bal; Char *s; ! bal = -String2Pence(GetTextPtr(EDIT_ACC_BALANCE)); s = Pence2String(bal); SetFieldTextFromStr(EDIT_ACC_BALANCE,s); *************** *** 358,362 **** Int32 bal; Char *s; ! bal = -String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); s = Pence2String(bal); SetFieldTextFromStr(EDIT_ACC_BALANCE,s); --- 358,362 ---- Int32 bal; Char *s; ! bal = -String2Pence(GetTextPtr(EDIT_ACC_BALANCE)); s = Pence2String(bal); SetFieldTextFromStr(EDIT_ACC_BALANCE,s); *************** *** 433,437 **** break; case EDIT_ACC_CALC: ! CalculatorForm::instance()->amount = String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); popup(CalculatorForm::instance()); break; --- 433,437 ---- break; case EDIT_ACC_CALC: ! CalculatorForm::instance()->amount = String2Pence(GetTextPtr(EDIT_ACC_BALANCE)); popup(CalculatorForm::instance()); break; Index: EditRateForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditRateForm.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** EditRateForm.cpp 9 Mar 2006 18:58:39 -0000 1.7 --- EditRateForm.cpp 17 Sep 2006 15:59:43 -0000 1.8 *************** *** 71,76 **** { //rate is saved by checkData ! results.src_amount = String2Pence(reinterpret_cast<Char*> (GetTextPtr(EDIT_RATE_AMOUNT1))); ! results.dest_amount = String2Pence(reinterpret_cast<Char*> (GetTextPtr(EDIT_RATE_AMOUNT2))); results.dirty = true; } --- 71,76 ---- { //rate is saved by checkData ! results.src_amount = String2Pence(GetTextPtr(EDIT_RATE_AMOUNT1)); ! results.dest_amount = String2Pence(GetTextPtr(EDIT_RATE_AMOUNT2)); results.dirty = true; } Index: EditScheduledTransForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditScheduledTransForm.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** EditScheduledTransForm.cpp 26 Feb 2006 00:48:19 -0000 1.16 --- EditScheduledTransForm.cpp 17 Sep 2006 15:59:43 -0000 1.17 *************** *** 41,53 **** Boolean EditScheduledTransForm::save() { ! st->frequency=StrAToI((Char*) GetTextPtr(SCHED_FREQ)); if (!st->frequency) { MemHandle str_handle = DmGetResource (strRsc,FREQUENCY_STR); ! FrmCustomAlert(ZERO_FIELD,reinterpret_cast<char*> (MemHandleLock (str_handle)),NULL,NULL); return false; //frequency has to be != 0 } if(!st->end_by_date && st->repeat_times!=-1) ! st->repeat_times=StrAToI((Char*) GetTextPtr(SCHED_REPEAT)); setSaved(true); --- 41,53 ---- Boolean EditScheduledTransForm::save() { ! st->frequency=StrAToI(GetTextPtr(SCHED_FREQ)); if (!st->frequency) { MemHandle str_handle = DmGetResource (strRsc,FREQUENCY_STR); ! FrmCustomAlert(ZERO_FIELD,reinterpret_cast<Char*> (MemHandleLock (str_handle)),NULL,NULL); return false; //frequency has to be != 0 } if(!st->end_by_date && st->repeat_times!=-1) ! st->repeat_times=StrAToI(GetTextPtr(SCHED_REPEAT)); setSaved(true); *************** *** 67,86 **** str_handle = DmGetResource (strRsc,DAY_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_DAY); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<char*> (MemHandleLock (str_handle))); break; case rep_week: str_handle = DmGetResource (strRsc,WEEK_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_WEEK); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<char*> (MemHandleLock (str_handle))); break; case rep_month: str_handle = DmGetResource (strRsc,MONTH_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_MONTH); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<char*> (MemHandleLock (str_handle))); break; case rep_year: str_handle = DmGetResource (strRsc,YEAR_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_YEAR); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<char*> (MemHandleLock (str_handle))); break; } --- 67,86 ---- str_handle = DmGetResource (strRsc,DAY_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_DAY); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<Char*> (MemHandleLock (str_handle))); break; case rep_week: str_handle = DmGetResource (strRsc,WEEK_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_WEEK); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<Char*> (MemHandleLock (str_handle))); break; case rep_month: str_handle = DmGetResource (strRsc,MONTH_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_MONTH); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<Char*> (MemHandleLock (str_handle))); break; case rep_year: str_handle = DmGetResource (strRsc,YEAR_STR); FrmSetControlGroupSelection(frm,1,SCHED_OPT_YEAR); ! FrmCopyLabel(frm,SCHED_INTERVAL_LABEL,reinterpret_cast<Char*> (MemHandleLock (str_handle))); break; } Index: EditSplitForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditSplitForm.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** EditSplitForm.cpp 9 Mar 2006 18:58:39 -0000 1.24 --- EditSplitForm.cpp 17 Sep 2006 15:59:43 -0000 1.25 *************** *** 36,40 **** return false; } ! s = (Char*)GetTextPtr(EDIT_SPLIT_AMOUNT); amount = String2Pence(s)*(is_debit?1:-1); if (!validNumberStr(s, false) || amount==0) { --- 36,40 ---- return false; } ! s = GetTextPtr(EDIT_SPLIT_AMOUNT); amount = String2Pence(s)*(is_debit?1:-1); if (!validNumberStr(s, false) || amount==0) { *************** *** 132,136 **** case EDIT_SPLIT_CALC: ! CalculatorForm::instance()->amount = String2Pence((Char*)GetTextPtr(EDIT_SPLIT_AMOUNT)) * (is_debit?1:-1); if (CalculatorForm::instance()->amount < 0) { CalculatorForm::instance()->amount *= -1; --- 132,136 ---- case EDIT_SPLIT_CALC: ! CalculatorForm::instance()->amount = String2Pence((Char*)GetTextPtr(EDIT_SPLIT_AMOUNT)) * (is_debit?1:-1); if (CalculatorForm::instance()->amount < 0) { CalculatorForm::instance()->amount *= -1; Index: EditTransactionForm.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** EditTransactionForm.h 19 Dec 2002 22:52:47 -0000 1.29 --- EditTransactionForm.h 17 Sep 2006 15:59:43 -0000 1.30 *************** *** 79,86 **** ///label for credit button Char _credit_label[32]; ! ///last matched payee; null if none ! char _matched_payee[32]; ! ///last unmatched payee. used to avoid screen updates and db checks whenever possible ! char _last_unmatched_payee[32]; /** transaction scheduling form is accessed through this object. As scheduling is only accessed from --- 79,86 ---- ///label for credit button Char _credit_label[32]; ! ///last matched payee; null if none ! Char _matched_payee[32]; ! ///last unmatched payee. used to avoid screen updates and db checks whenever possible ! Char _last_unmatched_payee[32]; /** transaction scheduling form is accessed through this object. As scheduling is only accessed from Index: FreeCoins.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/FreeCoins.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** FreeCoins.cpp 6 Mar 2006 21:00:35 -0000 1.29 --- FreeCoins.cpp 17 Sep 2006 15:59:43 -0000 1.30 *************** *** 279,284 **** str_handle = DmGetResource (strRsc,PASS_TITLE_STR); msg_handle = DmGetResource (strRsc,PASS_MSG_STR); ! GenericInputForm g(reinterpret_cast<char*> (MemHandleLock (str_handle)), ! reinterpret_cast<char*> (MemHandleLock (msg_handle)),pwd_str,pwdLength); if(g.doDialog()) { if(PwdVerify(pwd_str)) break; --- 279,284 ---- str_handle = DmGetResource (strRsc,PASS_TITLE_STR); msg_handle = DmGetResource (strRsc,PASS_MSG_STR); ! GenericInputForm g(reinterpret_cast<Char*> (MemHandleLock (str_handle)), ! reinterpret_cast<Char*> (MemHandleLock (msg_handle)),pwd_str,pwdLength); if(g.doDialog()) { if(PwdVerify(pwd_str)) break; Index: GenericDB.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/GenericDB.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** GenericDB.cpp 4 Mar 2006 18:41:49 -0000 1.7 --- GenericDB.cpp 17 Sep 2006 15:59:43 -0000 1.8 *************** *** 19,22 **** --- 19,25 ---- $Log$ + Revision 1.8 2006/09/17 15:59:43 mnalis + reinterpret_cast cleanups + Revision 1.7 2006/03/04 18:41:49 mnalis code consolidation *************** *** 302,306 **** { MemHandle str_handle = DmGetResource (strRsc,resID); ! UInt16 cat = findCategory(reinterpret_cast<char*> (MemHandleLock (str_handle))); unlock_release (str_handle); return cat; --- 305,309 ---- { MemHandle str_handle = DmGetResource (strRsc,resID); ! UInt16 cat = findCategory(reinterpret_cast<Char*> (MemHandleLock (str_handle))); unlock_release (str_handle); return cat; Index: GenericInputForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/GenericInputForm.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** GenericInputForm.cpp 14 Oct 2005 21:37:33 -0000 1.6 --- GenericInputForm.cpp 17 Sep 2006 15:59:43 -0000 1.7 *************** *** 20,23 **** --- 20,26 ---- $Log$ + Revision 1.7 2006/09/17 15:59:43 mnalis + reinterpret_cast cleanups + Revision 1.6 2005/10/14 21:37:33 mnalis "rez" compile fix *************** *** 70,75 **** rez1= (rez1 == GENERIC_INPUT_OK); if (rez1) { ! Char* entered_text; ! entered_text=(Char*) GetTextPtr(GENERIC_INPUT_FIELD); if(!entered_text) entered_text = ""; StrNCopy(buf,entered_text,max_field_size); --- 73,77 ---- rez1= (rez1 == GENERIC_INPUT_OK); if (rez1) { ! Char* entered_text = GetTextPtr(GENERIC_INPUT_FIELD); if(!entered_text) entered_text = ""; StrNCopy(buf,entered_text,max_field_size); Index: MiscFunc.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/MiscFunc.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** MiscFunc.cpp 9 Mar 2006 18:58:39 -0000 1.15 --- MiscFunc.cpp 17 Sep 2006 15:59:43 -0000 1.16 *************** *** 124,129 **** { FieldPtr fp=(FieldPtr) GetObjectPtr(objID); ! ! return reinterpret_cast <char*>(FldGetTextPtr(fp)); } --- 124,128 ---- { FieldPtr fp=(FieldPtr) GetObjectPtr(objID); ! return FldGetTextPtr(fp); } *************** *** 216,220 **** MemHandle str_handle = DmGetResource (strRsc,CHOOSE_DATE_STR); ! date_changed=SelectDay(selectDayByDay,&month,&day,&year,reinterpret_cast<char*> (MemHandleLock (str_handle))); unlock_release (str_handle); if(date_changed) { --- 215,219 ---- MemHandle str_handle = DmGetResource (strRsc,CHOOSE_DATE_STR); ! date_changed=SelectDay(selectDayByDay,&month,&day,&year,reinterpret_cast<Char*> (MemHandleLock (str_handle))); unlock_release (str_handle); if(date_changed) { *************** *** 268,272 **** { MemHandle str_handle = DmGetResource (strRsc, resID); ! bool ret1 = FrmCustomAlert(alertId, reinterpret_cast<char*> (MemHandleLock (str_handle)), NULL, NULL); unlock_release (str_handle); return ret1; --- 267,271 ---- { MemHandle str_handle = DmGetResource (strRsc, resID); ! bool ret1 = FrmCustomAlert(alertId, reinterpret_cast<Char*> (MemHandleLock (str_handle)), NULL, NULL); unlock_release (str_handle); return ret1; *************** *** 276,280 **** { MemHandle str_handle = DmGetResource (strRsc, resID); ! ErrFatalDisplay(reinterpret_cast<char*> (MemHandleLock (str_handle))); unlock_release (str_handle); } --- 275,279 ---- { MemHandle str_handle = DmGetResource (strRsc, resID); ! ErrFatalDisplay(reinterpret_cast<Char*> (MemHandleLock (str_handle))); unlock_release (str_handle); } *************** *** 282,286 **** void MiscFunc::frmtitle_res (FormType *formP, DmResID resID) { MemHandle str_handle = DmGetResource (strRsc,resID); ! FrmCopyTitle(formP, reinterpret_cast<char*> (MemHandleLock (str_handle))); unlock_release (str_handle); } --- 281,285 ---- void MiscFunc::frmtitle_res (FormType *formP, DmResID resID) { MemHandle str_handle = DmGetResource (strRsc,resID); ! FrmCopyTitle(formP, reinterpret_cast<Char*> (MemHandleLock (str_handle))); unlock_release (str_handle); } *************** *** 289,293 **** { MemHandle str_handle = DmGetResource (strRsc,resID); ! StrCopy(dst, reinterpret_cast<char*> (MemHandleLock (str_handle)) ); unlock_release (str_handle); } --- 288,292 ---- { MemHandle str_handle = DmGetResource (strRsc,resID); ! StrCopy(dst, reinterpret_cast<Char*> (MemHandleLock (str_handle)) ); unlock_release (str_handle); } Index: SplitsDB.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/SplitsDB.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** SplitsDB.cpp 26 Feb 2006 14:19:11 -0000 1.18 --- SplitsDB.cpp 17 Sep 2006 15:59:43 -0000 1.19 *************** *** 157,161 **** //set the category MemHandle str_handle = DmGetResource (strRsc,cleared?CLEARED_STR:UNCLEARED_STR);; ! setRecordCategory(index,CategoryFind(ref,reinterpret_cast<char*> (MemHandleLock (str_handle)))); unlock_release (str_handle); --- 157,161 ---- //set the category MemHandle str_handle = DmGetResource (strRsc,cleared?CLEARED_STR:UNCLEARED_STR);; ! setRecordCategory(index,CategoryFind(ref,reinterpret_cast<Char*> (MemHandleLock (str_handle)))); unlock_release (str_handle); *************** *** 171,175 **** MemHandle str_handle = DmGetResource (strRsc,CLEARED_STR); ! cleared = (getRecordCategory(id)==CategoryFind(ref,reinterpret_cast<char*> (MemHandleLock (str_handle)))); unlock_release (str_handle); --- 171,175 ---- MemHandle str_handle = DmGetResource (strRsc,CLEARED_STR); ! cleared = (getRecordCategory(id)==CategoryFind(ref,reinterpret_cast<Char*> (MemHandleLock (str_handle)))); unlock_release (str_handle); Index: TransactionsForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsForm.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** TransactionsForm.cpp 9 Mar 2006 18:58:39 -0000 1.34 --- TransactionsForm.cpp 17 Sep 2006 15:59:43 -0000 1.35 *************** *** 80,84 **** MemHandle str_handle = DmGetResource (strRsc,USER_INPUT_STR); MemHandle str1_handle = DmGetResource (strRsc,NEW_CLEARED_BAL_STR); ! GenericInputForm g(reinterpret_cast<char*> (MemHandleLock (str_handle)),reinterpret_cast<char*> (MemHandleLock (str1_handle)),r,9); rez1=g.doDialog(frm); if (rez1) { --- 80,84 ---- MemHandle str_handle = DmGetResource (strRsc,USER_INPUT_STR); MemHandle str1_handle = DmGetResource (strRsc,NEW_CLEARED_BAL_STR); ! GenericInputForm g(reinterpret_cast<Char*> (MemHandleLock (str_handle)),reinterpret_cast<Char*> (MemHandleLock (str1_handle)),r,9); rez1=g.doDialog(frm); if (rez1) { *************** *** 102,106 **** MemHandle str_handle = DmGetResource (strRsc,USER_INPUT_STR); MemHandle str1_handle = DmGetResource (strRsc,NEW_BAL_STR); ! GenericInputForm g(reinterpret_cast<char*> (MemHandleLock (str_handle)),reinterpret_cast<char*> (MemHandleLock (str1_handle)),r,9); rez1=g.doDialog(frm); if (rez1) { --- 102,106 ---- MemHandle str_handle = DmGetResource (strRsc,USER_INPUT_STR); MemHandle str1_handle = DmGetResource (strRsc,NEW_BAL_STR); ! GenericInputForm g(reinterpret_cast<Char*> (MemHandleLock (str_handle)),reinterpret_cast<Char*> (MemHandleLock (str1_handle)),r,9); rez1=g.doDialog(frm); if (rez1) { *************** *** 260,264 **** //we don't need to update the form in the cl/uncl category MemHandle str_handle = DmGetResource (strRsc,CL_UNCL_STR); ! if(transactions_db->current_cat!=transactions_db->findCategory(reinterpret_cast<char*> (MemHandleLock (str_handle))) && transactions_db->current_cat!=transactions_db->getScheduledCategory()) FrmUpdateForm(form_id,0); else displayTotals(); --- 260,264 ---- //we don't need to update the form in the cl/uncl category MemHandle str_handle = DmGetResource (strRsc,CL_UNCL_STR); ! if(transactions_db->current_cat!=transactions_db->findCategory(reinterpret_cast<Char*> (MemHandleLock (str_handle))) && transactions_db->current_cat!=transactions_db->getScheduledCategory()) FrmUpdateForm(form_id,0); else displayTotals(); Index: TransactionsTable.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsTable.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** TransactionsTable.cpp 4 Mar 2006 18:13:26 -0000 1.16 --- TransactionsTable.cpp 17 Sep 2006 15:59:43 -0000 1.17 *************** *** 81,85 **** UInt32 trans_uid, peer_uid; Char buf[50]; ! char* str = NULL; bool need_unlock=false; MemHandle str_handle = NULL; --- 81,85 ---- UInt32 trans_uid, peer_uid; Char buf[50]; ! Char* str = NULL; bool need_unlock=false; MemHandle str_handle = NULL; *************** *** 110,114 **** } if(need_unlock) { ! str=reinterpret_cast<char*> (MemHandleLock (str_handle)); WinDrawChars(str,StrLen(str),bounds->topLeft.x,bounds->topLeft.y); unlock_release (str_handle); --- 110,114 ---- } if(need_unlock) { ! str=reinterpret_cast<Char*> (MemHandleLock (str_handle)); WinDrawChars(str,StrLen(str),bounds->topLeft.x,bounds->topLeft.y); unlock_release (str_handle); |
From: Matija N. <mn...@us...> - 2006-09-17 15:59:47
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20048 Modified Files: build_id Log Message: reinterpret_cast cleanups Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** build_id 9 Sep 2006 09:51:56 -0000 1.24 --- build_id 17 Sep 2006 15:59:43 -0000 1.25 *************** *** 1 **** ! 304 --- 1 ---- ! 307 |
From: Matija N. <mn...@us...> - 2006-09-17 15:59:19
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20022/src Modified Files: NoteForm.cpp Log Message: GetTextPtr cleanup Index: NoteForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/NoteForm.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** NoteForm.cpp 26 Feb 2006 00:29:05 -0000 1.5 --- NoteForm.cpp 17 Sep 2006 15:59:15 -0000 1.6 *************** *** 143,152 **** switch (control_id) { case NOTE_OK: _last_caller = caller_form_id; deleteNote(); ! if (GetTextPtr(NOTE_FIELD) != NULL) ! if (StrLen (GetTextPtr(NOTE_FIELD)) != 0) { ! _note = new Char[ StrLen (GetTextPtr(NOTE_FIELD)) + 1]; ! StrCopy (_note, GetTextPtr (NOTE_FIELD)); } FrmUpdateForm (caller_form_id, 5); --- 143,154 ---- switch (control_id) { case NOTE_OK: + Char *noteP; _last_caller = caller_form_id; deleteNote(); ! noteP = GetTextPtr(NOTE_FIELD); ! if (noteP) ! if (StrLen (noteP) != 0) { ! _note = new Char[ StrLen (noteP) + 1]; ! StrCopy (_note, noteP); } FrmUpdateForm (caller_form_id, 5); |
From: Matija N. <mn...@us...> - 2006-09-17 15:58:31
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19616/src Modified Files: EditTransactionForm.cpp Log Message: fixing bug #1439441? Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** EditTransactionForm.cpp 9 Sep 2006 09:51:56 -0000 1.59 --- EditTransactionForm.cpp 17 Sep 2006 15:58:23 -0000 1.60 *************** *** 66,70 **** // check the amount ! s = reinterpret_cast<Char*>(GetTextPtr(EDIT_TRANS_AMMOUNT)); if (!s || !validNumberStr(s, false) || _splits_form->getAmount(_this_split)==0) { alert_res(GENERIC_ERROR, POZ_NUMBER_STR); --- 66,70 ---- // check the amount ! s = GetTextPtr(EDIT_TRANS_AMMOUNT); if (!s || !validNumberStr(s, false) || _splits_form->getAmount(_this_split)==0) { alert_res(GENERIC_ERROR, POZ_NUMBER_STR); *************** *** 99,109 **** t.num_splits = _splits_form->getCount(); ! t.payee=reinterpret_cast<Char*>(GetTextPtr(EDIT_TRANS_PAYEE)); if(!t.payee) { payee_handle = DmGetResource (strRsc,NA_STR); ! t.payee=reinterpret_cast<char*> (MemHandleLock (payee_handle)); } ! t.num = reinterpret_cast<Char*>(GetTextPtr(EDIT_TRANS_NUM)); //leaving NULLs in database records will result in errors during packing if(!t.num) t.num = ""; --- 99,109 ---- t.num_splits = _splits_form->getCount(); ! t.payee=GetTextPtr(EDIT_TRANS_PAYEE); if(!t.payee) { payee_handle = DmGetResource (strRsc,NA_STR); ! t.payee=reinterpret_cast<Char*> (MemHandleLock (payee_handle)); } ! t.num = GetTextPtr(EDIT_TRANS_NUM); //leaving NULLs in database records will result in errors during packing if(!t.num) t.num = ""; *************** *** 241,245 **** MemHandle str_handle = DmGetResource (strRsc,NOT_SET_STR); CtlSetLabel(reinterpret_cast<ControlPtr>(GetObjectPtr(EDIT_TRANS_CHOOSE_ACC)), ! reinterpret_cast<char*> (MemHandleLock (str_handle))); unlock_release (str_handle); FrmSetControlValue(frm,getObjectIndex(EDIT_TRANS_CLEARED_CBX),preferences.get()->trans_cleared); --- 241,245 ---- MemHandle str_handle = DmGetResource (strRsc,NOT_SET_STR); CtlSetLabel(reinterpret_cast<ControlPtr>(GetObjectPtr(EDIT_TRANS_CHOOSE_ACC)), ! reinterpret_cast<Char*> (MemHandleLock (str_handle))); unlock_release (str_handle); FrmSetControlValue(frm,getObjectIndex(EDIT_TRANS_CLEARED_CBX),preferences.get()->trans_cleared); *************** *** 328,332 **** Int32 amount; ! amount = String2Pence(reinterpret_cast<Char*>(GetTextPtr(EDIT_TRANS_AMMOUNT))); if (!_is_debit) amount *= -1; --- 328,332 ---- Int32 amount; ! amount = String2Pence(GetTextPtr(EDIT_TRANS_AMMOUNT)); if (!_is_debit) amount *= -1; *************** *** 347,354 **** bool EditTransactionForm::handleAutocompletion() { ! char* payee = reinterpret_cast<char*>(GetTextPtr(EDIT_TRANS_PAYEE)); ! ErrFatalDisplayIf(!payee, "FIXME: payee is NULL - bug #1439441?"); ! ErrFatalDisplayIf(!_matched_payee, "FIXME: _matched_payee is NULL - bug #1439441?"); ! ErrFatalDisplayIf(!_last_unmatched_payee, "FIXME: _last_unmatched_payee is NULL - bug #1439441?"); UInt16 orig_len = StrLen(payee); --- 347,354 ---- bool EditTransactionForm::handleAutocompletion() { ! Char* payee = GetTextPtr(EDIT_TRANS_PAYEE); ! if (!payee) return false; // return if nothing entered in field yet (was bug #1439441) ! ErrNonFatalDisplayIf(!_matched_payee, "FIXME: _matched_payee is NULL - bug #1439441?"); ! ErrNonFatalDisplayIf(!_last_unmatched_payee, "FIXME: _last_unmatched_payee is NULL - bug #1439441?"); UInt16 orig_len = StrLen(payee); |
From: Matija N. <mn...@us...> - 2006-09-09 09:52:05
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17323 Modified Files: build_id Log Message: tracking down bug #1439441 Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** build_id 29 May 2006 19:14:43 -0000 1.23 --- build_id 9 Sep 2006 09:51:56 -0000 1.24 *************** *** 1 **** ! 277 --- 1 ---- ! 304 |
From: Matija N. <mn...@us...> - 2006-09-09 09:52:05
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17323/src Modified Files: EditTransactionForm.cpp Log Message: tracking down bug #1439441 Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** EditTransactionForm.cpp 29 May 2006 21:07:56 -0000 1.58 --- EditTransactionForm.cpp 9 Sep 2006 09:51:56 -0000 1.59 *************** *** 103,107 **** payee_handle = DmGetResource (strRsc,NA_STR); t.payee=reinterpret_cast<char*> (MemHandleLock (payee_handle)); - } --- 103,106 ---- *************** *** 349,352 **** --- 348,354 ---- { char* payee = reinterpret_cast<char*>(GetTextPtr(EDIT_TRANS_PAYEE)); + ErrFatalDisplayIf(!payee, "FIXME: payee is NULL - bug #1439441?"); + ErrFatalDisplayIf(!_matched_payee, "FIXME: _matched_payee is NULL - bug #1439441?"); + ErrFatalDisplayIf(!_last_unmatched_payee, "FIXME: _last_unmatched_payee is NULL - bug #1439441?"); UInt16 orig_len = StrLen(payee); |
From: Matija N. <mn...@us...> - 2006-09-09 09:52:03
|
Update of /cvsroot/freecoins/freecoins/config In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17323/config Modified Files: enable_debug.m4 Log Message: tracking down bug #1439441 Index: enable_debug.m4 =================================================================== RCS file: /cvsroot/freecoins/freecoins/config/enable_debug.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** enable_debug.m4 21 May 2006 10:29:40 -0000 1.6 --- enable_debug.m4 9 Sep 2006 09:51:56 -0000 1.7 *************** *** 27,31 **** AC_DEFINE([DEBUG],[1],[debug output (positive-enabled, 0-disabled)]) else ! CXXFLAGS="$CXXFLAGS -Os -Wuninitialized" CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) --- 27,31 ---- AC_DEFINE([DEBUG],[1],[debug output (positive-enabled, 0-disabled)]) else ! CXXFLAGS="$CXXFLAGS -Os -Wuninitialized -pipe" CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) |
From: Matija N. <mn...@us...> - 2006-05-29 21:08:08
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10876 Modified Files: EditAccountForm.cpp EditTransactionForm.cpp TransactionsDB.cpp TransactionsDB.h Log Message: code cleanup, minor speedup Index: EditAccountForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditAccountForm.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** EditAccountForm.cpp 9 Mar 2006 18:58:39 -0000 1.41 --- EditAccountForm.cpp 29 May 2006 21:07:56 -0000 1.42 *************** *** 51,55 **** MemHandle h; ! //if the balance is invalid it will be set to 0 by default newbal=String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); --- 51,55 ---- MemHandle h; ! //if the balance is invalid it will be set to 0 by default newbal=String2Pence((Char*) GetTextPtr(EDIT_ACC_BALANCE)); *************** *** 190,200 **** currencyStructure cs; currency_db->getUnpackedRecord (selection, &cs); ! CtlSetLabel(trig, cs.code); } void EditAccountForm::setCurrencyListSelection (UInt16 selection) { ! ListPtr list = reinterpret_cast<ListPtr>(FrmGetObjectPtr(frm, getObjectIndex(EDIT_ACC_CUR_LIST))); ! LstSetSelection(list, selection); LstMakeItemVisible (list, selection); updateCurPopupTrigger (selection); --- 190,200 ---- currencyStructure cs; currency_db->getUnpackedRecord (selection, &cs); ! CtlSetLabel(trig, cs.code); } void EditAccountForm::setCurrencyListSelection (UInt16 selection) { ! ListPtr list = reinterpret_cast<ListPtr>(FrmGetObjectPtr(frm, getObjectIndex(EDIT_ACC_CUR_LIST))); ! LstSetSelection(list, selection); LstMakeItemVisible (list, selection); updateCurPopupTrigger (selection); *************** *** 245,250 **** FrmCopyLabel (frm, EDIT_ACC_CUR_LABEL, cs.code); FrmHideObject (frm, getObjectIndex (EDIT_ACC_CUR_TRIGGER)); ! FrmShowObject (frm, getObjectIndex (EDIT_ACC_CUR_LABEL)); ! if(account.depth != 0) --- 245,249 ---- FrmCopyLabel (frm, EDIT_ACC_CUR_LABEL, cs.code); FrmHideObject (frm, getObjectIndex (EDIT_ACC_CUR_TRIGGER)); ! FrmShowObject (frm, getObjectIndex (EDIT_ACC_CUR_LABEL)); if(account.depth != 0) *************** *** 256,260 **** prev_depth = account.depth; } ! updateTypeSelection(); } --- 255,259 ---- prev_depth = account.depth; } ! updateTypeSelection(); } Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** EditTransactionForm.cpp 29 May 2006 19:14:43 -0000 1.57 --- EditTransactionForm.cpp 29 May 2006 21:07:56 -0000 1.58 *************** *** 369,373 **** return false; ! Int32 rez1 = transactions_db->getTransactionByPayee(payee, 0, true); //this may be a problem if UID>maxInt32 if (rez1 != -1) { // found match for this payee UInt32 tr_uid = (UInt32) rez1; --- 369,373 ---- return false; ! Int32 rez1 = transactions_db->getTransactionByPayee(payee, true); //this may be a problem if UID>maxInt32 if (rez1 != -1) { // found match for this payee UInt32 tr_uid = (UInt32) rez1; Index: TransactionsDB.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsDB.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** TransactionsDB.cpp 6 Mar 2006 21:00:35 -0000 1.42 --- TransactionsDB.cpp 29 May 2006 21:07:56 -0000 1.43 *************** *** 562,570 **** transactionStructure ts; UInt32 rec_uid; for (UInt16 record_id=start_id;record_id<DmNumRecords(ref);record_id++) { getUnpackedRecord(record_id,&ts); rec_uid = getRecordUid(record_id); if(! isScheduled(record_id)) { //only work on the string if the transaction is not scheduled ! if(!StrNCaselessCompare(p, ts.payee,StrLen(p)) && getAmount(rec_uid, accounts_db->getSelectedUid())!=0) { return rec_uid; } --- 562,571 ---- transactionStructure ts; UInt32 rec_uid; + UInt32 acc_uid = accounts_db->getSelectedUid(); for (UInt16 record_id=start_id;record_id<DmNumRecords(ref);record_id++) { getUnpackedRecord(record_id,&ts); rec_uid = getRecordUid(record_id); if(! isScheduled(record_id)) { //only work on the string if the transaction is not scheduled ! if(!StrNCaselessCompare(p, ts.payee,StrLen(p)) && getAmount(rec_uid, acc_uid)!=0) { return rec_uid; } *************** *** 574,587 **** } ! Int32 TransactionsDB::getTransactionByPayee(Char* p, UInt16 start_id, Boolean want_cur_acc) { if (StrLen(p) < 1) return -1; //don't do anything with empty strings transactionStructure ts; ! for (UInt16 record_id=start_id;record_id<DmNumRecords(ref);record_id++) { getUnpackedRecord(record_id,&ts); if(! isScheduled(record_id)) { //only work on the string if the transaction is not scheduled ! if(!StrNCaselessCompare(p, ts.payee,StrLen(p))) { if (want_cur_acc) { //if the transaction has to be in the same acc //try and find it --- 575,589 ---- } ! Int32 TransactionsDB::getTransactionByPayee(Char* p, Boolean want_cur_acc) { if (StrLen(p) < 1) return -1; //don't do anything with empty strings transactionStructure ts; ! Int16 p_len = StrLen(p); ! for (UInt16 record_id=0; record_id<DmNumRecords(ref); record_id++) { getUnpackedRecord(record_id,&ts); if(! isScheduled(record_id)) { //only work on the string if the transaction is not scheduled ! if(!StrNCaselessCompare(p, ts.payee, p_len)) { if (want_cur_acc) { //if the transaction has to be in the same acc //try and find it Index: TransactionsDB.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsDB.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** TransactionsDB.h 9 Mar 2006 22:48:44 -0000 1.41 --- TransactionsDB.h 29 May 2006 21:07:56 -0000 1.42 *************** *** 268,276 **** /** Returns the first transaction with an id equal or higher than the given one which has a payee string which starts the same (case insensitive) as the given string @param p start of the payee string which is to be mached by an existing transaction - @param start_id id from where to start looking for matching transactions; it defaults to 0. Note that the given ID is checked aswell! @return the UInt16 id of the first matched transaction or -1 if no such transaction was found @param want_cur_acc if true, the function will attempt to return a transaction with the same source account as the current account. If it fails to find such a transaction it returns the first transaction from any acount which matches the given payee */ ! Int32 getTransactionByPayee(Char* p, UInt16 start_id, Boolean want_cur_acc) DB_SECTION2; }; --- 268,275 ---- /** Returns the first transaction with an id equal or higher than the given one which has a payee string which starts the same (case insensitive) as the given string @param p start of the payee string which is to be mached by an existing transaction @return the UInt16 id of the first matched transaction or -1 if no such transaction was found @param want_cur_acc if true, the function will attempt to return a transaction with the same source account as the current account. If it fails to find such a transaction it returns the first transaction from any acount which matches the given payee */ ! Int32 getTransactionByPayee(Char* p, Boolean want_cur_acc) DB_SECTION2; }; |
From: Matija N. <mn...@us...> - 2006-05-29 20:23:19
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19109 Modified Files: CHANGES build_id configure.in Log Message: Source account name now shown in Form Title (feature request #1443697) Index: CHANGES =================================================================== RCS file: /cvsroot/freecoins/freecoins/CHANGES,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** CHANGES 22 May 2006 19:57:11 -0000 1.45 --- CHANGES 29 May 2006 19:14:43 -0000 1.46 *************** *** 1,4 **** --- 1,6 ---- NOTE: see <A HREF="http://freecoins.cvs.sourceforge.net/freecoins/freecoins/CHANGES?view=markup">CVS</A> for up-to-date Changelog ************* + Version 0.6.5 (NYR) + Source account name now shown in Form Title (feature request #1443697) Version 0.6.4 (released 22.05.2006) Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** build_id 21 May 2006 21:38:26 -0000 1.22 --- build_id 29 May 2006 19:14:43 -0000 1.23 *************** *** 1 **** ! 276 --- 1 ---- ! 277 Index: configure.in =================================================================== RCS file: /cvsroot/freecoins/freecoins/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** configure.in 21 May 2006 10:29:40 -0000 1.13 --- configure.in 29 May 2006 19:14:43 -0000 1.14 *************** *** 9,13 **** dnl basic initialisation stuff ! AC_INIT([FreeCoins],[0.6.4],[di...@us...]) dnl safety check for source code directory existence --- 9,13 ---- dnl basic initialisation stuff ! AC_INIT([FreeCoins],[0.6.5],[di...@us...]) dnl safety check for source code directory existence *************** *** 17,21 **** dnl define version information specific to freecoins ! FC_VERSION="0.6.4" FC_CVS_VERSION=`echo "rel-$FC_VERSION" | tr . _` FC_BUILD=$(echo $(( `cat build_id` + 1 )) > build_id ; cat build_id) --- 17,21 ---- dnl define version information specific to freecoins ! FC_VERSION="0.6.5" FC_CVS_VERSION=`echo "rel-$FC_VERSION" | tr . _` FC_BUILD=$(echo $(( `cat build_id` + 1 )) > build_id ; cat build_id) |
From: Matija N. <mn...@us...> - 2006-05-29 19:15:45
|
Update of /cvsroot/freecoins/freecoins/resources In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19109/resources Modified Files: freecoins.rcp.in Log Message: Source account name now shown in Form Title (feature request #1443697) Index: freecoins.rcp.in =================================================================== RCS file: /cvsroot/freecoins/freecoins/resources/freecoins.rcp.in,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -r1.48 -r1.49 *** freecoins.rcp.in 21 May 2006 21:38:26 -0000 1.48 --- freecoins.rcp.in 29 May 2006 19:14:43 -0000 1.49 *************** *** 81,86 **** "unbalanced transaction" ="This transaction is unbalanced. Do you really want to record it?" "not applicable" ="n/a" - "transaction details" ="Transaction details" - "new transaction" ="Create new transaction" "dashed split" ="-- Split --" "transaction" ="transaction" --- 81,84 ---- *************** *** 210,215 **** "unbalanced transaction" ="Cette transaction est assymétrique, voulez vous vraiment l'enregistrer ?" "not applicable" ="n/a" - "transaction details" ="Détails de la transaction" - "new transaction" ="Créer transaction" "dashed split" ="-- Répartition --" "transaction" ="transaction" --- 208,211 ---- *************** *** 413,418 **** "unbalanced transaction" ="Diese Transaktion ist nicht ausgeglichen. Möchten Sie sie wirklich aufnehmen?" "not applicable" ="n/z" - "transaction details" ="Transaktions-Details" - "new transaction" ="Neue Transaktion" "dashed split" ="-- Verteilung --" "transaction" ="Transaktion" --- 409,412 ---- *************** *** 572,577 **** "unbalanced transaction" ="Esta transacción está balanceada. ¿Realmente desea guardarla?" "not applicable" ="n/a" - "transaction details" ="Detalles de la Tran" - "new transaction" ="Crear nueva Transacc" "dashed split" ="--Factura--" "transaction" ="transacción" --- 566,569 ---- *************** *** 1137,1142 **** string id UNBALANCED_STR "unbalanced transaction" string id NA_STR "not applicable" - string id TRANS_DETAIL_STR "transaction details" - string id NEW_TRANS_STR "new transaction" string id D_SPLIT_D_STR "dashed split" string id TRANSACTION_STR "transaction" --- 1129,1132 ---- |
From: Matija N. <mn...@us...> - 2006-05-29 19:15:16
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19109/src Modified Files: EditTransactionForm.cpp Log Message: Source account name now shown in Form Title (feature request #1443697) Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** EditTransactionForm.cpp 21 May 2006 10:30:28 -0000 1.56 --- EditTransactionForm.cpp 29 May 2006 19:14:43 -0000 1.57 *************** *** 114,118 **** t.method=(Payment_method)LstGetSelection((ListPtr)GetObjectPtr(EDIT_TRANS_TYPE_LIST)); ! if (!_record_is_new) { transactions_db->deleteRecord(transactions_db->getSelectedRecord()); } --- 114,118 ---- t.method=(Payment_method)LstGetSelection((ListPtr)GetObjectPtr(EDIT_TRANS_TYPE_LIST)); ! if (!_record_is_new) { transactions_db->deleteRecord(transactions_db->getSelectedRecord()); } *************** *** 211,215 **** FrmShowObject(frm, getObjectIndex(EDIT_TRANS_DELETE)); ! frmtitle_res (frm, TRANS_DETAIL_STR); saved=true; //record was saved already in a prev session --- 211,216 ---- FrmShowObject(frm, getObjectIndex(EDIT_TRANS_DELETE)); ! FrmCopyTitle(frm, as.name); ! saved=true; //record was saved already in a prev session *************** *** 223,226 **** --- 224,228 ---- } else { //record is new + Char acc_name[50] = "*"; amount = 0; _is_debit = (type==EXPENSE); *************** *** 244,248 **** FrmSetControlValue(frm,getObjectIndex(EDIT_TRANS_CLEARED_CBX),preferences.get()->trans_cleared); updateDateField(EDIT_TRANS_CHOOSE_DATE,t.date,_date_txt); ! frmtitle_res (frm, NEW_TRANS_STR); saved=false; //only starting; didnt save anything yet // update peer account and amount --- 246,251 ---- FrmSetControlValue(frm,getObjectIndex(EDIT_TRANS_CLEARED_CBX),preferences.get()->trans_cleared); updateDateField(EDIT_TRANS_CHOOSE_DATE,t.date,_date_txt); ! StrCopy (acc_name+1, as.name); ! FrmCopyTitle(frm, acc_name); saved=false; //only starting; didnt save anything yet // update peer account and amount |
From: Matija N. <mn...@us...> - 2006-05-22 19:57:33
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21131 Modified Files: CHANGES Log Message: 0.6.4 release prepare Index: CHANGES =================================================================== RCS file: /cvsroot/freecoins/freecoins/CHANGES,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** CHANGES 21 May 2006 21:32:55 -0000 1.44 --- CHANGES 22 May 2006 19:57:11 -0000 1.45 *************** *** 2,6 **** ************* ! Version 0.6.4 (NYR) Some speedup of autocompletion code added warnings and code cleanup / consolidation --- 2,6 ---- ************* ! Version 0.6.4 (released 22.05.2006) Some speedup of autocompletion code added warnings and code cleanup / consolidation |
From: Matija N. <mn...@us...> - 2006-05-21 21:38:33
|
Update of /cvsroot/freecoins/freecoins/resources In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22764/resources Modified Files: freecoins.rcp.in Log Message: some main screen navigation Index: freecoins.rcp.in =================================================================== RCS file: /cvsroot/freecoins/freecoins/resources/freecoins.rcp.in,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -r1.47 -r1.48 *** freecoins.rcp.in 21 May 2006 10:28:06 -0000 1.47 --- freecoins.rcp.in 21 May 2006 21:38:26 -0000 1.48 *************** *** 658,664 **** TITLE "Account List" POPUPTRIGGER "All" ID ACC_TYPE_TRIGGER AT (RIGHT@160 0 AUTO AUTO) FONT 0 RIGHTANCHOR - POPUPLIST ACC_TYPE_TRIGGER ACC_TYPE_LIST LIST "All" "Asset&Liability" "Income&Expense" "Asset" "Liability" "Income" "Expense" "Equity" ID ACC_TYPE_LIST AT (RIGHT@160 1 80 AUTO) FONT 0 NONUSABLE VISIBLEITEMS 8 TABLE ID ACC_TABLE AT (0 15 160 110) ROWS 10 COLUMNS 2 COLUMNWIDTHS 110 50 POPUPTRIGGER "Total" ID ACC_TOTAL_TRIGGER AT (PREVLEFT+1 PREVBOTTOM+4 AUTO AUTO) FONT 0 LEFTANCHOR --- 658,664 ---- TITLE "Account List" POPUPTRIGGER "All" ID ACC_TYPE_TRIGGER AT (RIGHT@160 0 AUTO AUTO) FONT 0 RIGHTANCHOR LIST "All" "Asset&Liability" "Income&Expense" "Asset" "Liability" "Income" "Expense" "Equity" ID ACC_TYPE_LIST AT (RIGHT@160 1 80 AUTO) FONT 0 NONUSABLE VISIBLEITEMS 8 + POPUPLIST ACC_TYPE_TRIGGER ACC_TYPE_LIST TABLE ID ACC_TABLE AT (0 15 160 110) ROWS 10 COLUMNS 2 COLUMNWIDTHS 110 50 POPUPTRIGGER "Total" ID ACC_TOTAL_TRIGGER AT (PREVLEFT+1 PREVBOTTOM+4 AUTO AUTO) FONT 0 LEFTANCHOR *************** *** 670,673 **** --- 670,686 ---- END + NAVIGATION ID ACCOUNTS_MAIN_FORM + INITIALSTATE kFrmNavHeaderFlagsObjectFocusStartState + INITIALOBJECTID ACC_NEW_TRANS + JUMPOBJECTID ACC_NEW_TRANS + NAVIGATIONMAP + ROW ACC_TYPE_TRIGGER + ROW ACC_TABLE + ROW ACC_NEW_TRANS + ROW ACC_PGUP + ROW ACC_PGDN + END + + FORM ID TRANSACTIONS_FORM AT (0 0 160 160) NOFRAME *************** *** 761,765 **** INITIALSTATE kFrmNavHeaderFlagsObjectFocusStartState INITIALOBJECTID EDIT_TRANS_PAYEE - JUMPOBJECTID EDIT_TRANS_PAYEE NAVIGATIONMAP ROW EDIT_TRANS_CHOOSE_DATE EDIT_TRANS_NUM --- 774,777 ---- |
From: Matija N. <mn...@us...> - 2006-05-21 21:38:33
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22764 Modified Files: build_id Log Message: some main screen navigation Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** build_id 21 May 2006 10:30:28 -0000 1.21 --- build_id 21 May 2006 21:38:26 -0000 1.22 *************** *** 1 **** ! 261 --- 1 ---- ! 276 |
From: Matija N. <mn...@us...> - 2006-05-21 21:33:08
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20761 Modified Files: CHANGES Log Message: sourceforge URI changes Index: CHANGES =================================================================== RCS file: /cvsroot/freecoins/freecoins/CHANGES,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -r1.43 -r1.44 *** CHANGES 21 May 2006 10:29:40 -0000 1.43 --- CHANGES 21 May 2006 21:32:55 -0000 1.44 *************** *** 1,4 **** ! NOTE: see <A HREF="http://cvs.sourceforge.net/viewcvs.py/freecoins/freecoins/CHANGES?only_with_tag=MAIN&view=markup">CVS</A> for up-to-date Changelog ************* Version 0.6.4 (NYR) Some speedup of autocompletion code --- 1,5 ---- ! NOTE: see <A HREF="http://freecoins.cvs.sourceforge.net/freecoins/freecoins/CHANGES?view=markup">CVS</A> for up-to-date Changelog ************* + Version 0.6.4 (NYR) Some speedup of autocompletion code |
From: Matija N. <mn...@us...> - 2006-05-21 11:27:06
|
Update of /cvsroot/freecoins/freecoins/config In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17562/config Modified Files: enable_debug.m4 Log Message: 0.6.4 prepare, gcc warnings Index: enable_debug.m4 =================================================================== RCS file: /cvsroot/freecoins/freecoins/config/enable_debug.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** enable_debug.m4 15 Oct 2005 12:28:40 -0000 1.5 --- enable_debug.m4 21 May 2006 10:29:40 -0000 1.6 *************** *** 19,23 **** if [[ $set_debug = "yes" ]]; then ! CXXFLAGS="$CXXFLAGS -g -O0 -D ERROR_CHECK_LEVEL=2" CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) --- 19,23 ---- if [[ $set_debug = "yes" ]]; then ! CXXFLAGS="$CXXFLAGS -g -O0 -D ERROR_CHECK_LEVEL=2 -W -Wconversion -Wsign-compare -Wwrite-strings -Wcast-align -Wcast-qual -Wshadow -Wtraditional -Wunused -Wswitch -Wreturn-type -Wparentheses -Wimplicit -Wformat=2 -pedantic " CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) *************** *** 27,31 **** AC_DEFINE([DEBUG],[1],[debug output (positive-enabled, 0-disabled)]) else ! CXXFLAGS="$CXXFLAGS -Os" CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) --- 27,31 ---- AC_DEFINE([DEBUG],[1],[debug output (positive-enabled, 0-disabled)]) else ! CXXFLAGS="$CXXFLAGS -Os -Wuninitialized" CFLAGS=$CXXFLAGS AC_SUBST(CFLAGS) |
From: Matija N. <mn...@us...> - 2006-05-21 11:27:06
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17562 Modified Files: CHANGES configure.in Log Message: 0.6.4 prepare, gcc warnings Index: CHANGES =================================================================== RCS file: /cvsroot/freecoins/freecoins/CHANGES,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** CHANGES 6 Mar 2006 21:00:35 -0000 1.42 --- CHANGES 21 May 2006 10:29:40 -0000 1.43 *************** *** 1,4 **** --- 1,10 ---- NOTE: see <A HREF="http://cvs.sourceforge.net/viewcvs.py/freecoins/freecoins/CHANGES?only_with_tag=MAIN&view=markup">CVS</A> for up-to-date Changelog ************* + Version 0.6.4 (NYR) + Some speedup of autocompletion code + added warnings and code cleanup / consolidation + UI improvements (Edit/Cut-Copy-Paste menues, do not force numeric on sci.notation, ...) + initial support for keyboard navigation with 5-way 'fnav' resources (Treo etc.) + Version 0.6.3 (released 06.03.2006) Unification of similar code reducing .prc size Index: configure.in =================================================================== RCS file: /cvsroot/freecoins/freecoins/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** configure.in 4 Mar 2006 22:17:33 -0000 1.12 --- configure.in 21 May 2006 10:29:40 -0000 1.13 *************** *** 9,13 **** dnl basic initialisation stuff ! AC_INIT([FreeCoins],[0.6.3],[di...@us...]) dnl safety check for source code directory existence --- 9,13 ---- dnl basic initialisation stuff ! AC_INIT([FreeCoins],[0.6.4],[di...@us...]) dnl safety check for source code directory existence *************** *** 17,21 **** dnl define version information specific to freecoins ! FC_VERSION="0.6.3" FC_CVS_VERSION=`echo "rel-$FC_VERSION" | tr . _` FC_BUILD=$(echo $(( `cat build_id` + 1 )) > build_id ; cat build_id) --- 17,21 ---- dnl define version information specific to freecoins ! FC_VERSION="0.6.4" FC_CVS_VERSION=`echo "rel-$FC_VERSION" | tr . _` FC_BUILD=$(echo $(( `cat build_id` + 1 )) > build_id ; cat build_id) |
From: Matija N. <mn...@us...> - 2006-05-21 11:27:04
|
Update of /cvsroot/freecoins/freecoins/resources In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16953 Modified Files: freecoins.rcp.in Log Message: 5way fnav navigation, Edit menues, do not force numberic on sci.notatation Index: freecoins.rcp.in =================================================================== RCS file: /cvsroot/freecoins/freecoins/resources/freecoins.rcp.in,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** freecoins.rcp.in 4 Mar 2006 22:17:13 -0000 1.46 --- freecoins.rcp.in 21 May 2006 10:28:06 -0000 1.47 *************** *** 630,637 **** --- 630,644 ---- end + + // Forms and Alerts + + #define kFrmNavHeaderFlagsObjectFocusStartState 0x00000001 + #define kFrmNavHeaderFlagsAppFocusStartState 0x00000002 + FORM ID NOTE_FORM AT (0 0 160 160) NOFRAME HELPID NOTE_FORM_HELP + MENUID 10000 BEGIN TITLE " " *************** *** 715,722 **** --- 722,732 ---- END + FORM ID EDIT_TRANS_FORM AT (2 2 156 156) MODAL NOSAVEBEHIND HELPID EDIT_TRANS_HELP + MENUID 10000 // from sdk-5r3/include/Core/UI/UIResources.h: sysEditMenuID + DEFAULTBTNID EDIT_TRANS_OK BEGIN TITLE " " *************** *** 748,751 **** --- 758,776 ---- END + NAVIGATION ID EDIT_TRANS_FORM + INITIALSTATE kFrmNavHeaderFlagsObjectFocusStartState + INITIALOBJECTID EDIT_TRANS_PAYEE + JUMPOBJECTID EDIT_TRANS_PAYEE + NAVIGATIONMAP + ROW EDIT_TRANS_CHOOSE_DATE EDIT_TRANS_NUM + ROW EDIT_TRANS_PAYEE + ROW EDIT_TRANS_CHOOSE_ACC + ROW EDIT_TRANS_DEBIT EDIT_TRANS_CREDIT EDIT_TRANS_CURRENCY + ROW EDIT_TRANS_CALC EDIT_TRANS_AMMOUNT EDIT_TRANS_CLEARED_CBX + ROW EDIT_TRANS_TYPE_TRIGGER + // ROW EDIT_TRANS_RECORD_SPLITS EDIT_TRANS_SCHED EDIT_TRANS_NOTE + ROW EDIT_TRANS_OK EDIT_TRANS_CANCEL EDIT_TRANS_DELETE + END + FORM ID EDIT_RATE_FORM AT (2 73 156 85) MODAL *************** *** 773,776 **** --- 798,802 ---- NOSAVEBEHIND HELPID EDIT_ACC_HELP + MENUID 10000 BEGIN TITLE " " *************** *** 858,861 **** --- 884,888 ---- NOSAVEBEHIND HELPID EDIT_CURRENCY_HELP + MENUID 10000 BEGIN TITLE " " *************** *** 865,869 **** FIELD ID EDIT_CURRENCY_DESC AT (5 prevbottom+5 100 AUTO) FONT 0 UNDERLINED MAXCHARS 60 LABEL "Xchng rate:" AUTOID AT (5 prevbottom+5) FONT 0 ! FIELD ID EDIT_CURRENCY_RATE AT (prevright+3 prevtop 90 AUTO) FONT 0 UNDERLINED MAXCHARS 20 NUMERIC BUTTON "Set as default" ID EDIT_CURRENCY_DEF AT (5 prevbottom+5 AUTO AUTO) FONT 1 NONUSABLE BUTTON "OK" ID EDIT_CURRENCY_OK AT (5 prevbottom+10 AUTO AUTO) FONT 0 --- 892,896 ---- FIELD ID EDIT_CURRENCY_DESC AT (5 prevbottom+5 100 AUTO) FONT 0 UNDERLINED MAXCHARS 60 LABEL "Xchng rate:" AUTOID AT (5 prevbottom+5) FONT 0 ! FIELD ID EDIT_CURRENCY_RATE AT (prevright+3 prevtop 90 AUTO) FONT 0 UNDERLINED MAXCHARS 20 BUTTON "Set as default" ID EDIT_CURRENCY_DEF AT (5 prevbottom+5 AUTO AUTO) FONT 1 NONUSABLE BUTTON "OK" ID EDIT_CURRENCY_OK AT (5 prevbottom+10 AUTO AUTO) FONT 0 |
From: Matija N. <mn...@us...> - 2006-05-21 11:24:52
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17562/src Modified Files: FormManager.h Log Message: 0.6.4 prepare, gcc warnings Index: FormManager.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/FormManager.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** FormManager.h 24 Sep 2002 19:46:42 -0000 1.12 --- FormManager.h 21 May 2006 10:29:40 -0000 1.13 *************** *** 82,86 **** ///maximum number of forms that can be handled (active at the same time) ! const static UInt8 max_forms=25; ///information on all forms --- 82,86 ---- ///maximum number of forms that can be handled (active at the same time) ! static const UInt8 max_forms=25; ///information on all forms |
From: Matija N. <mn...@us...> - 2006-05-21 11:24:52
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17977 Modified Files: build_id Log Message: 5-way info (with and without 'fnav's) and URLs Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** build_id 9 Mar 2006 18:58:38 -0000 1.20 --- build_id 21 May 2006 10:30:28 -0000 1.21 *************** *** 1 **** ! 188 --- 1 ---- ! 261 |
From: Matija N. <mn...@us...> - 2006-05-21 11:24:14
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17977/src Modified Files: EditTransactionForm.cpp Log Message: 5-way info (with and without 'fnav's) and URLs Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** EditTransactionForm.cpp 9 Mar 2006 22:48:44 -0000 1.55 --- EditTransactionForm.cpp 21 May 2006 10:30:28 -0000 1.56 *************** *** 512,515 **** --- 512,552 ---- FrmSetFocus(frm, FrmGetObjectIndex(frm,EDIT_TRANS_PAYEE)); + + /* + // FIXME Focus + + >Second thing is, in the same Init() function, I am calling FrmSetFocus() to + >set focus to one of the control buttons on the form but it never shows it as + >selected. + + FrmSetFocus only lets you set the focus on fields and tables in most + versions of Palm OS. With devices that use object navigation (Treo 600, + Treo 650, Tungsten T5, Palm OS Cobalt 6.1), you should use 'fnav' + resources and set the initial focused object ID value. + + http://news.palmos.com/read/messages?id=177577 + + google "FrmSetFocus palm treo problem" i "fnav resource palmos" + + http://news.palmos.com/read/messages?id=181215 + http://news.palmos.com/read/messages?id=199726 + http://www.palmos.com/dev/support/docs/palmos/PalmOSReference/Form.html#1131325 + + See: + file:///usr/share/doc/pilrc/html/manual.html#lang_navigation + and NAVIGATION ID EDIT_TRANS_FORM in resources/freecoins.rcp.in + + if FrmGlueNavIsSupported() + { + FrmNavStateFlagsType navStateFlags; + Err navErr; + + navErr = FrmGetNavState (frmP, &navStateFlags); + navStateFlags &= ~kFrmNavStateFlagsObjectFocusMode; + navErr = FrmSetNavState (frmP, navStateFlags); + } + + */ + /** note that no transaction can be scheduled by default. A transaction is scheduled when: 1. its saved and it's category is set to scheduled |
From: Matija N. <mn...@us...> - 2006-03-09 22:48:49
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26913 Modified Files: EditTransactionForm.cpp TransactionsDB.h Log Message: rewrite/some speedup of autocompletion Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** EditTransactionForm.cpp 9 Mar 2006 18:58:39 -0000 1.54 --- EditTransactionForm.cpp 9 Mar 2006 22:48:44 -0000 1.55 *************** *** 345,422 **** bool EditTransactionForm::handleAutocompletion() { ! char* payee = reinterpret_cast<char*>(GetTextPtr(EDIT_TRANS_PAYEE)); ! UInt16 orig_len = StrLen(payee); ! if(orig_len<2) return false; //match from 2 chars upwards ! //if matched already, return (handle case when either string is a substring of the other one) ! if (StrNCaselessCompare (payee,_matched_payee,orig_len)==0 ! && StrLen (_matched_payee)>0 ! && orig_len<=StrLen (_matched_payee)) { ! SetFieldTextFromStr(EDIT_TRANS_PAYEE,_matched_payee); ! FldSetSelection(reinterpret_cast<FieldType*>(GetObjectPtr(EDIT_TRANS_PAYEE)), orig_len, StrLen(_matched_payee)); ! return false; ! } ! //if unmatched already, return (handle case when either string is a substring of the other one) ! if (StrNCaselessCompare (payee,_last_unmatched_payee,StrLen (_last_unmatched_payee)) == 0 ! && StrLen (_last_unmatched_payee)>0 ! && orig_len>=StrLen (_last_unmatched_payee)) { ! return false; ! } ! ! Int32 rez1 = transactions_db->getTransactionByPayeeAndAcc(payee,0); //this may be a problem if UID>maxInt32 ! if (rez1>=0) { //found match for this account ! UInt32 tr_uid = (UInt32) rez1; ! transactionStructure ts; ! transactions_db->getUnpackedRecord(tr_uid, &ts); ! //if the text is exactly the same do not update it again (prevents things like cursor movements continously causing updates) ! if (StrCaselessCompare(payee, ts.payee) == 0 && StrLen(ts.payee) != 1) return false; ! ! SetFieldTextFromStr(EDIT_TRANS_PAYEE,ts.payee); ! FldSetSelection(reinterpret_cast<FieldType*>(GetObjectPtr(EDIT_TRANS_PAYEE)), orig_len, StrLen(ts.payee)); ! StrCopy (_matched_payee,ts.payee); //save match ! StrCopy (_last_unmatched_payee,""); ! ! //copy transaction method ! PopupListSetSelection(EDIT_TRANS_TYPE_LIST, EDIT_TRANS_TYPE_TRIGGER, (Int16) ts.method); ! t.exchange_rate = ts.exchange_rate; ! _splits_form->deleteAllSplits(); ! //copy splits ! splitStructure spl; ! _splits_form->setCount(ts.num_splits); ! for (UInt16 index=splits_db->locateFirstSplit(tr_uid), split_index = 0; ! split_index<ts.num_splits; ! index++,split_index++) { ! MemHandle rec_h = splits_db->getUnpackedRecord(index, &spl); ! ErrFatalDisplayIf (!rec_h,"Failed to get unpacked split"); ! _splits_form->setAccount(split_index, spl.acc_uid); ! _splits_form->setAmount(split_index, spl.amount); ! } ! readFromSplits(); ! } else { //cant match account. try match just payee text ! rez1 = transactions_db->getTransactionByPayee(payee,0); ! if (rez1>=0) { //so there is some transaction with a payee which starts the same as the text we have ! UInt32 tr_uid = (UInt32) rez1; ! UInt16 orig_len = StrLen(payee); ! transactionStructure ts; ! transactions_db->getUnpackedRecord(tr_uid, &ts); ! if (StrCaselessCompare(payee, ts.payee) == 0 && StrLen(ts.payee) != 1) return false; ! ! SetFieldTextFromStr(EDIT_TRANS_PAYEE,ts.payee); ! StrCopy (_matched_payee,ts.payee); //save match ! StrCopy (_last_unmatched_payee,""); ! ! FldSetSelection(reinterpret_cast<FieldType*>(GetObjectPtr(EDIT_TRANS_PAYEE)), orig_len, StrLen(ts.payee)); ! //copy transaction method ! PopupListSetSelection(EDIT_TRANS_TYPE_LIST, EDIT_TRANS_TYPE_TRIGGER, (Int16) ts.method); ! } else { //no match ! StrCopy (_matched_payee,""); ! if(orig_len>=2 && StrLen (_last_unmatched_payee) == 0) ! StrCopy (_last_unmatched_payee,payee); ! return false; ! } ! } ! return true; } --- 345,407 ---- bool EditTransactionForm::handleAutocompletion() { ! char* payee = reinterpret_cast<char*>(GetTextPtr(EDIT_TRANS_PAYEE)); ! UInt16 orig_len = StrLen(payee); ! if(orig_len<2) return false; //match from 2 chars upwards ! //if matched already, return (handle case when either string is a substring of the other one) ! if (StrNCaselessCompare (payee,_matched_payee,orig_len)==0 ! && StrLen (_matched_payee)>0 ! && orig_len<=StrLen (_matched_payee)) ! { ! SetFieldTextFromStr(EDIT_TRANS_PAYEE,_matched_payee); ! FldSetSelection(reinterpret_cast<FieldType*>(GetObjectPtr(EDIT_TRANS_PAYEE)), orig_len, StrLen(_matched_payee)); ! return false; ! } ! //if unmatched already, return (handle case when either string is a substring of the other one) ! if (StrNCaselessCompare (payee,_last_unmatched_payee,StrLen (_last_unmatched_payee)) == 0 ! && StrLen (_last_unmatched_payee)>0 ! && orig_len>=StrLen (_last_unmatched_payee)) ! return false; ! ! Int32 rez1 = transactions_db->getTransactionByPayee(payee, 0, true); //this may be a problem if UID>maxInt32 ! if (rez1 != -1) { // found match for this payee ! UInt32 tr_uid = (UInt32) rez1; ! transactionStructure ts; ! transactions_db->getUnpackedRecord(tr_uid, &ts); ! //if the text is exactly the same do not update it again (prevents things like cursor movements continously causing updates) ! if (StrCaselessCompare(payee, ts.payee) == 0 && StrLen(ts.payee) != 1) return false; ! StrCopy (_matched_payee,ts.payee); //save match ! StrCopy (_last_unmatched_payee,""); ! SetFieldTextFromStr(EDIT_TRANS_PAYEE,ts.payee); ! FldSetSelection(reinterpret_cast<FieldType*>(GetObjectPtr(EDIT_TRANS_PAYEE)), orig_len, StrLen(ts.payee)); ! PopupListSetSelection(EDIT_TRANS_TYPE_LIST, EDIT_TRANS_TYPE_TRIGGER, (Int16) ts.method); //copy transaction method ! ! // if we also match the account, copy some more info ! if (transactions_db->getAmount(tr_uid, accounts_db->getSelectedUid()) != 0) { ! t.exchange_rate = ts.exchange_rate; ! _splits_form->deleteAllSplits(); ! //copy splits ! splitStructure spl; ! _splits_form->setCount(ts.num_splits); ! for (UInt16 index=splits_db->locateFirstSplit(tr_uid), split_index = 0; ! split_index<ts.num_splits; ! index++,split_index++) { ! MemHandle rec_h = splits_db->getUnpackedRecord(index, &spl); ! ErrFatalDisplayIf (!rec_h,"Failed to get unpacked split"); ! _splits_form->setAccount(split_index, spl.acc_uid); ! _splits_form->setAmount(split_index, spl.amount); ! } ! readFromSplits(); ! } ! } else { //no match for payee ! StrCopy (_matched_payee,""); ! if(orig_len>=2 && StrLen (_last_unmatched_payee) == 0) ! StrCopy (_last_unmatched_payee,payee); ! return false; ! } ! ! return true; } Index: TransactionsDB.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsDB.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** TransactionsDB.h 4 Mar 2006 22:17:35 -0000 1.40 --- TransactionsDB.h 9 Mar 2006 22:48:44 -0000 1.41 *************** *** 272,276 **** @param want_cur_acc if true, the function will attempt to return a transaction with the same source account as the current account. If it fails to find such a transaction it returns the first transaction from any acount which matches the given payee */ ! Int32 getTransactionByPayee(Char* p, UInt16 start_id = 0, Boolean want_cur_acc = false) DB_SECTION2; }; --- 272,276 ---- @param want_cur_acc if true, the function will attempt to return a transaction with the same source account as the current account. If it fails to find such a transaction it returns the first transaction from any acount which matches the given payee */ ! Int32 getTransactionByPayee(Char* p, UInt16 start_id, Boolean want_cur_acc) DB_SECTION2; }; |
From: Matija N. <mn...@us...> - 2006-03-09 19:28:06
|
Update of /cvsroot/freecoins/freecoins/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2820/src Modified Files: AccountsForm.cpp CalcForm.cpp ChooseAccountForm.cpp EditAccountForm.cpp EditRateForm.cpp EditSplitForm.cpp EditTransactionForm.cpp MiscFunc.cpp MiscFunc.h PreferencesForm.cpp PurgeTransForm.cpp SplitsForm.cpp TransactionsForm.cpp Log Message: code consolidation Index: AccountsForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/AccountsForm.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** AccountsForm.cpp 6 Mar 2006 21:00:35 -0000 1.30 --- AccountsForm.cpp 9 Mar 2006 18:58:39 -0000 1.31 *************** *** 193,197 **** } EditAccountForm::instance()->setRecordIsNew(true); ! if(!osVerGe(palmos_3_5)) FrmEraseForm(frm); popup(EditAccountForm::instance()); break; --- 193,197 ---- } EditAccountForm::instance()->setRecordIsNew(true); ! os35_eraseForm(frm); popup(EditAccountForm::instance()); break; *************** *** 238,244 **** if(update_code == 0 || update_code == frmRedrawUpdateCode) { ! if(!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! //draw form ! FrmDrawForm(frm); TblMarkTableInvalid((TablePtr)GetObjectPtr(ACC_TABLE)); TblRedrawTable((TablePtr)GetObjectPtr(ACC_TABLE)); --- 238,242 ---- if(update_code == 0 || update_code == frmRedrawUpdateCode) { ! os35_drawForm(frm); TblMarkTableInvalid((TablePtr)GetObjectPtr(ACC_TABLE)); TblRedrawTable((TablePtr)GetObjectPtr(ACC_TABLE)); Index: CalcForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/CalcForm.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** CalcForm.cpp 25 Feb 2006 23:45:45 -0000 1.6 --- CalcForm.cpp 9 Mar 2006 18:58:39 -0000 1.7 *************** *** 68,73 **** Boolean CalculatorForm::handleUpdateEvent(UInt16 update_code) { ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); updateDisplay(); return true; --- 68,72 ---- Boolean CalculatorForm::handleUpdateEvent(UInt16 update_code) { ! os35_drawForm(frm); updateDisplay(); return true; Index: ChooseAccountForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/ChooseAccountForm.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** ChooseAccountForm.cpp 25 Feb 2006 23:45:45 -0000 1.14 --- ChooseAccountForm.cpp 9 Mar 2006 18:58:39 -0000 1.15 *************** *** 124,128 **** case CHOOSE_ACC_NEW_ACC: EditAccountForm::instance()->setRecordIsNew(true); ! if(!osVerGe(palmos_3_5)) FrmEraseForm(frm); EditAccountForm::instance()->setCallerFormId (0); FrmGotoForm(EDIT_ACC_FORM); --- 124,128 ---- case CHOOSE_ACC_NEW_ACC: EditAccountForm::instance()->setRecordIsNew(true); ! os35_eraseForm(frm); EditAccountForm::instance()->setCallerFormId (0); FrmGotoForm(EDIT_ACC_FORM); Index: EditAccountForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditAccountForm.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** EditAccountForm.cpp 26 Feb 2006 00:48:19 -0000 1.40 --- EditAccountForm.cpp 9 Mar 2006 18:58:39 -0000 1.41 *************** *** 344,349 **** } ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); return true; --- 344,348 ---- } ! os35_drawForm(frm); return true; Index: EditRateForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditRateForm.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** EditRateForm.cpp 25 Feb 2006 23:45:45 -0000 1.6 --- EditRateForm.cpp 9 Mar 2006 18:58:39 -0000 1.7 *************** *** 80,85 **** Char* s; ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); s=Pence2String(results.src_amount); --- 80,84 ---- Char* s; ! os35_drawForm(frm); s=Pence2String(results.src_amount); Index: EditSplitForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditSplitForm.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** EditSplitForm.cpp 26 Feb 2006 00:48:19 -0000 1.23 --- EditSplitForm.cpp 9 Mar 2006 18:58:39 -0000 1.24 *************** *** 76,81 **** } ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); is_debit = (amount>0); --- 76,80 ---- } ! os35_drawForm(frm); is_debit = (amount>0); *************** *** 188,195 **** CtlSetLabel(ctl, acc_name); ! if(update_code == 0 || update_code == frmRedrawUpdateCode) { ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); ! } if(update_code == CalculatorForm::instance()->update_code) { --- 187,192 ---- CtlSetLabel(ctl, acc_name); ! if(update_code == 0 || update_code == frmRedrawUpdateCode) ! os35_drawForm(frm); if(update_code == CalculatorForm::instance()->update_code) { Index: EditTransactionForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/EditTransactionForm.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** EditTransactionForm.cpp 6 Mar 2006 21:00:35 -0000 1.53 --- EditTransactionForm.cpp 9 Mar 2006 18:58:39 -0000 1.54 *************** *** 453,459 **** /* deal with update of the payee field (autocompletion trigger) */ if(update_code == 1) ! if(!handleAutocompletion()) return true; ! //handle update when coming back from chosing an account if(ChooseAccountForm::instance()->chosen) { ChooseAccountForm::instance()->chosen = false; --- 453,459 ---- /* deal with update of the payee field (autocompletion trigger) */ if(update_code == 1) ! if(!handleAutocompletion()) return true; ! //handle update when coming back from chosing an account if(ChooseAccountForm::instance()->chosen) { ChooseAccountForm::instance()->chosen = false; *************** *** 507,512 **** ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); return true; } --- 507,511 ---- ! os35_drawForm(frm); return true; } Index: MiscFunc.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/MiscFunc.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** MiscFunc.cpp 26 Feb 2006 13:44:43 -0000 1.14 --- MiscFunc.cpp 9 Mar 2006 18:58:39 -0000 1.15 *************** *** 292,293 **** --- 292,304 ---- unlock_release (str_handle); } + + void MiscFunc::os35_eraseForm(FormType *formP) + { + if (!osVerGe(palmos_3_5)) FrmEraseForm(formP); + } + + void MiscFunc::os35_drawForm(FormType *formP) + { + os35_eraseForm(formP); + FrmDrawForm(formP); + } Index: MiscFunc.h =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/MiscFunc.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** MiscFunc.h 26 Feb 2006 14:19:11 -0000 1.38 --- MiscFunc.h 9 Mar 2006 18:58:39 -0000 1.39 *************** *** 162,165 **** --- 162,167 ---- void frmtitle_res (FormType *formP, DmResID resID); void strcopy_res (Char *dst, DmResID resID); + void os35_eraseForm (FormType *formP); + void os35_drawForm (FormType *formP); }; Index: PreferencesForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/PreferencesForm.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** PreferencesForm.cpp 26 Feb 2006 00:48:19 -0000 1.23 --- PreferencesForm.cpp 9 Mar 2006 18:58:39 -0000 1.24 *************** *** 47,52 **** CtlSetLabel((ControlType*) GetObjectPtrByForm(FrmGetActiveForm(),PREF_DEF_ACC),acc_name); } ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); return true; --- 47,51 ---- CtlSetLabel((ControlType*) GetObjectPtrByForm(FrmGetActiveForm(),PREF_DEF_ACC),acc_name); } ! os35_drawForm(frm); return true; Index: PurgeTransForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/PurgeTransForm.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** PurgeTransForm.cpp 25 Feb 2006 23:45:45 -0000 1.7 --- PurgeTransForm.cpp 9 Mar 2006 18:58:39 -0000 1.8 *************** *** 36,41 **** //update the date field (could have been changed by editscheduledtransform) updateDateField(PURGE_TRANS_CHOOSE_DATE,date,date_txt); ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); return true; } --- 36,40 ---- //update the date field (could have been changed by editscheduledtransform) updateDateField(PURGE_TRANS_CHOOSE_DATE,date,date_txt); ! os35_drawForm(frm); return true; } Index: SplitsForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/SplitsForm.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** SplitsForm.cpp 17 Dec 2002 22:52:00 -0000 1.15 --- SplitsForm.cpp 9 Mar 2006 18:58:39 -0000 1.16 *************** *** 214,219 **** if(update_code == 0 || update_code == frmRedrawUpdateCode) { ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); } --- 214,218 ---- if(update_code == 0 || update_code == frmRedrawUpdateCode) { ! os35_drawForm(frm); } Index: TransactionsForm.cpp =================================================================== RCS file: /cvsroot/freecoins/freecoins/src/TransactionsForm.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** TransactionsForm.cpp 6 Mar 2006 21:00:35 -0000 1.33 --- TransactionsForm.cpp 9 Mar 2006 18:58:39 -0000 1.34 *************** *** 181,186 **** //draw form ! if(!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); displayTotals(); _trans_tbl.showScrollArrows(); --- 181,185 ---- //draw form ! os35_drawForm(frm); displayTotals(); _trans_tbl.showScrollArrows(); *************** *** 298,302 **** } EditAccountForm::instance()->setRecordIsNew(false); ! if(!osVerGe(palmos_3_5)) FrmEraseForm(frm); popup(EditAccountForm::instance()); //cancel the current selection --- 297,301 ---- } EditAccountForm::instance()->setRecordIsNew(false); ! os35_eraseForm(frm); popup(EditAccountForm::instance()); //cancel the current selection *************** *** 348,353 **** //draw form ! if (!osVerGe(palmos_3_5)) FrmEraseForm(frm); ! FrmDrawForm(frm); //display the running totals displayTotals(); --- 347,351 ---- //draw form ! os35_drawForm(frm); //display the running totals displayTotals(); |
From: Matija N. <mn...@us...> - 2006-03-09 19:28:02
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2820 Modified Files: Makefile.am build_id Log Message: code consolidation Index: Makefile.am =================================================================== RCS file: /cvsroot/freecoins/freecoins/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.am 25 Feb 2006 22:44:03 -0000 1.8 --- Makefile.am 9 Mar 2006 18:58:37 -0000 1.9 *************** *** 7,11 **** resources/freecoins.rcp.in resources/freecoins.xcf \ config/enable_debug.m4 config/palmos_test.m4 \ ! src/bins/dummy AUTOMAKE_OPTIONS = foreign --- 7,11 ---- resources/freecoins.rcp.in resources/freecoins.xcf \ config/enable_debug.m4 config/palmos_test.m4 \ ! src/bins/dummy bootstrap AUTOMAKE_OPTIONS = foreign Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** build_id 6 Mar 2006 21:00:35 -0000 1.19 --- build_id 9 Mar 2006 18:58:38 -0000 1.20 *************** *** 1 **** ! 177 --- 1 ---- ! 188 |
From: Matija N. <mn...@us...> - 2006-03-06 21:01:18
|
Update of /cvsroot/freecoins/freecoins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6375 Modified Files: CHANGES build_id Log Message: global find support Index: CHANGES =================================================================== RCS file: /cvsroot/freecoins/freecoins/CHANGES,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -r1.41 -r1.42 *** CHANGES 26 Feb 2006 21:38:22 -0000 1.41 --- CHANGES 6 Mar 2006 21:00:35 -0000 1.42 *************** *** 1,7 **** NOTE: see <A HREF="http://cvs.sourceforge.net/viewcvs.py/freecoins/freecoins/CHANGES?only_with_tag=MAIN&view=markup">CVS</A> for up-to-date Changelog ************* ! Version 0.6.3 (NYR) Unification of similar code reducing .prc size ! Global find support start (WIP) --- 1,7 ---- NOTE: see <A HREF="http://cvs.sourceforge.net/viewcvs.py/freecoins/freecoins/CHANGES?only_with_tag=MAIN&view=markup">CVS</A> for up-to-date Changelog ************* ! Version 0.6.3 (released 06.03.2006) Unification of similar code reducing .prc size ! Global find support Index: build_id =================================================================== RCS file: /cvsroot/freecoins/freecoins/build_id,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** build_id 4 Mar 2006 22:17:33 -0000 1.18 --- build_id 6 Mar 2006 21:00:35 -0000 1.19 *************** *** 1 **** ! 176 --- 1 ---- ! 177 |