-rwxr-xr-x | noncore/apps/qashmoney/accountdisplay.cpp | 13 | ||||
-rw-r--r-- | noncore/apps/qashmoney/config.in | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.pro | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/noncore/apps/qashmoney/accountdisplay.cpp b/noncore/apps/qashmoney/accountdisplay.cpp index 0fe5b09..046d997 100755 --- a/noncore/apps/qashmoney/accountdisplay.cpp +++ b/noncore/apps/qashmoney/accountdisplay.cpp | |||
@@ -1,21 +1,26 @@ | |||
1 | #include <qmessagebox.h> | ||
2 | #include <qheader.h> | ||
3 | |||
4 | #include "accountdisplay.h" | 1 | #include "accountdisplay.h" |
5 | #include "newaccount.h" | 2 | #include "newaccount.h" |
6 | #include "transaction.h" | 3 | #include "transaction.h" |
7 | #include "transferdialog.h" | 4 | #include "transferdialog.h" |
8 | #include "transfer.h" | 5 | #include "transfer.h" |
9 | 6 | ||
7 | /* OPIE */ | ||
8 | #include <opie2/odebug.h> | ||
9 | using namespace Opie::Core; | ||
10 | |||
11 | /* QT */ | ||
12 | #include <qmessagebox.h> | ||
13 | #include <qheader.h> | ||
14 | |||
10 | extern Account *account; | 15 | extern Account *account; |
11 | extern Transaction *transaction; | 16 | extern Transaction *transaction; |
12 | extern Transfer *transfer; | 17 | extern Transfer *transfer; |
13 | extern Preferences *preferences; | 18 | extern Preferences *preferences; |
14 | 19 | ||
15 | AccountDisplay::AccountDisplay ( QWidget *parent ) : QWidget ( parent ) | 20 | AccountDisplay::AccountDisplay ( QWidget *parent ) : QWidget ( parent ) |
16 | { | 21 | { |
17 | cleared = 0; | 22 | cleared = 0; |
18 | 23 | ||
19 | firstline = new QHBox ( this ); | 24 | firstline = new QHBox ( this ); |
20 | firstline->setSpacing ( 2 ); | 25 | firstline->setSpacing ( 2 ); |
21 | 26 | ||
@@ -258,25 +263,25 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item ) | |||
258 | // enter today's date in the date box as default | 263 | // enter today's date in the date box as default |
259 | QDate today = QDate::currentDate (); | 264 | QDate today = QDate::currentDate (); |
260 | int defaultday = today.day(); | 265 | int defaultday = today.day(); |
261 | int defaultmonth = today.month(); | 266 | int defaultmonth = today.month(); |
262 | int defaultyear = today.year(); | 267 | int defaultyear = today.year(); |
263 | td->date->setText ( preferences->getDate ( defaultyear, defaultmonth, defaultday ) ); | 268 | td->date->setText ( preferences->getDate ( defaultyear, defaultmonth, defaultday ) ); |
264 | 269 | ||
265 | if ( td->exec() == QDialog::Accepted ) | 270 | if ( td->exec() == QDialog::Accepted ) |
266 | { | 271 | { |
267 | // set the cleared integer if the checkbox is checked | 272 | // set the cleared integer if the checkbox is checked |
268 | if ( td->clearedcheckbox->isChecked() == TRUE ) | 273 | if ( td->clearedcheckbox->isChecked() == TRUE ) |
269 | cleared = 1; | 274 | cleared = 1; |
270 | qDebug("Year from transferdialog = %i",td->getYear()); | 275 | odebug << "Year from transferdialog = " << td->getYear() << "" << oendl; |
271 | // add the transfer with a new date if its been edited or use the default date | 276 | // add the transfer with a new date if its been edited or use the default date |
272 | if ( td->getDateEdited () == TRUE ) | 277 | if ( td->getDateEdited () == TRUE ) |
273 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared ); | 278 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared ); |
274 | else | 279 | else |
275 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), defaultday, defaultmonth, defaultyear, td->amount->text().toFloat(), cleared ); | 280 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), defaultday, defaultmonth, defaultyear, td->amount->text().toFloat(), cleared ); |
276 | 281 | ||
277 | // update account balances of both accounts and parents if necessary | 282 | // update account balances of both accounts and parents if necessary |
278 | account->updateAccountBalance ( firstaccountid ); | 283 | account->updateAccountBalance ( firstaccountid ); |
279 | if ( account->getParentAccountID ( firstaccountid ) != -1 ) | 284 | if ( account->getParentAccountID ( firstaccountid ) != -1 ) |
280 | account->changeParentAccountBalance ( account->getParentAccountID ( firstaccountid ) ); | 285 | account->changeParentAccountBalance ( account->getParentAccountID ( firstaccountid ) ); |
281 | account->updateAccountBalance ( secondaccountid ); | 286 | account->updateAccountBalance ( secondaccountid ); |
282 | if ( account->getParentAccountID ( secondaccountid ) != -1 ) | 287 | if ( account->getParentAccountID ( secondaccountid ) != -1 ) |
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in index 91739fe..aeed298 100644 --- a/noncore/apps/qashmoney/config.in +++ b/noncore/apps/qashmoney/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config QASHMONEY | 1 | config QASHMONEY |
2 | boolean "opie-qashmoney (money manager)" | 2 | boolean "opie-qashmoney (money manager)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro index 6ad3db3..8a4302f 100755 --- a/noncore/apps/qashmoney/qashmoney.pro +++ b/noncore/apps/qashmoney/qashmoney.pro | |||
@@ -34,16 +34,16 @@ SOURCES = qashmoney.cpp \ | |||
34 | calculator.cpp \ | 34 | calculator.cpp \ |
35 | datepicker.cpp \ | 35 | datepicker.cpp \ |
36 | main.cpp \ | 36 | main.cpp \ |
37 | budget.cpp \ | 37 | budget.cpp \ |
38 | budgetdisplay.cpp \ | 38 | budgetdisplay.cpp \ |
39 | currency.cpp | 39 | currency.cpp |
40 | INCLUDEPATH = $(OPIEDIR)/include | 40 | INCLUDEPATH = $(OPIEDIR)/include |
41 | DEPENDPATH = $(OPIEDIR)/include | 41 | DEPENDPATH = $(OPIEDIR)/include |
42 | 42 | ||
43 | DESTDIR = $(OPIEDIR)/bin | 43 | DESTDIR = $(OPIEDIR)/bin |
44 | 44 | ||
45 | unix:LIBS += -lm | 45 | unix:LIBS += -lm |
46 | LIBS += -lqpe -lqte -lsqlite | 46 | LIBS += -lqpe -lopiecore2 -lsqlite |
47 | 47 | ||
48 | include ( $(OPIEDIR)/include.pro ) | 48 | include ( $(OPIEDIR)/include.pro ) |
49 | 49 | ||