summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/checkbook/checkbook.cpp18
-rw-r--r--noncore/apps/checkbook/mainwindow.cpp6
2 files changed, 17 insertions, 7 deletions
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 706d970..44d3764 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -329,24 +329,26 @@ void Checkbook::loadCheckbook()
329 pinNumEdit->setText( info->pin() ); 329 pinNumEdit->setText( info->pin() );
330 temptext.setNum( info->startingBalance(), 'f', 2 ); 330 temptext.setNum( info->startingBalance(), 'f', 2 );
331 balanceEdit->setText( temptext ); 331 balanceEdit->setText( temptext );
332 notesEdit->setText( info->notes() ); 332 notesEdit->setText( info->notes() );
333 333
334 // Load transactions 334 // Load transactions
335 float amount; 335 float amount;
336 QString stramount; 336 QString stramount;
337 QString symbol = _pCfg->getCurrencySymbol();
337 for ( TranInfo *tran = tranList->first(); tran; tran = tranList->next() ) 338 for ( TranInfo *tran = tranList->first(); tran; tran = tranList->next() )
338 { 339 {
339 amount = tran->amount(); 340 amount = tran->amount();
340 if ( tran->withdrawal() ) 341 if ( tran->withdrawal() )
341 { 342 {
342 amount *= -1; 343 amount *= -1;
343 } 344 }
344 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount ); 345 stramount.sprintf( "%.2f", amount );
346 stramount.prepend( symbol );
345 ( void ) new CBListItem( tran, tranTable, tran->getIdStr(), tran->datestr(false), tran->number(), tran->datestr(true), tran->desc(), stramount ); 347 ( void ) new CBListItem( tran, tranTable, tran->getIdStr(), tran->datestr(false), tran->number(), tran->datestr(true), tran->desc(), stramount );
346 } 348 }
347 349
348 // set sort order 350 // set sort order
349 bool bOk=false; 351 bool bOk=false;
350 for(int i=0; i<_cbSortType->count(); i++) { 352 for(int i=0; i<_cbSortType->count(); i++) {
351 if( _cbSortType->text(i)==info->getSortOrder() ) { 353 if( _cbSortType->text(i)==info->getSortOrder() ) {
352 _cbSortType->setCurrentItem(i); 354 _cbSortType->setCurrentItem(i);
@@ -365,21 +367,24 @@ void Checkbook::loadCheckbook()
365} 367}
366 368
367 369
368// --- adjustBalance ---------------------------------------------------------- 370// --- adjustBalance ----------------------------------------------------------
369void Checkbook::adjustBalance() 371void Checkbook::adjustBalance()
370{ 372{
371 // update running balance in register 373 // update running balance in register
372 QString sRunning; 374 QString sRunning;
375 QString symbol = _pCfg->getCurrencySymbol();
373 float bal=info->startingBalance(); 376 float bal=info->startingBalance();
377
374 for(CBListItem *item=(CBListItem *)tranTable->firstChild(); item; item=(CBListItem *)item->nextSibling() ) { 378 for(CBListItem *item=(CBListItem *)tranTable->firstChild(); item; item=(CBListItem *)item->nextSibling() ) {
375 TranInfo *tran=item->getTranInfo(); 379 TranInfo *tran=item->getTranInfo();
376 bal=bal + (tran->withdrawal() ? -1 : 1)*tran->amount() - tran->fee(); 380 bal=bal + (tran->withdrawal() ? -1 : 1)*tran->amount() - tran->fee();
377 sRunning.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), bal ); 381 sRunning.sprintf( "%.2f", bal );
382 sRunning.prepend(symbol);
378 item->setText( COL_BAL, sRunning); 383 item->setText( COL_BAL, sRunning);
379 } 384 }
380} 385}
381 386
382// --- resort ----------------------------------------------------------------- 387// --- resort -----------------------------------------------------------------
383void Checkbook::resort() 388void Checkbook::resort()
384{ 389{
385 tranTable->setSorting(_sortCol); 390 tranTable->setSorting(_sortCol);
@@ -477,26 +482,28 @@ void Checkbook::slotNewTran()
477{ 482{
478 TranInfo *traninfo = new TranInfo( info->getNextNumber() ); 483 TranInfo *traninfo = new TranInfo( info->getNextNumber() );
479 if( !_dLastNew.isNull() ) 484 if( !_dLastNew.isNull() )
480 traninfo->setDate(_dLastNew); 485 traninfo->setDate(_dLastNew);
481 486
482 Transaction *currtran = new Transaction( this, true, info->name(), 487 Transaction *currtran = new Transaction( this, true, info->name(),
483 traninfo, 488 traninfo,
484 _pCfg ); 489 _pCfg );
490 QString symbol = _pCfg->getCurrencySymbol();
485 if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted ) 491 if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted )
486 { 492 {
487 // Add to transaction list 493 // Add to transaction list
488 info->addTransaction( traninfo ); 494 info->addTransaction( traninfo );
489 495
490 // Add to transaction table 496 // Add to transaction table
491 float amount; 497 float amount;
492 QString stramount; 498 QString stramount;
493 amount = (traninfo->withdrawal() ? -1 : 1)*traninfo->amount(); 499 amount = (traninfo->withdrawal() ? -1 : 1)*traninfo->amount();
494 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount ); 500 stramount.sprintf( "%.2f", amount );
501 stramount.prepend(symbol);
495 ( void ) new CBListItem( traninfo, tranTable, traninfo->getIdStr(), traninfo->datestr(false), 502 ( void ) new CBListItem( traninfo, tranTable, traninfo->getIdStr(), traninfo->datestr(false),
496 traninfo->number(), traninfo->datestr(true), traninfo->desc(), 503 traninfo->number(), traninfo->datestr(true), traninfo->desc(),
497 stramount ); 504 stramount );
498 resort(); 505 resort();
499 adjustBalance(); 506 adjustBalance();
500 507
501 // save last date 508 // save last date
502 _dLastNew = traninfo->date(); 509 _dLastNew = traninfo->date();
@@ -536,17 +543,18 @@ void Checkbook::slotEditTran()
536 curritem->setText( COL_DESC, traninfo->desc() ); 543 curritem->setText( COL_DESC, traninfo->desc() );
537 544
538 float amount = traninfo->amount(); 545 float amount = traninfo->amount();
539 if ( traninfo->withdrawal() ) 546 if ( traninfo->withdrawal() )
540 { 547 {
541 amount *= -1; 548 amount *= -1;
542 } 549 }
543 QString stramount; 550 QString stramount;
544 stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount ); 551 stramount.sprintf( "%.2f", amount );
552 stramount.prepend( _pCfg->getCurrencySymbol() );
545 curritem->setText( COL_AMOUNT, stramount ); 553 curritem->setText( COL_AMOUNT, stramount );
546 resort(); 554 resort();
547 adjustBalance(); 555 adjustBalance();
548 556
549 // save description in list of payees, if not in there 557 // save description in list of payees, if not in there
550 QStringList *pLst=&_pCfg->getPayees(); 558 QStringList *pLst=&_pCfg->getPayees();
551 if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) { 559 if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) {
552 pLst->append( traninfo->desc() ); 560 pLst->append( traninfo->desc() );
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index ce15e3e..c7ffa7c 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -188,17 +188,18 @@ void MainWindow::addCheckbook( CBInfo *cb )
188 if ( _cfg.getShowLocks() && !cb->password().isNull() ) 188 if ( _cfg.getShowLocks() && !cb->password().isNull() )
189 { 189 {
190 lvi->setPixmap( 0, lockIcon ); 190 lvi->setPixmap( 0, lockIcon );
191 } 191 }
192 lvi->setText( posName, cb->name() ); 192 lvi->setText( posName, cb->name() );
193 if ( _cfg.getShowBalances() ) 193 if ( _cfg.getShowBalances() )
194 { 194 {
195 QString balance; 195 QString balance;
196 balance.sprintf( "%s%.2f", _cfg.getCurrencySymbol().latin1(), cb->balance() ); 196 balance.sprintf( "%.2f", cb->balance() );
197 balance.prepend( _cfg.getCurrencySymbol() );
197 lvi->setText( posName + 1, balance ); 198 lvi->setText( posName + 1, balance );
198 } 199 }
199} 200}
200 201
201void MainWindow::buildFilename( const QString &name ) 202void MainWindow::buildFilename( const QString &name )
202{ 203{
203 tempFilename = cbDir; 204 tempFilename = cbDir;
204 tempFilename.append( name ); 205 tempFilename.append( name );
@@ -299,17 +300,18 @@ void MainWindow::openBook(QListViewItem *curritem)
299 else 300 else
300 curritem->setPixmap( 0, nullIcon ); 301 curritem->setPixmap( 0, nullIcon );
301 } 302 }
302 303
303 // Update balance if changed 304 // Update balance if changed
304 if ( _cfg.getShowBalances() && cb->balance() != currbalance ) 305 if ( _cfg.getShowBalances() && cb->balance() != currbalance )
305 { 306 {
306 QString tempstr; 307 QString tempstr;
307 tempstr.sprintf( "%s%.2f", _cfg.getCurrencySymbol().latin1(), cb->balance() ); 308 tempstr.sprintf( "%.2f", cb->balance() );
309 tempstr.prepend( _cfg.getCurrencySymbol() );
308 curritem->setText( posName + 1, tempstr ); 310 curritem->setText( posName + 1, tempstr );
309 } 311 }
310 312
311 // write config, if needed 313 // write config, if needed
312 if( _cfg.isDirty() ) { 314 if( _cfg.isDirty() ) {
313 Config config("checkbook"); 315 Config config("checkbook");
314 _cfg.writeConfig( config ); 316 _cfg.writeConfig( config );
315 } 317 }