From: <oma...@us...> - 2009-11-25 22:20:26
|
Revision: 822 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=822&view=rev Author: omalleypat Date: 2009-11-25 22:20:16 +0000 (Wed, 25 Nov 2009) Log Message: ----------- bugfix 1722589 balance col was not correct when transaction is marked as void Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2009-11-25 16:41:20 UTC (rev 821) +++ trunk/mmex/src/mmcheckingpanel.cpp 2009-11-25 22:20:16 UTC (rev 822) @@ -1243,13 +1243,12 @@ mmDBWrapper::updateTransactionWithStatus(*m_cp->getDb(), transID, status); m_cp->m_trans[m_selectedIndex]->status_ = status; - if (m_cp->m_currentView != wxT("View All Transactions")) - { - DeleteAllItems(); - m_cp->initVirtualListControl(); - } - RefreshItem(m_selectedIndex); - m_cp->setAccountSummary(); + // Remake the register. If user was viewing some transactions (eg void) + // any changes need to be reflected. Even if we are viewing all transactions, + // the register needs to be updated so the balance col is correct (eg a trans + // was changed from unreconciled to void). + DeleteAllItems(); + m_cp->initVirtualListControl(); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kkk...@us...> - 2009-12-12 14:37:00
|
Revision: 873 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=873&view=rev Author: kkkvadim Date: 2009-12-12 14:36:52 +0000 (Sat, 12 Dec 2009) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2009-12-12 12:04:53 UTC (rev 872) +++ trunk/mmex/src/mmcheckingpanel.cpp 2009-12-12 14:36:52 UTC (rev 873) @@ -1573,51 +1573,47 @@ void MyListCtrl::OnDeleteTransaction(wxCommandEvent& /*event*/) { - //check if a transaction is selected - if (m_selectedIndex != -1) - { - //ask if they really want to delete - wxMessageDialog msgDlg(this, _("Do you really want to delete the transaction?"), - _("Confirm Transaction Deletion"), - wxYES_NO|wxNO_DEFAULT); - //if yes the user wants to delete the transaction then delete and refresh the - // transactions list - if (msgDlg.ShowModal() == wxID_YES) - { - //find the topmost visible item - this will be used to set - // where to display the list again after refresh - long topItemIndex = GetTopItem(); - - //remove the transaction - m_cp->m_core->bTransactionList_.deleteTransaction(m_cp->accountID(), m_cp->m_trans[m_selectedIndex]->transactionID()); - + if (m_selectedIndex == -1) //check if a transaction is selected + return; - //initialize the transaction list to redo balances and images - m_cp->initVirtualListControl(); + //ask if they really want to delete + wxMessageDialog msgDlg(this, + _("Do you really want to delete the transaction?"), + _("Delete Transaction"), + wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION + ); + + if (msgDlg.ShowModal() != wxID_YES) + return; - if (!m_cp->m_trans.empty()) - { - //refresh the items showing from the point of the transaction delete down - //the transactions above the deleted transaction won't change so they - // don't need to be refreshed - RefreshItems(m_selectedIndex, static_cast<long>(m_cp->m_trans.size()) - 1); + //find the topmost visible item - this will be used to set + // where to display the list again after refresh + long topItemIndex = GetTopItem(); - //set the deleted transaction index to the new selection and focus on it - SetItemState(m_selectedIndex-1, wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED, - wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED); + //remove the transaction + m_cp->m_core->bTransactionList_.deleteTransaction(m_cp->accountID(), m_cp->m_trans[m_selectedIndex]->transactionID()); - //make sure the topmost item before transaction deletion is visible, otherwise - // the control will go back to the very top or bottom when refreshed - EnsureVisible(topItemIndex); - } - else - { - SetItemCount(0); - DeleteAllItems(); - m_selectedIndex = -1; - } - } - } + //initialize the transaction list to redo balances and images + m_cp->initVirtualListControl(); + + if (!m_cp->m_trans.empty()) { + //refresh the items showing from the point of the transaction delete down + //the transactions above the deleted transaction won't change so they + // don't need to be refreshed + RefreshItems(m_selectedIndex, static_cast<long>(m_cp->m_trans.size()) - 1); + + //set the deleted transaction index to the new selection and focus on it + SetItemState(m_selectedIndex-1, wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED, + wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED); + + //make sure the topmost item before transaction deletion is visible, otherwise + // the control will go back to the very top or bottom when refreshed + EnsureVisible(topItemIndex); + } else { + SetItemCount(0); + DeleteAllItems(); + m_selectedIndex = -1; + } } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2010-08-30 09:51:05
|
Revision: 999 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=999&view=rev Author: vomikan Date: 2010-08-30 09:50:59 +0000 (Mon, 30 Aug 2010) Log Message: ----------- Improving the functionality of hot keys. Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2010-08-23 06:18:44 UTC (rev 998) +++ trunk/mmex/src/mmcheckingpanel.cpp 2010-08-30 09:50:59 UTC (rev 999) @@ -1240,6 +1240,9 @@ } OnMarkTransactionDB(status); + SetItemState(m_selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + SetItemState(m_selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } //---------------------------------------------------------------------------- @@ -1269,13 +1272,16 @@ m_cp->m_trans[i]->status_ = status; } - if (m_cp->m_currentView != wxT("View All Transactions")) +// if (m_cp->m_currentView != wxT("View All Transactions")) { DeleteAllItems(); m_cp->initVirtualListControl(); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); // refresh everything } m_cp->setAccountSummary(); + SetItemState(m_selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + SetItemState(m_selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } //---------------------------------------------------------------------------- @@ -1483,11 +1489,13 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event) { - if (!wxGetKeyState(WXK_COMMAND) && !wxGetKeyState(WXK_ALT)) + if (!wxGetKeyState(WXK_COMMAND) && !wxGetKeyState(WXK_ALT) && !wxGetKeyState(WXK_CONTROL)) { switch ( event.GetKeyCode() ) { case WXK_DELETE: + case WXK_NUMPAD_DELETE: + { wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); OnDeleteTransaction(evt); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-02 17:08:56
|
Revision: 1054 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1054&view=rev Author: vomikan Date: 2011-01-02 17:08:50 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Tips for checking accounts panel added Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-01-02 00:03:49 UTC (rev 1053) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-01-02 17:08:50 UTC (rev 1054) @@ -735,7 +735,7 @@ itemButton9->Enable(false); wxStaticText* itemStaticText11 = new wxStaticText( itemPanel12, - ID_PANEL_CHECKING_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); + ID_PANEL_CHECKING_STATIC_DETAILS, wxT(""), wxPoint(-1,-1), wxSize(150, -1), wxNO_BORDER|wxTE_MULTILINE|wxTE_WORDWRAP|wxST_NO_AUTORESIZE); itemBoxSizer4->Add(itemStaticText11, 1, wxGROW|wxALL, 5); //Show tips when no transaction selected Tips(); @@ -758,20 +758,39 @@ void mmCheckingPanel::updateExtraTransactionData(int selIndex) { - {enableEditDeleteButtons(true);} + enableEditDeleteButtons(true); wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); - if (selIndex!=-1){ - st->SetLabel(getItem(selIndex, COL_NOTES));} - else {st->SetLabel(wxT ("--"));} - + st->SetLabel(getItem(selIndex, COL_NOTES)); } //---------------------------------------------------------------------------- void mmCheckingPanel::Tips() { - wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); - //FIXME I don't know how to realise it - st->SetLabel(wxT("")); + const wxString tips[] = { + _("Recommendation: Always backup your .mmb database file regularly."), + _("Recommendation: If upgrading to a new version of MMEX, make sure you backup your .mmb database file before doing so."), + _("Recommendation: Use copy (Ctrl+С) and paste (Ctrl+V) for frequently used transactions."), + _("Tip: Remember to make backups of your .mmb."), + _("Tip: The .mmb file is not encrypted. That means anyone else having the proper know how can actually open the file and read the contents. So make sure that if you are storing any sensitive financial information it is properly guarded."), + _("Tip: To mark a transaction as reconciled, just select the transaction and hit the 'r' or 'R' key. To mark a transaction as unreconciled, just select the transaction and hit the 'u' or 'U' key."), + _("Tip: To mark a transaction as requiring followup, just select the transaction and hit the 'f or 'F' key."), + _("Tip: MMEX supports printing of all reports that can be viewed. The print options are available under the menu, File->Print."), + _("Tip: You can modify some runtime behavior of MMEX by changing the options in the Options Dialog. "), + _("Tip: To print a statement with transactions from any arbitary set of criteria, use the transaction filter to select the transactions you want and then do a print from the menu."), + _("Tip: Set exchange rate for currencies in case if you have accounts with different currencies."), + + _("Tip to get out of debt: Pay yourself 10\% first. Put this into an account that is hard to touch. Make sure it is a chore to get the money out (you have to drive to the bank), so you will only tap it consciously and for major expenses.") , + _("Tip to get out of debt: Establish an emergency fund."), + _("Tip to get out of debt: Stop acquiring new debt."), + _("Tip to get out of debt: Create a realistic budget for your expenses.") , + _("Tip to get out of debt: Spend less than you earn."), + _("Tip to get out of debt: Pay more than the minimum.") + + }; + wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); + int pos = rand() % 17; + // Randomly prints one of the above tips + st->SetLabel(tips[pos]); } //---------------------------------------------------------------------------- void mmCheckingPanel::setAccountSummary() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-02 21:14:47
|
Revision: 1055 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1055&view=rev Author: vomikan Date: 2011-01-02 21:14:40 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Bugfix. When last transaction deleted - edit and delete buttons will hided Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-01-02 17:08:50 UTC (rev 1054) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-01-02 21:14:40 UTC (rev 1055) @@ -692,7 +692,7 @@ itemBoxSizer9->Add(itemSplitterWindow10, 1, wxGROW|wxALL, 1); - wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); itemPanel12->SetSizer(itemBoxSizer4); itemPanel12->SetBackgroundColour(mmColors::listDetailsPanelColor); @@ -704,11 +704,9 @@ wxButton* itemButton6 = new wxButton(itemPanel12, ID_BUTTON_NEW_TRANS, _("&New")); itemButton6->SetToolTip(_("New Transaction")); - wxFont fnt = itemButton6->GetFont(); fnt.SetWeight(wxFONTWEIGHT_NORMAL); fnt.SetPointSize(fnt.GetPointSize()); - itemButton6->SetFont(fnt); itemButton6->SetForegroundColour(wxColour(wxT("FOREST GREEN"))); itemBoxSizer5->Add(itemButton6, flags); @@ -758,9 +756,17 @@ void mmCheckingPanel::updateExtraTransactionData(int selIndex) { - enableEditDeleteButtons(true); wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); + if (selIndex!=-1) { + enableEditDeleteButtons(true); st->SetLabel(getItem(selIndex, COL_NOTES)); + } + else + { + st->SetLabel(wxT ("")); + enableEditDeleteButtons(false); + Tips () ; + } } //---------------------------------------------------------------------------- @@ -1249,6 +1255,7 @@ { m_selectedIndex = -1; m_cp->updateExtraTransactionData(m_selectedIndex); + //m_cp->enableEditDeleteButtons(false); } void MyListCtrl::OnItemRightClick(wxListEvent& event) @@ -1700,6 +1707,7 @@ SetItemCount(0); DeleteAllItems(); m_selectedIndex = -1; + m_cp->updateExtraTransactionData(m_selectedIndex); } } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-08 14:34:22
|
Revision: 1077 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1077&view=rev Author: vomikan Date: 2011-01-08 14:34:16 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Unroconciled status not "U" but wxT("") Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-01-08 13:53:14 UTC (rev 1076) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-01-08 14:34:16 UTC (rev 1077) @@ -456,6 +456,10 @@ EVT_MENU(MENU_ON_PASTE_TRANSACTION, MyListCtrl::OnPaste) EVT_MENU(MENU_ON_NEW_TRANSACTION, MyListCtrl::OnNewTransaction) + //EVT_KEY_UP(MyListCtrl::OnChar) + // If we use EVT_KEY_DOWN instead of EVT_CHAR, capital versions + // of all characters are always returned. EVT_CHAR also performs + // other necessary keyboard-dependent translations. EVT_CHAR(MyListCtrl::OnChar) END_EVENT_TABLE() @@ -597,10 +601,8 @@ wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); headerPanel->SetSizer(itemBoxSizerVHeader); - wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_HEADER, - wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, - wxT(""))); + wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_HEADER, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT(""))); itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 5); wxBoxSizer* itemBoxSizerHHeader2 = new wxBoxSizer(wxHORIZONTAL); @@ -613,8 +615,7 @@ itemBoxSizerHHeader2->Add(itemStaticBitmap3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemStaticBitmap3->SetEventHandler( this ); - wxStaticText* itemStaticText18 = new wxStaticText( headerPanel, - ID_PANEL_CHECKING_STATIC_PANELVIEW, + wxStaticText* itemStaticText18 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_PANELVIEW, _("Viewing All Transactions"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizerHHeader2->Add(itemStaticText18, 0, wxALL, 1); @@ -626,8 +627,7 @@ itemBoxSizerVHeader->Add(itemBoxSizerHHeader, 0, wxALL, 1); wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, - ID_PANEL_CHECKING_STATIC_BALHEADER, - wxT(""), wxDefaultPosition, wxSize(500, 20), 0 ); + ID_PANEL_CHECKING_STATIC_BALHEADER, wxT(""), wxDefaultPosition, wxSize(500, 20), 0 ); itemBoxSizerHHeader->Add(itemStaticText10, 0, wxALL | wxEXPAND , 5); /* ---------------------- */ @@ -1546,7 +1546,7 @@ wxGetKeyState(WXK_DELETE) || wxGetKeyState(WXK_NUMPAD_DELETE) ) - event.Skip(); + {event.Skip();} } //---------------------------------------------------------------------------- @@ -1584,17 +1584,19 @@ if (!wxGetKeyState(WXK_COMMAND) && !wxGetKeyState(WXK_ALT) && !wxGetKeyState(WXK_CONTROL)) { - switch ( event.GetKeyCode() ) - { - case WXK_DELETE: - case WXK_NUMPAD_DELETE: - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); - OnDeleteTransaction(evt); - } - break; + // new style + int keycode = event.GetKeyCode(); + char key = '\0'; + if (keycode < 256) + { + // TODO: Unicode in non-Unicode mode ?? + key = (char)keycode; + } + + switch ( key ) + { case 'v': case 'V': { @@ -1616,7 +1618,7 @@ case 'u': case 'U': { - if (status != wxT("U")) { + if (status != wxT("")) { wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKUNRECONCILED); OnMarkTransaction(evt); } } @@ -1638,12 +1640,23 @@ OnMarkTransaction(evt); } } break; + +/* case WXK_DELETE: + case WXK_NUMPAD_DELETE: + + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); + OnDeleteTransaction(evt); + } + break;*/ + } - default: - event.Skip(); - } - } +// default: + if (key == WXK_DELETE || key == WXK_NUMPAD_DELETE) + {wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); + OnDeleteTransaction(evt);} + } else { event.Skip();} } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-01-28 22:19:04
|
Revision: 1126 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1126&view=rev Author: stef145g Date: 2011-01-28 22:18:57 +0000 (Fri, 28 Jan 2011) Log Message: ----------- Added 3 more tips to Checking Panel Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-01-27 23:04:09 UTC (rev 1125) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-01-28 22:18:57 UTC (rev 1126) @@ -764,61 +764,63 @@ void mmCheckingPanel::enableEditDeleteButtons(bool en) { - wxButton* bE = (wxButton*)FindWindow(ID_BUTTON_EDIT_TRANS); - wxButton* bD = (wxButton*)FindWindow(ID_BUTTON_DELETE_TRANS); - wxButton* bM = (wxButton*)FindWindow(ID_BUTTON_MOVE_TRANS); - { - bE->Enable(en); - //bE->SetFocus(); + wxButton* bE = (wxButton*)FindWindow(ID_BUTTON_EDIT_TRANS); + wxButton* bD = (wxButton*)FindWindow(ID_BUTTON_DELETE_TRANS); + wxButton* bM = (wxButton*)FindWindow(ID_BUTTON_MOVE_TRANS); + + bE->Enable(en); + //bE->SetFocus(); bD->Enable(en); bM->Enable(en); - } + } //---------------------------------------------------------------------------- void mmCheckingPanel::updateExtraTransactionData(int selIndex) { - wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); + wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); if (selIndex!=-1) { enableEditDeleteButtons(true); st->SetLabel(getItem(selIndex, COL_NOTES)); - } - else - { + } else { st->SetLabel(wxT ("")); enableEditDeleteButtons(false); Tips () ; - } + } } //---------------------------------------------------------------------------- void mmCheckingPanel::Tips() { - const wxString tips[] = { - _("Recommendation: Always backup your .mmb database file regularly."), - _("Recommendation: If upgrading to a new version of MMEX, make sure you backup your .mmb database file before doing so."), - _("Recommendation: Use copy (Ctrl+С) and paste (Ctrl+V) for frequently used transactions."), - _("Tip: Remember to make backups of your .mmb."), - _("Tip: The .mmb file is not encrypted. That means anyone else having the proper know how can actually open the file and read the contents. So make sure that if you are storing any sensitive financial information it is properly guarded."), - _("Tip: To mark a transaction as reconciled, just select the transaction and hit the 'r' or 'R' key. To mark a transaction as unreconciled, just select the transaction and hit the 'u' or 'U' key."), - _("Tip: To mark a transaction as requiring followup, just select the transaction and hit the 'f' or 'F' key."), - _("Tip: MMEX supports printing of all reports that can be viewed. The print options are available under the menu, File->Print."), - _("Tip: You can modify some runtime behavior of MMEX by changing the options in the Options Dialog. "), - _("Tip: To print a statement with transactions from any arbitary set of criteria, use the transaction filter to select the transactions you want and then do a print from the menu."), - _("Tip: Set exchange rate for currencies in case if you have accounts with different currencies."), + const wxString tips[] = { + _("Recommendation: Always backup your .mmb database file regularly."), + _("Recommendation: If upgrading to a new version of MMEX, make sure you backup your .mmb database file before doing so."), + _("Recommendation: Use copy (Ctrl+С) and paste (Ctrl+V) for frequently used transactions."), + _("Tip: Remember to make backups of your .mmb."), + _("Tip: The .mmb file is not encrypted. That means anyone else having the proper know how can actually open the file and read the contents. So make sure that if you are storing any sensitive financial information it is properly guarded."), + _("Tip: To mark a transaction as reconciled, just select the transaction and hit the 'r' or 'R' key. To mark a transaction as unreconciled, just select the transaction and hit the 'u' or 'U' key."), + _("Tip: To mark a transaction as requiring followup, just select the transaction and hit the 'f' or 'F' key."), + _("Tip: MMEX supports printing of all reports that can be viewed. The print options are available under the menu, File->Print."), + _("Tip: You can modify some runtime behavior of MMEX by changing the options in the Options Dialog. "), + _("Tip: To print a statement with transactions from any arbitary set of criteria, use the transaction filter to select the transactions you want and then do a print from the menu."), + _("Tip: Set exchange rate for currencies in case if you have accounts with different currencies."), - _("Tip to get out of debt: Pay yourself 10% first. Put this into an account that is hard to touch. Make sure it is a chore to get the money out (you have to drive to the bank), so you will only tap it consciously and for major expenses.") , - _("Tip to get out of debt: Establish an emergency fund."), - _("Tip to get out of debt: Stop acquiring new debt."), - _("Tip to get out of debt: Create a realistic budget for your expenses.") , - _("Tip to get out of debt: Spend less than you earn."), - _("Tip to get out of debt: Pay more than the minimum.") + _("Organize Categories Dialog Tip: Pressing the h key will cycle through all categories starting with the letter h"), + _("Organize Categories Dialog Tip: Pressing 2 key combination will cycle through all categories starting with that key combination. Example: Pressing ho will select Homeneeds, Home, House Tax, etc..."), + _("Organize Payees Dialog Tip: Using the % key as a wildcard when using the filter. Example: %c shows Chemist and Doctor, %c%m shows Chemist only."), + + _("Tip to get out of debt: Pay yourself 10% first. Put this into an account that is hard to touch. Make sure it is a chore to get the money out (you have to drive to the bank), so you will only tap it consciously and for major expenses.") , + _("Tip to get out of debt: Establish an emergency fund."), + _("Tip to get out of debt: Stop acquiring new debt."), + _("Tip to get out of debt: Create a realistic budget for your expenses.") , + _("Tip to get out of debt: Spend less than you earn."), + _("Tip to get out of debt: Pay more than the minimum.") - }; - wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); - int pos = rand() % 17; - // Randomly prints one of the above tips - st->SetLabel(tips[pos]); + }; + wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); + int pos = rand() % 20; + // Randomly prints one of the above tips + st->SetLabel(tips[pos]); } //---------------------------------------------------------------------------- void mmCheckingPanel::setAccountSummary() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-04-17 00:54:34
|
Revision: 1234 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1234&view=rev Author: stef145g Date: 2011-04-17 00:54:27 +0000 (Sun, 17 Apr 2011) Log Message: ----------- Update Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-04-16 12:52:02 UTC (rev 1233) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-04-17 00:54:27 UTC (rev 1234) @@ -596,7 +596,7 @@ menu.Append(MENU_VIEW_UNRECONCILED, _("View Un-Reconciled Transactions")); menu.Append(MENU_VIEW_NOTRECONCILED, _("View All Except Reconciled Transactions")); menu.Append(MENU_VIEW_VOID, _("View Void Transactions")); - menu.Append(MENU_VIEW_FLAGGED, _("View Flagged Transactions")); + menu.Append(MENU_VIEW_FLAGGED, _("View \"Follow Up\" Transactions")); menu.Append(MENU_VIEW_DUPLICATE, _("View Duplicate Transactions")); menu.AppendSeparator(); menu.Append(MENU_VIEW_TODAY, _("View Transactions for today")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-05-02 20:26:24
|
Revision: 1257 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1257&view=rev Author: vomikan Date: 2011-05-02 20:26:17 +0000 (Mon, 02 May 2011) Log Message: ----------- addition info for transfer Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-05-02 08:44:03 UTC (rev 1256) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-05-02 20:26:17 UTC (rev 1257) @@ -48,6 +48,7 @@ const wxString TRANS_TYPE_DEPOSIT = wxT("Deposit"); const wxString TRANS_TYPE_TRANSFER = wxT("Transfer"); + enum EColumn { COL_DATE_OR_TRANSACTION_ID, @@ -801,6 +802,9 @@ if (selIndex!=-1) { enableEditDeleteButtons(true); st->SetLabel(getItem(selIndex, COL_NOTES)); + wxString miniStr; + miniStr = getTransferInfoStr(selIndex); + stm->SetLabel(miniStr); } else { //st->SetLabel(wxT ("")); stm->SetLabel(wxT ("")); @@ -809,7 +813,82 @@ } } //---------------------------------------------------------------------------- +wxString mmCheckingPanel::getTransferInfoStr(int selIndex) +{ + char sql[] = + "select c.transcode as TRANSCODE, " + "c.TRANSAMOUNT as TRANSAMOUNT, TOTRANSAMOUNT, " + "cf.CURRENCYNAME as CURRENCYNAME, tcf.CURRENCYNAME as TOCURRENCYNAME, " + "cf.CURRENCYID as CURRENCYID, tcf.CURRENCYID as TOCURRENCYID, " + "tcf.BASECONVRATE as ToCurrecyRate, " + "c.ACCOUNTID as ACCOUNTID, " + "c.TOACCOUNTID as TOACCOUNTID, " + "i.infovalue as BASECURRENCYID " + "from checkingaccount_v1 c " + "left join accountlist_v1 ta on ta.ACCOUNTID=c.TOACCOUNTID " + "left join accountlist_v1 a on a.ACCOUNTID=c.ACCOUNTID " + "left join currencyformats_v1 tcf on tcf.currencyid=ta.currencyid " + "left join currencyformats_v1 cf on cf.currencyid=a.currencyid " + "left join infotable_v1 i on i.infoname='BASECURRENCYID' " + "where c.transid = ? "; + + wxSQLite3Statement st = m_core->db_.get()->PrepareStatement(sql); + st.Bind(1, m_trans[selIndex]->transactionID()); + wxSQLite3ResultSet q1 = st.ExecuteQuery(); + + int basecurrencyid = q1.GetInt(wxT("BASECURRENCYID")); + wxString transcodeStr = q1.GetString(wxT("TRANSCODE")); + wxString currencynameStr = q1.GetString(wxT("CURRENCYNAME")); + wxString tocurrencynameStr = q1.GetString(wxT("TOCURRENCYNAME")); + + wxString infoStr = wxT(""); + if (transcodeStr == wxT("Transfer")) + { + int currencyid = q1.GetInt(wxT("CURRENCYID")); + int tocurrencyid = q1.GetInt(wxT("TOCURRENCYID")); + double amount = q1.GetDouble(wxT("TRANSAMOUNT")); + wxString amountStr; + double toamount = q1.GetDouble(wxT("TOTRANSAMOUNT")); + wxString toamountStr; + double convertion = (tocurrencyid == basecurrencyid ? toamount/amount : amount/toamount); + wxString convertionStr; + + + int accountId = q1.GetInt(wxT("ACCOUNTID")); + boost::shared_ptr<mmCurrency> pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(accountId).lock(); + wxASSERT(pCurrencyPtr); + mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); + + mmex::formatDoubleToCurrency(amount, amountStr); + infoStr << amountStr << wxT(" -> "); + mmex::formatDoubleToCurrencyEdit(convertion, convertionStr); + + int toaccountId = q1.GetInt(wxT("TOACCOUNTID")); + pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(toaccountId).lock(); + wxASSERT(pCurrencyPtr); + mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); + + mmex::formatDoubleToCurrency(toamount, toamountStr); + infoStr << toamountStr ; + + if (tocurrencyid != currencyid) + { + infoStr << wxT(" ("); + if (currencyid == basecurrencyid) + {infoStr << wxT("1") << tocurrencynameStr << wxT(" = ") << convertionStr << currencynameStr;} + else if (tocurrencyid == basecurrencyid) + {infoStr << wxT("1") << currencynameStr << wxT(" = ") << convertionStr << tocurrencynameStr;} + else + {infoStr << wxT("1") << tocurrencynameStr << wxT(" = ") << convertionStr << currencynameStr;} + infoStr << wxT(")"); + } + } + + +return infoStr; +} +//--------------------------- void mmCheckingPanel::Tips() { const wxString tips[] = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-05-03 09:21:33
|
Revision: 1259 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1259&view=rev Author: vomikan Date: 2011-05-03 09:21:27 +0000 (Tue, 03 May 2011) Log Message: ----------- warning fix Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-05-03 08:15:26 UTC (rev 1258) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-05-03 09:21:27 UTC (rev 1259) @@ -844,7 +844,6 @@ int currencyid = q1.GetInt(wxT("CURRENCYID")); double amount = q1.GetDouble(wxT("TRANSAMOUNT")); wxString amountStr; - double convrate = q1.GetDouble(wxT("BASECONVRATE")); wxString infoStr = wxT(""); if (transcodeStr == wxT("Transfer")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-05-18 05:25:49
|
Revision: 1282 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1282&view=rev Author: vomikan Date: 2011-05-18 05:25:43 +0000 (Wed, 18 May 2011) Log Message: ----------- No more if defined (__WXMSW__). The code should be for all platforms! Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-05-18 03:05:22 UTC (rev 1281) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-05-18 05:25:43 UTC (rev 1282) @@ -1034,13 +1034,22 @@ // clear everything m_trans.clear(); -#if defined (__WXMSW__) +//#if defined (__WXMSW__) + +// wxProgressDialog dlg(_("Please Wait"), +// _("Opening Database File && Verifying Integrity"), 100, this, +// wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH ); + +// dlg.Update(100); +// dlg.Destroy(); + wxProgressDialog* pgd = new wxProgressDialog(_("Please Wait"), _("Accessing Database"), 100, this, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH ); - pgd->Update(10); -#endif + pgd->Update(20); + //pgd->Destroy(); +//#endif boost::shared_ptr<mmAccount> pAccount = m_core->accountList_.getAccountSharedPtr(m_AccountID); double acctInitBalance = pAccount->initialBalance_; @@ -1130,9 +1139,9 @@ } } -#if defined (__WXMSW__) - pgd->Update(30); -#endif +//#if defined (__WXMSW__) + pgd->Update(40); +//#endif // sort m_trans by date double initBalance = acctInitBalance + unseenBalance; @@ -1143,9 +1152,9 @@ std::sort(m_trans.begin(), m_trans.end(), sortTransByDateAsc); -#if defined (__WXMSW__) - pgd->Update(50); -#endif +//#if defined (__WXMSW__) + pgd->Update(60); +//#endif for (size_t i = 0; i < m_trans.size(); ++i) { @@ -1187,9 +1196,9 @@ tr.balanceStr_ = balanceStr; } -#if defined (__WXMSW__) - pgd->Update(70); -#endif +//#if defined (__WXMSW__) + pgd->Update(80); +//#endif /* Setup the Sorting */ // decide whether top or down icon needs to be shown @@ -1212,10 +1221,10 @@ } } -#if defined (__WXMSW__) +//#if defined (__WXMSW__) pgd->Update(100); pgd->Destroy(); -#endif +//#endif } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-07-24 11:03:15
|
Revision: 1396 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1396&view=rev Author: vomikan Date: 2011-07-24 11:03:09 +0000 (Sun, 24 Jul 2011) Log Message: ----------- fix for delete wornings when compiling Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-07-24 10:58:45 UTC (rev 1395) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-07-24 11:03:09 UTC (rev 1396) @@ -1368,7 +1368,7 @@ m_listCtrlAccount->DeleteAllItems(); - initVirtualListControl(false); + initVirtualListControl(NULL); m_listCtrlAccount->RefreshItems(0, static_cast<long>(m_trans.size()) - 1); } @@ -1477,7 +1477,7 @@ // was changed from unreconciled to void). DeleteAllItems(); - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); } //---------------------------------------------------------------------------- @@ -1539,7 +1539,7 @@ { DeleteAllItems(); - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); // refresh everything } @@ -1759,7 +1759,7 @@ boost::shared_ptr<mmBankTransaction> pCopiedTrans = m_cp->m_core->bTransactionList_.copyTransaction(m_selectedForCopy, useOriginal); boost::shared_ptr<mmCurrency> pCurrencyPtr = m_cp->m_core->accountList_.getCurrencyWeakPtr(pCopiedTrans->accountID_).lock(); pCopiedTrans->updateAllData(m_cp->m_core, pCopiedTrans->accountID_, pCurrencyPtr, true); - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); } } @@ -1873,7 +1873,7 @@ if ( dlg.ShowModal() == wxID_OK ) { - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); if (m_selectedIndex != -1) { @@ -1904,7 +1904,7 @@ m_cp->m_core->bTransactionList_.deleteTransaction(m_cp->accountID(), m_cp->m_trans[m_selectedIndex]->transactionID()); //initialize the transaction list to redo balances and images - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); if (!m_cp->m_trans.empty()) { //refresh the items showing from the point of the transaction delete down @@ -1944,7 +1944,7 @@ void MyListCtrl::refreshVisualList() { - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); SetItemState(m_selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); SetItemState(m_selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -2023,7 +2023,7 @@ m_cp->m_trans[m_selectedIndex]->transactionID(), true, m_cp->m_inidb, this); if ( dlg.ShowModal() == wxID_OK ) { - m_cp->initVirtualListControl(false); + m_cp->initVirtualListControl(NULL); RefreshItems(0, static_cast<long>(m_cp->m_trans.size()) - 1); if (m_selectedIndex != -1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <oma...@us...> - 2011-11-16 01:48:56
|
Revision: 1511 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1511&view=rev Author: omalleypat Date: 2011-11-16 01:48:50 +0000 (Wed, 16 Nov 2011) Log Message: ----------- working to fix scrollbars not showing up in checking panel (on mac/linux). Scrollbars now disappear when the widow size goes narrower than the Transaction Filter string, wrapping is still bad Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-11-14 13:41:19 UTC (rev 1510) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-11-16 01:48:50 UTC (rev 1511) @@ -686,7 +686,7 @@ itemBoxSizerVHeader->Add(itemBoxSizerHHeader, 0, wxALL, 1); wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, - ID_PANEL_CHECKING_STATIC_BALHEADER, wxT(""), wxDefaultPosition, wxSize(650, 20), 0 ); + ID_PANEL_CHECKING_STATIC_BALHEADER, wxT(""), wxDefaultPosition, wxSize(-1,20), 0 ); itemBoxSizerHHeader->Add(itemStaticText10, 0, wxALL | wxEXPAND , 5); /* ---------------------- */ @@ -796,7 +796,7 @@ //Infobar-mini wxStaticText* itemStaticText44 = new wxStaticText( itemPanel12, ID_PANEL_CHECKING_STATIC_MINI, wxT(""), - wxPoint(-1,-1), wxSize(650, -1), wxNO_BORDER|wxST_NO_AUTORESIZE); + wxPoint(-1,-1), wxDefaultSize, wxNO_BORDER|wxST_NO_AUTORESIZE); itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxALL, 12); //Infobar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-27 16:37:05
|
Revision: 1535 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1535&view=rev Author: vomikan Date: 2011-11-27 16:36:59 +0000 (Sun, 27 Nov 2011) Log Message: ----------- multiple search possibility Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-11-27 16:02:55 UTC (rev 1534) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-11-27 16:36:59 UTC (rev 1535) @@ -2157,23 +2157,26 @@ if (!searchString.IsEmpty()) { - // wxStaticText* stm = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_MINI); - long totalItems = m_listCtrlAccount->GetItemCount()-1; + int selectedItem = m_listCtrlAccount->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)-1; + if (selectedItem < 0) + selectedItem = m_listCtrlAccount->GetItemCount()-1; + wxString t; - for (int i = totalItems; i >= 0; --i) + for (int i = selectedItem; i >= 0; --i) { t=getItem(i, COL_NOTES); if (t.Lower().Find(searchString)!=wxNOT_FOUND) { - //First of all any items should be unselected - int cursel = m_listCtrlAccount->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (cursel != wxNOT_FOUND) - m_listCtrlAccount->SetItemState(cursel, !wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - //Then finded item will be selected - m_listCtrlAccount->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - m_listCtrlAccount->EnsureVisible(i); - break; + + //First of all any items should be unselected + int cursel = m_listCtrlAccount->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (cursel != wxNOT_FOUND) + m_listCtrlAccount->SetItemState(cursel, !wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + //Then finded item will be selected + m_listCtrlAccount->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_listCtrlAccount->EnsureVisible(i); + break; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-27 17:54:30
|
Revision: 1536 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1536&view=rev Author: vomikan Date: 2011-11-27 17:54:23 +0000 (Sun, 27 Nov 2011) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-11-27 16:36:59 UTC (rev 1535) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-11-27 17:54:23 UTC (rev 1536) @@ -457,6 +457,7 @@ EVT_MENU(ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, mmCheckingPanel::OnFilterTransactions) EVT_SEARCHCTRL_SEARCH_BTN(wxID_FIND, mmCheckingPanel::OnSearchTxtEntered) + EVT_TEXT_ENTER(wxID_FIND, mmCheckingPanel::OnSearchTxtEntered) END_EVENT_TABLE() //---------------------------------------------------------------------------- @@ -783,18 +784,18 @@ itemButton9->Enable(false); wxSearchCtrl* searchCtrl = new wxSearchCtrl(itemPanel12, - wxID_FIND, wxEmptyString, wxDefaultPosition, wxSize(100,-1)); + wxID_FIND, wxEmptyString, wxDefaultPosition, wxSize(100,-1), wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB); itemBoxSizer5->Add(searchCtrl); searchCtrl->SetToolTip(_("Enter any string to find it in the nearest transaction notes")); //Infobar-mini wxStaticText* itemStaticText44 = new wxStaticText( itemPanel12, ID_PANEL_CHECKING_STATIC_MINI, wxT(""), wxPoint(-1,-1), wxDefaultSize, 0); - itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxALL, 12); + itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxTOP|wxLEFT, 5); //Infobar wxStaticText* itemStaticText11 = new wxStaticText( itemPanel12, - ID_PANEL_CHECKING_STATIC_DETAILS, wxT(""), wxPoint(-1,-1), wxSize(150, -1), wxNO_BORDER|wxTE_MULTILINE|wxTE_WORDWRAP|wxST_NO_AUTORESIZE); + ID_PANEL_CHECKING_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxSize(150, -1), wxNO_BORDER|wxTE_MULTILINE|wxTE_WORDWRAP|wxST_NO_AUTORESIZE); itemBoxSizer4->Add(itemStaticText11, 1, wxGROW|wxALL, 5); //Show tips when no transaction selected Tips(); @@ -821,6 +822,7 @@ if (selIndex!=-1) { enableEditDeleteButtons(true); st->SetLabel(getItem(selIndex, COL_NOTES)); + //st->SetLabel(m_trans[selIndex]->notes_); wxString miniStr; miniStr = getMiniInfoStr(selIndex); stm->SetLabel(miniStr); @@ -2020,6 +2022,7 @@ SetItemState(m_selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); SetItemState(m_selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); EnsureVisible(m_selectedIndex); + m_cp->updateExtraTransactionData(m_selectedIndex); } // Called only when moving a deposit/withdraw transaction to a new account. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-12-13 09:12:50
|
Revision: 1567 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1567&view=rev Author: vomikan Date: 2011-12-13 09:12:39 +0000 (Tue, 13 Dec 2011) Log Message: ----------- Keystrokes mechanizm changed. Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2011-12-11 06:33:40 UTC (rev 1566) +++ trunk/mmex/src/mmcheckingpanel.cpp 2011-12-13 09:12:39 UTC (rev 1567) @@ -1818,40 +1818,6 @@ } //---------------------------------------------------------------------------- -void MyListCtrl::OnChar(wxKeyEvent& event) -{ - if (wxGetKeyState(WXK_ALT) || - wxGetKeyState(WXK_COMMAND) || - wxGetKeyState(WXK_UP) || - wxGetKeyState(WXK_DOWN) || - wxGetKeyState(WXK_LEFT) || - wxGetKeyState(WXK_RIGHT) || - wxGetKeyState(WXK_HOME) || - wxGetKeyState(WXK_END) || - wxGetKeyState(WXK_PAGEUP) || - wxGetKeyState(WXK_PAGEDOWN) || - wxGetKeyState(WXK_NUMPAD_UP) || - wxGetKeyState(WXK_NUMPAD_DOWN) || - wxGetKeyState(WXK_NUMPAD_LEFT) || - wxGetKeyState(WXK_NUMPAD_RIGHT) || - wxGetKeyState(WXK_NUMPAD_PAGEDOWN) || - wxGetKeyState(WXK_NUMPAD_PAGEUP) || - wxGetKeyState(WXK_NUMPAD_HOME) || - wxGetKeyState(WXK_NUMPAD_END) || - wxGetKeyState(WXK_DELETE) || - wxGetKeyState(WXK_NUMPAD_DELETE) || - wxGetKeyState(WXK_TAB)|| - wxGetKeyState(WXK_RETURN)|| - wxGetKeyState(WXK_NUMPAD_ENTER)|| - wxGetKeyState(WXK_SPACE)|| - wxGetKeyState(WXK_NUMPAD_SPACE) - ) - { - event.Skip(); - } -} -//---------------------------------------------------------------------------- - void MyListCtrl::OnCopy(wxCommandEvent& WXUNUSED(event)) { if (m_selectedIndex != -1) { @@ -1877,6 +1843,13 @@ } //---------------------------------------------------------------------------- +void MyListCtrl::OnChar(wxKeyEvent& event) +{ + if (!wxGetKeyState(wxKeyCode('V'))&& !wxGetKeyState(wxKeyCode('R')) && !wxGetKeyState(wxKeyCode('U')) && !wxGetKeyState(wxKeyCode('F')) && !wxGetKeyState(wxKeyCode('D'))) + event.Skip(); +} +//---------------------------------------------------------------------------- + void MyListCtrl::OnListKeyDown(wxListEvent& event) { if (m_selectedIndex == -1) //check if a transaction is selected @@ -1896,76 +1869,33 @@ if (!wxGetKeyState(WXK_COMMAND) && !wxGetKeyState(WXK_ALT) && !wxGetKeyState(WXK_CONTROL)) { - // new style - int keycode = event.GetKeyCode(); - char key = '\0'; - if (keycode < 256) - { - // TODO: Unicode in non-Unicode mode ?? - key = (char)keycode; - } - - switch ( key ) - { - case 'v': - case 'V': - { - if (status != wxT("V")) - { //Do not update status if it's already the same - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKVOID); - OnMarkTransaction(evt); - } - } - break; - - case 'r': - case 'R': - { - if (status != wxT("R")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKRECONCILED); - OnMarkTransaction(evt); - } - } - break; - - case 'u': - case 'U': - { - if (status != wxT("")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKUNRECONCILED); - OnMarkTransaction(evt); - } - } - break; - - case 'f': - case 'F': - { - if (status != wxT("F")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARK_ADD_FLAG_FOLLOWUP); - OnMarkTransaction(evt); - } - } - break; - - case 'd': - case 'D': - { - if (status != wxT("D")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKDUPLICATE); - OnMarkTransaction(evt); - } - } - break; - - } // end switch + if (wxGetKeyState(wxKeyCode('V')) && status != wxT("V")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKVOID); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('R')) && status != wxT("R")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKRECONCILED); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('U')) && status != wxT("")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKUNRECONCILED); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('F')) && status != wxT("F")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARK_ADD_FLAG_FOLLOWUP); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('D')) && status != wxT("D")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKDUPLICATE); + OnMarkTransaction(evt); + } -// default: - if (key == WXK_DELETE || key == WXK_NUMPAD_DELETE) + else if (wxGetKeyState(WXK_DELETE) || wxGetKeyState(WXK_NUMPAD_DELETE)) { wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); OnDeleteTransaction(evt); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-01-04 21:37:03
|
Revision: 1605 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1605&view=rev Author: vomikan Date: 2012-01-04 21:36:57 +0000 (Wed, 04 Jan 2012) Log Message: ----------- added restriction for transfer function Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-01-04 21:10:49 UTC (rev 1604) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-01-04 21:36:57 UTC (rev 1605) @@ -804,13 +804,16 @@ void mmCheckingPanel::enableEditDeleteButtons(bool en) { - wxButton* bE = (wxButton*)FindWindow(wxID_EDIT); - wxButton* bD = (wxButton*)FindWindow(wxID_DELETE); - wxButton* bM = (wxButton*)FindWindow(wxID_MOVE_FRAME); + wxButton* bEdit = (wxButton*)FindWindow(wxID_EDIT); + wxButton* bDelete = (wxButton*)FindWindow(wxID_DELETE); + wxButton* bMove = (wxButton*)FindWindow(wxID_MOVE_FRAME); - bE->Enable(en); - bD->Enable(en); - bM->Enable(en); + bEdit->Enable(en); + bDelete->Enable(en); + if (mmDBWrapper::getNumAccounts(getDb().get())>1) + bMove->Enable(en); + else + bMove->Enable(false); } //---------------------------------------------------------------------------- @@ -1999,7 +2002,7 @@ // Called only when moving a deposit/withdraw transaction to a new account. int MyListCtrl::destinationAccountID(wxString accName) { - wxArrayString as = mmDBWrapper::getAccountsName(m_cp->getDb().get()); + wxArrayString as = mmDBWrapper::getAccountsNameExceptOne(m_cp->getDb().get(), m_cp->accountID()); wxString headerMsg = _("Moving Transaction from ") + accName + _(" to..."); wxSingleChoiceDialog scd(0, _("Select the destination Account "), headerMsg , as); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-03 05:08:58
|
Revision: 1714 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1714&view=rev Author: guanlisheng Date: 2012-02-03 05:08:51 +0000 (Fri, 03 Feb 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-02-02 14:43:24 UTC (rev 1713) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-02-03 05:08:51 UTC (rev 1714) @@ -49,7 +49,7 @@ enum EColumn { - COL_DATE_OR_TRANSACTION_ID, + COL_DATE_OR_TRANSACTION_ID = 0, COL_TRANSACTION_NUMBER, COL_PAYEE_STR, COL_STATUS, @@ -154,9 +154,6 @@ typedef bool (*sort_fun_t)(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc); //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByDate(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { bool res = false; @@ -171,26 +168,6 @@ } //---------------------------------------------------------------------------- -/* - This function is not sort_fun_t. -*/ -bool sortTransByDateAsc(const mmBankTransaction *t1, const mmBankTransaction *t2) -{ - bool res = false; - - if (t1->date_ == t2->date_) { - res = t1->transactionID() < t2->transactionID(); - } else { - res = t1->date_ < t2->date_; - } - - return res; -} -//---------------------------------------------------------------------------- - -/* - sort_fun_t. -*/ bool sortTransByNum(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { long v1 = 0; @@ -211,9 +188,6 @@ } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByPayee(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { // Primary sort by Payee, secondary sort by Date. @@ -227,9 +201,6 @@ } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByStatus(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { // Primary sort by Status, Secondary sort by Date. @@ -243,9 +214,6 @@ } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByCateg(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { // Primary sort by Category, Secondary sort by Date. @@ -282,36 +250,24 @@ } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByWithdrowal(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { return sortAsCurrency(t1->withdrawalStr_, t2->withdrawalStr_, asc); } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByDeposit(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { return sortAsCurrency(t1->depositStr_, t2->depositStr_, asc); } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByBalanse(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { return sort(t1->balance_, t2->balance_, asc); } //---------------------------------------------------------------------------- -/* - sort_fun_t. -*/ bool sortTransByNotes(const mmBankTransaction *t1, const mmBankTransaction *t2, bool asc) { return sort(t1->notes_, t2->notes_, asc); @@ -362,13 +318,25 @@ }; //---------------------------------------------------------------------------- +/* + This function is not sort_fun_t. +*/ +bool sortTransByDateAsc(const mmBankTransaction *t1, const mmBankTransaction *t2) +{ + bool res = false; + + if (t1->date_ == t2->date_) { + res = t1->transactionID() < t2->transactionID(); + } else { + res = t1->date_ < t2->date_; + } + + return res; +} + } // namespace //---------------------------------------------------------------------------- - -/* - Custom ListCtrl class that implements virtual LC style -*/ class MyListCtrl : public wxListCtrl { public: @@ -753,7 +721,6 @@ m_listCtrlAccount->setSortOrder(g_asc); m_listCtrlAccount->setColumnImage(m_listCtrlAccount->getSortColumn(), m_listCtrlAccount->getSortOrder() ? ICON_ASC : ICON_DESC); // asc\desc sort mark (arrow) //m_listCtrlAccount->SetBackgroundColour(mmColors::listDetailsPanelColor); - } wxPanel *itemPanel12 = new wxPanel(itemSplitterWindow10, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-25 07:53:39
|
Revision: 1873 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1873&view=rev Author: vomikan Date: 2012-02-25 07:53:33 +0000 (Sat, 25 Feb 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-02-25 07:52:03 UTC (rev 1872) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-02-25 07:53:33 UTC (rev 1873) @@ -941,7 +941,7 @@ void mmCheckingPanel::showTips() { wxStaticText* st = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_DETAILS); - st->SetLabel(Tips(wxT("checkingpanel"))); + st->SetLabel(Tips(TIPS_BANKS)); } //---------------------------------------------------------------------------- void mmCheckingPanel::setAccountSummary() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-26 12:24:30
|
Revision: 1894 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1894&view=rev Author: guanlisheng Date: 2012-02-26 12:24:24 +0000 (Sun, 26 Feb 2012) Log Message: ----------- format & cleanup Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-02-26 10:18:09 UTC (rev 1893) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-02-26 12:24:24 UTC (rev 1894) @@ -138,9 +138,7 @@ long width = -1; - if (val.ToLong(&width)) { - lst.SetColumnWidth(i, width); - } + if (val.ToLong(&width)) lst.SetColumnWidth(i, width); } } //---------------------------------------------------------------------------- @@ -517,7 +515,8 @@ SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); bool ok = wxPanel::Create(parent, winid, pos, size, style, name); - if (ok) { + if (ok) + { Freeze(); CreateControls(); GetSizer()->Fit(this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-03-06 12:14:07
|
Revision: 1936 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1936&view=rev Author: guanlisheng Date: 2012-03-06 12:13:56 +0000 (Tue, 06 Mar 2012) Log Message: ----------- format Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-03-06 12:10:21 UTC (rev 1935) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-03-06 12:13:56 UTC (rev 1936) @@ -84,11 +84,8 @@ EColumn toEColumn(long col) { EColumn res = COL_DEF_SORT; + if (col >= 0 && col < COL_MAX) res = static_cast<EColumn>(col); - if (col >= 0 && col < COL_MAX) { - res = static_cast<EColumn>(col); - } - return res; } //---------------------------------------------------------------------------- @@ -787,13 +784,16 @@ miniStr = getMiniInfoStr(selIndex); //Show only first line but full string set as tooltip - if (miniStr.Find(wxT("\n")) > 1 && !miniStr.IsEmpty()) { - stm->SetLabel(miniStr.substr(0,miniStr.Find(wxT("\n"))) + wxT(" ...")); - stm->SetToolTip(miniStr); - } else { - stm->SetLabel(miniStr); - stm->SetToolTip(miniStr); - } + if (miniStr.Find(wxT("\n")) > 1 && !miniStr.IsEmpty()) + { + stm->SetLabel(miniStr.substr(0,miniStr.Find(wxT("\n"))) + wxT(" ...")); + stm->SetToolTip(miniStr); + } + else + { + stm->SetLabel(miniStr); + stm->SetToolTip(miniStr); + } } else @@ -885,11 +885,17 @@ if (accountId == m_AccountID && convrate < toconvrate) { infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" "); - } else if (accountId == m_AccountID && convrate > toconvrate) { + } + else if (accountId == m_AccountID && convrate > toconvrate) + { infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" "); - } else if (accountId != m_AccountID && convrate < toconvrate) { + } + else if (accountId != m_AccountID && convrate < toconvrate) + { infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" "); - } else { + } + else + { infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" "); } infoStr << wxT(" )"); @@ -901,7 +907,7 @@ { infoStr = mmDBWrapper::getSplitTrxNotes(core_->db_.get(), m_trans[selIndex]->transactionID()); //infoStr.RemoveLast(1); - } + } if (currencyid != basecurrencyid) //Show nothing if account currency is base { @@ -1123,9 +1129,7 @@ bool ok = v_transPtr[i] != 0; wxASSERT(ok); - if (!ok) { - continue; - } + if (!ok) continue; mmBankTransaction* transPtr = v_transPtr[i]; initBalance = getBalance( transPtr, initBalance); @@ -1646,7 +1650,8 @@ bool ok = m_cp && index < m_cp->m_trans.size(); mmBankTransaction *tr = ok ? m_cp->m_trans[index] : 0; - if (tr->transType_ == TRANS_TYPE_TRANSFER_STR) { + if (tr->transType_ == TRANS_TYPE_TRANSFER_STR) + { if ( tr->accountID_ == m_cp->accountID() ) res = ICON_TRANS_WITHDRAWAL; else @@ -1688,7 +1693,7 @@ // should continue as these keys may be processed by the operating system. void TransactionListCtrl::OnChar(wxKeyEvent& event) { - if (wxGetKeyState(WXK_ALT) || + if (wxGetKeyState(WXK_ALT) || wxGetKeyState(WXK_COMMAND) || wxGetKeyState(WXK_UP) || wxGetKeyState(WXK_DOWN) || @@ -1715,7 +1720,7 @@ wxGetKeyState(WXK_NUMPAD_SPACE) ) { - event.Skip(); + event.Skip(); } } //---------------------------------------------------------------------------- @@ -1763,31 +1768,31 @@ if (!wxGetKeyState(WXK_COMMAND) && !wxGetKeyState(WXK_ALT) && !wxGetKeyState(WXK_CONTROL)) { - if (wxGetKeyState(wxKeyCode('V')) && status != wxT("V")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKVOID); - OnMarkTransaction(evt); - } - else if (wxGetKeyState(wxKeyCode('R')) && status != wxT("R")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKRECONCILED); - OnMarkTransaction(evt); - } - else if (wxGetKeyState(wxKeyCode('U')) && status != wxT("")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKUNRECONCILED); - OnMarkTransaction(evt); - } - else if (wxGetKeyState(wxKeyCode('F')) && status != wxT("F")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARK_ADD_FLAG_FOLLOWUP); - OnMarkTransaction(evt); - } - else if (wxGetKeyState(wxKeyCode('D')) && status != wxT("D")) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKDUPLICATE); - OnMarkTransaction(evt); - } + if (wxGetKeyState(wxKeyCode('V')) && status != wxT("V")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKVOID); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('R')) && status != wxT("R")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKRECONCILED); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('U')) && status != wxT("")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKUNRECONCILED); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('F')) && status != wxT("F")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARK_ADD_FLAG_FOLLOWUP); + OnMarkTransaction(evt); + } + else if (wxGetKeyState(wxKeyCode('D')) && status != wxT("D")) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_MARKDUPLICATE); + OnMarkTransaction(evt); + } else if (wxGetKeyState(WXK_DELETE) || wxGetKeyState(WXK_NUMPAD_DELETE)) { @@ -1879,8 +1884,8 @@ m_selectedIndex = -1; m_cp->updateExtraTransactionData(m_selectedIndex); } - //Update info panels - //m_cp->updateExtraTransactionData(m_selectedIndex); + //Update info panels + //m_cp->updateExtraTransactionData(m_selectedIndex); } } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-21 11:03:57
|
Revision: 2056 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2056&view=rev Author: vomikan Date: 2012-03-21 11:03:46 +0000 (Wed, 21 Mar 2012) Log Message: ----------- fix crash when transaction filter selected and the view is on View duplicate transactions, or Viewing Void transactions Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 07:42:38 UTC (rev 2055) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 11:03:46 UTC (rev 2056) @@ -620,31 +620,38 @@ headerPanel->SetSizer(itemBoxSizerVHeader); headerPanel->SetBackgroundColour(mmColors::listBackColor); + wxGridSizer* itemBoxSizerVHeader2 = new wxGridSizer(2,20,20); + itemBoxSizerVHeader->Add(itemBoxSizerVHeader2); + wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_HEADER, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT(""))); - itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 5); + itemStaticText9->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT(""))); + itemBoxSizerVHeader2->Add(itemStaticText9, 0, wxALL, 0); wxBoxSizer* itemBoxSizerHHeader2 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizerVHeader->Add(itemBoxSizerHHeader2, 0, wxALL, 1); + wxFlexGridSizer* itemFlexGridSizerHHeader2 = new wxFlexGridSizer(2,2,0,0); + itemBoxSizerVHeader2->Add(itemBoxSizerHHeader2); + itemBoxSizerHHeader2->Add(itemFlexGridSizerHHeader2); wxBitmap itemStaticBitmap3Bitmap(rightarrow_xpm); wxStaticBitmap* itemStaticBitmap3 = new wxStaticBitmap( headerPanel, ID_PANEL_CHECKING_STATIC_BITMAP_VIEW, itemStaticBitmap3Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizerHHeader2->Add(itemStaticBitmap3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); - itemStaticBitmap3->SetEventHandler( this ); + itemFlexGridSizerHHeader2->Add(itemStaticBitmap3, 0, wxALIGN_LEFT|wxALL, 0); + itemStaticBitmap3->SetEventHandler( this ); wxStaticText* itemStaticText18 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_PANELVIEW, _("Viewing All Transactions"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizerHHeader2->Add(itemStaticText18, 0, wxALL, 1); + itemFlexGridSizerHHeader2->Add(itemStaticText18, 0, wxALIGN_LEFT, 0); - wxStaticBitmap* itemStaticBitmap31 = new wxStaticBitmap( headerPanel, ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, + itemStaticBitmap31_ = new wxStaticBitmap( headerPanel, ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, itemStaticBitmap3Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizerHHeader2->Add(itemStaticBitmap31, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 120); - itemStaticBitmap31->SetEventHandler( this ); + itemFlexGridSizerHHeader2->Add(itemStaticBitmap31_, 0, wxALIGN_LEFT,0); + itemStaticBitmap31_->SetEventHandler( this ); + itemStaticBitmap31_->Enable(true); statTextTransFilter_ = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_PANELVIEW, _("Transaction Filter"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizerHHeader2->Add(statTextTransFilter_, 0, wxALL, 1); + itemFlexGridSizerHHeader2->Add(statTextTransFilter_, 0, wxALIGN_LEFT, 0); + statTextTransFilter_->Enable(true); m_currentView = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), VIEW_TRANS_ALL_STR); @@ -1371,11 +1378,19 @@ wxBitmap activeBitmapFilterIcon(tipicon_xpm); wxBitmap bitmapFilterIcon(rightarrow_xpm); - int row_id; + wxString messageStr; + int row_id = -1; wxArrayString currentViewStr = viewTransactionsStrings(false, m_currentView, row_id); - currentViewStr = viewTransactionsStrings(true, wxEmptyString, row_id); - - wxString messageStr = wxString() << _("Current filtering has been set to: ")<< wxT("\n") << currentViewStr[row_id] << wxT("\n\n"); + + wxSafeShowMessage(wxString::Format(wxT("%i"), row_id), m_currentView); + + if (row_id > -1) { + currentViewStr = viewTransactionsStrings(true, wxEmptyString, row_id); + messageStr << _("Current filtering has been set to: ")<< wxT("\n") + << currentViewStr[row_id] << wxT("\n\n"); + } + else { + } messageStr << _("Please set filtering to: ") << _("View All Transactions"); if (m_currentView != VIEW_TRANS_ALL_STR) @@ -1395,8 +1410,8 @@ transFilterActive_ = false; } - wxStaticBitmap* staticBitmap = (wxStaticBitmap*)FindWindow(ID_PANEL_CHECKING_STATIC_BITMAP_FILTER); - staticBitmap->SetBitmap(bitmapFilterIcon); + itemStaticBitmap31_->SetBitmap(bitmapFilterIcon); + itemStaticBitmap31_->Enable(true); m_listCtrlAccount->DeleteAllItems(); initVirtualListControl(NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-21 11:05:28
|
Revision: 2057 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2057&view=rev Author: vomikan Date: 2012-03-21 11:05:18 +0000 (Wed, 21 Mar 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 11:03:46 UTC (rev 2056) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 11:05:18 UTC (rev 2057) @@ -1382,15 +1382,11 @@ int row_id = -1; wxArrayString currentViewStr = viewTransactionsStrings(false, m_currentView, row_id); - wxSafeShowMessage(wxString::Format(wxT("%i"), row_id), m_currentView); - if (row_id > -1) { currentViewStr = viewTransactionsStrings(true, wxEmptyString, row_id); messageStr << _("Current filtering has been set to: ")<< wxT("\n") << currentViewStr[row_id] << wxT("\n\n"); } - else { - } messageStr << _("Please set filtering to: ") << _("View All Transactions"); if (m_currentView != VIEW_TRANS_ALL_STR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-21 20:00:11
|
Revision: 2062 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2062&view=rev Author: vomikan Date: 2012-03-21 20:00:04 +0000 (Wed, 21 Mar 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 18:41:45 UTC (rev 2061) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-03-21 20:00:04 UTC (rev 2062) @@ -646,18 +646,15 @@ itemStaticBitmap31_ = new wxStaticBitmap( headerPanel, ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, itemStaticBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); itemFlexGridSizerHHeader2->Add(itemStaticBitmap31_); - itemStaticBitmap31_->Enable(false); itemStaticBitmap31_->Connect(ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, wxEVT_LEFT_DOWN, wxMouseEventHandler(mmCheckingPanel::OnFilterTransactions), NULL, this); itemStaticBitmap31_->Connect(ID_PANEL_CHECKING_STATIC_BITMAP_FILTER, wxEVT_RIGHT_DOWN, wxMouseEventHandler(mmCheckingPanel::OnFilterTransactions), NULL, this); statTextTransFilter_ = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_FILTER, _("Transaction Filter"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizerHHeader2->Add(statTextTransFilter_, 0, wxALIGN_LEFT, 0); - statTextTransFilter_->Enable(false); m_currentView = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), VIEW_TRANS_ALL_STR); - initViewTransactionsHeader(); wxBoxSizer* itemBoxSizerHHeader = new wxBoxSizer(wxHORIZONTAL); itemBoxSizerVHeader->Add(itemBoxSizerHHeader, 0, wxALL, 1); @@ -1232,8 +1229,12 @@ void mmCheckingPanel::initViewTransactionsHeader() { - if (m_currentView == VIEW_TRANS_ALL_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing all transactions")); - else if (m_currentView == VIEW_TRANS_RECONCILED_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing Reconciled transactions")); + if (m_currentView == VIEW_TRANS_ALL_STR) { + itemStaticTextMainFilter_->SetLabel(_("Viewing all transactions")); + itemStaticBitmap31_->Enable(true); + statTextTransFilter_->Enable(true); + } else { + if (m_currentView == VIEW_TRANS_RECONCILED_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing Reconciled transactions")); else if (m_currentView == VIEW_TRANS_NOT_RECONCILED_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing All Except Reconciled Transactions")); else if (m_currentView == VIEW_TRANS_UNRECONCILED_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing Un-Reconciled transactions")); else if (m_currentView == VIEW_TRANS_TODAY_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing transactions for today")); @@ -1242,6 +1243,9 @@ else if (m_currentView == VIEW_TRANS_LAST_90_DAYS_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing transactions for last 90 days")); else if (m_currentView == VIEW_TRANS_LAST_MONTH_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing transactions for last month")); else if (m_currentView == VIEW_TRANS_LAST_3MONTHS_STR) itemStaticTextMainFilter_->SetLabel(_("Viewing transactions for last 3 months")); + itemStaticBitmap31_->Enable(false); + statTextTransFilter_->Enable(false); + } } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-22 11:55:54
|
Revision: 2067 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2067&view=rev Author: vomikan Date: 2012-03-22 11:55:44 +0000 (Thu, 22 Mar 2012) Log Message: ----------- strings for translations changed Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-03-22 11:13:22 UTC (rev 2066) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-03-22 11:55:44 UTC (rev 2067) @@ -666,7 +666,7 @@ wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, ID_PANEL_CHECKING_STATIC_BALHEADER, wxT(""), wxDefaultPosition, wxSize(600,20), 0 ); - itemBoxSizerHHeader->Add(itemStaticText10, 0, wxALL | wxEXPAND , 5); + itemBoxSizerHHeader->Add(itemStaticText10, 0, wxRIGHT|wxEXPAND , 50); /* ---------------------- */ @@ -967,13 +967,14 @@ mmex::formatDoubleToCurrency(filteredBalance_, filteredBalanceStr); wxStaticText* header = (wxStaticText*)FindWindow(ID_PANEL_CHECKING_STATIC_BALHEADER); - wxString lbl = wxString::Format(_("Account Bal: %s Reconciled Bal: %s Diff: %s"), - balance.c_str(), recbalance.c_str(), diffbal.c_str()); - if (transFilterActive_ || (m_currentView != VIEW_TRANS_ALL_STR)) - { - wxString displayedBal = wxString::Format(_(" Displayed Bal: %s"), filteredBalanceStr.c_str()); - lbl << displayedBal; - } + bool show_displayed_balance_ = (transFilterActive_ || (m_currentView != VIEW_TRANS_ALL_STR)); + + wxString lbl = wxString() << _("Account Bal: ") << balance.c_str() << wxT(" ") + << _("Reconciled Bal: ") << recbalance.c_str() << wxT(" ") + << _("Diff: ") << diffbal.c_str() << wxT(" ") + << (show_displayed_balance_ ? _("Displayed Bal: ") : wxT("")) + << (show_displayed_balance_ ? filteredBalanceStr : wxT("")); + header->SetLabel(lbl); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |