From: <vo...@us...> - 2010-12-02 14:56:50
|
Revision: 1024 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1024&view=rev Author: vomikan Date: 2010-12-02 14:56:42 +0000 (Thu, 02 Dec 2010) Log Message: ----------- Colors changed Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2010-12-02 14:47:58 UTC (rev 1023) +++ trunk/mmex/src/filtertransdialog.cpp 2010-12-02 14:56:42 UTC (rev 1024) @@ -334,12 +334,12 @@ wxBoxSizer* itemBoxSizer29 = new wxBoxSizer(wxHORIZONTAL); itemPanel28->SetSizer(itemBoxSizer29); - wxButton* itemButton30 = new wxButton( itemPanel28, ID_BUTTONOK, _("OK"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton30 = new wxButton( itemPanel28, ID_BUTTONOK, _("OK")); + itemButton30->SetForegroundColour(wxColour(wxT("FOREST GREEN"))); itemBoxSizer29->Add(itemButton30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton31 = new wxButton( itemPanel28, ID_BUTTONCANCEL, _("Cancel"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton31 = new wxButton( itemPanel28, ID_BUTTONCANCEL, _("Cancel")); + itemButton31->SetForegroundColour(wxColour(wxT("RED"))); itemBoxSizer29->Add(itemButton31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end mmFilterTransactionsDialog content construction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-09-14 10:43:28
|
Revision: 1454 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1454&view=rev Author: stef145g Date: 2011-09-14 10:43:22 +0000 (Wed, 14 Sep 2011) Log Message: ----------- Update to Transaction Report Filter Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2011-09-13 17:29:35 UTC (rev 1453) +++ trunk/mmex/src/filtertransdialog.cpp 2011-09-14 10:43:22 UTC (rev 1454) @@ -193,10 +193,6 @@ itemPanel->SetSizer(itemPanelSizer); //--Start of Row -------------------------------------------------------- - itemPanelSizer->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemPanelSizer->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - //--End of Row -------------------------------------------------------- - accountCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXACCOUNT, _("Account: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); accountCheckBox->SetValue(FALSE); @@ -666,7 +662,7 @@ { wxString dtBegin = mmGetDateForDisplay(db_, fromDateCtrl->GetValue()); wxString dtEnd = mmGetDateForDisplay(db_, toDateControl->GetValue()); - dateStr << _("From ")<< dtBegin << _(" to ") << dtEnd; + dateStr << _("From ") << dtBegin << _(" to ") << dtEnd; } return dateStr; } @@ -675,7 +671,7 @@ { wxString payeeStr; if (payeeCheckBox->IsChecked()) - payeeStr = btnCategory->GetLabelText(); + payeeStr = btnPayee->GetLabelText(); return payeeStr; } @@ -691,28 +687,7 @@ { wxString statusStr; if (statusCheckBox->IsChecked()) - { - if (choiceStatus->GetSelection() == DEF_STATUS_NONE) - { - statusStr = _("None") ; - } - else if (choiceStatus->GetSelection() == DEF_STATUS_RECONCILED) - { - statusStr = _("Reconciled"); - } - else if (choiceStatus->GetSelection() == DEF_STATUS_VOID) - { - statusStr = _("Void"); - } - else if (choiceStatus->GetSelection() == DEF_STATUS_FOLLOWUP) - { - statusStr = _("Follow up"); - } - else if (choiceStatus->GetSelection() == DEF_STATUS_DUPLICATE) - { - statusStr = _("Duplicate"); - } - } + statusStr = choiceStatus->GetLabelText(); return statusStr; } @@ -720,17 +695,7 @@ { wxString transCode; if (categoryCheckBox->IsChecked()) - if (typeCheckBox->GetValue()) - { - int tCode = choiceType->GetSelection(); - if (tCode == DEF_WITHDRAWAL) - transCode = wxT("Withdrawal"); - else if (tCode == DEF_DEPOSIT) - transCode = wxT("Deposit"); - else if (tCode == DEF_TRANSFER) - transCode = wxT("Transfer"); - } - + transCode = choiceType->GetLabelText(); return transCode; } @@ -741,12 +706,11 @@ { wxString minamt = amountMinEdit->GetValue(); wxString maxamt = amountMaxEdit->GetValue(); - amountRangeStr << _("Min: ")<< minamt << _(" max: ") << maxamt; + amountRangeStr << _("Min: ") << minamt << _(" Max: ") << maxamt; } return amountRangeStr; } - wxString mmFilterTransactionsDialog::userTransNumberStr() { wxString numberStr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-09-29 05:03:22
|
Revision: 1466 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1466&view=rev Author: stef145g Date: 2011-09-29 05:03:16 +0000 (Thu, 29 Sep 2011) Log Message: ----------- Fix correct fields being accessed. Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2011-09-29 04:17:19 UTC (rev 1465) +++ trunk/mmex/src/filtertransdialog.cpp 2011-09-29 05:03:16 UTC (rev 1466) @@ -694,7 +694,7 @@ wxString mmFilterTransactionsDialog::userTypeStr() { wxString transCode; - if (categoryCheckBox->IsChecked()) + if (typeCheckBox->IsChecked()) transCode = choiceType->GetLabelText(); return transCode; } @@ -702,7 +702,7 @@ wxString mmFilterTransactionsDialog::userAmountRangeStr() { wxString amountRangeStr; - if (transNumberCheckBox->IsChecked()) + if (amountRangeCheckBox->IsChecked()) { wxString minamt = amountMinEdit->GetValue(); wxString maxamt = amountMaxEdit->GetValue(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-06 14:30:44
|
Revision: 1756 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1756&view=rev Author: vomikan Date: 2012-02-06 14:30:33 +0000 (Mon, 06 Feb 2012) Log Message: ----------- validators added Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-02-06 14:24:15 UTC (rev 1755) +++ trunk/mmex/src/filtertransdialog.cpp 2012-02-06 14:30:33 UTC (rev 1756) @@ -238,8 +238,8 @@ amountRangeCheckBox->SetValue(FALSE); itemPanelSizer->Add(amountRangeCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - amountMinEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL13, _T(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), 0 ); - amountMaxEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL14, _T(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), 0 ); + amountMinEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL13, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); + amountMaxEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL14, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); wxBoxSizer* amountSizer = new wxBoxSizer(wxHORIZONTAL); amountSizer->Add(amountMinEdit, 0, wxALIGN_LEFT|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-18 13:20:47
|
Revision: 1829 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1829&view=rev Author: guanlisheng Date: 2012-02-18 13:20:41 +0000 (Sat, 18 Feb 2012) Log Message: ----------- fix bug Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-02-18 13:15:00 UTC (rev 1828) +++ trunk/mmex/src/filtertransdialog.cpp 2012-02-18 13:20:41 UTC (rev 1829) @@ -74,7 +74,7 @@ const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -: trans_(trans), core_(core), db_(core_->db_.get()) +: trans_(trans), core_(core), db_(core->db_.get()) , categID_(-1), subcategID_(-1), payeeID_(-1), refAccountID_(-1) { Create(parent, id, caption, pos, size, style); 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:55:03
|
Revision: 1874 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1874&view=rev Author: vomikan Date: 2012-02-25 07:54:57 +0000 (Sat, 25 Feb 2012) Log Message: ----------- comma removed in filter field if not needed Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-02-25 07:53:33 UTC (rev 1873) +++ trunk/mmex/src/filtertransdialog.cpp 2012-02-25 07:54:57 UTC (rev 1874) @@ -642,15 +642,15 @@ wxString mmFilterTransactionsDialog::userTypeStr() { - wxString transCode; + wxString transCode = wxEmptyString; if (typeCheckBox->IsChecked()) { if (cbTypeWithdrawal_->GetValue()) transCode = TRANS_TYPE_WITHDRAWAL_STR; if (cbTypeDeposit_->GetValue()) - transCode << wxT(", ") << TRANS_TYPE_DEPOSIT_STR; + transCode << (transCode.IsEmpty() ? wxT("") : wxT(", ")) << TRANS_TYPE_DEPOSIT_STR; if (cbTypeTransfer_->GetValue()) - transCode << wxT(", ") << TRANS_TYPE_TRANSFER_STR; + transCode << (transCode.IsEmpty() ? wxT("") : wxT(", ")) << TRANS_TYPE_TRANSFER_STR; } return transCode; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-24 14:42:34
|
Revision: 2396 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2396&view=rev Author: vomikan Date: 2012-05-24 14:42:23 +0000 (Thu, 24 May 2012) Log Message: ----------- fix for wxFlexGridSizer Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-05-24 14:38:16 UTC (rev 2395) +++ trunk/mmex/src/filtertransdialog.cpp 2012-05-24 14:42:23 UTC (rev 2396) @@ -139,7 +139,7 @@ wxPanel* itemPanel = new wxPanel( this, ID_PANEL11, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemStaticBoxSizer4->Add(itemPanel, 1, wxGROW|wxALL, 5); - wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(2, 2, 0, 0); + wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(9, 2, 0, 0); itemPanel->SetSizer(itemPanelSizer); //--Start of Row -------------------------------------------------------- @@ -280,10 +280,10 @@ wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); - wxButton* itemButton30 = new wxButton( buttonPanel, wxID_OK, _("&OK")); + wxButton* itemButton30 = new wxButton( buttonPanel, wxID_OK); buttonPanelSizer->Add(itemButton30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButtonCancel = new wxButton( buttonPanel, wxID_CANCEL, _("&Cancel")); + wxButton* itemButtonCancel = new wxButton( buttonPanel, wxID_CANCEL); buttonPanelSizer->Add(itemButtonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButtonCancel->SetFocus(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-13 17:25:34
|
Revision: 2592 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2592&view=rev Author: vomikan Date: 2012-06-13 17:25:25 +0000 (Wed, 13 Jun 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-06-13 16:38:01 UTC (rev 2591) +++ trunk/mmex/src/filtertransdialog.cpp 2012-06-13 17:25:25 UTC (rev 2592) @@ -121,15 +121,18 @@ { int fieldWidth = 210; + wxSizerFlags flags; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxTOP|wxLEFT, 0); + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); this->SetSizer(itemBoxSizer2); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer2->Add(itemBoxSizer3, flags); wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(this, wxID_ANY, _(" Specify ")); wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL); - itemBoxSizer3->Add(itemStaticBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer3->Add(itemStaticBoxSizer4, flags); this->SetSizer(itemBoxSizer2); @@ -139,25 +142,26 @@ wxPanel* itemPanel = new wxPanel( this, ID_PANEL11, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemStaticBoxSizer4->Add(itemPanel, 1, wxGROW|wxALL, 5); - wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(9, 2, 0, 0); + wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(0, 2, 10, 10); itemPanel->SetSizer(itemPanelSizer); //--Start of Row -------------------------------------------------------- accountCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXACCOUNT, _("Account: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); accountCheckBox->SetValue(FALSE); - itemPanelSizer->Add(accountCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(accountCheckBox, flags); wxArrayString as = core_->getAccountsName(); - accountDropDown = new wxChoice( itemPanel, ID_CHOICE4, wxDefaultPosition, wxSize(fieldWidth,-1), as, 0 ); - itemPanelSizer->Add(accountDropDown, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + accountDropDown = new wxChoice(itemPanel, ID_CHOICE4, wxDefaultPosition, wxSize(fieldWidth,-1), as, 0 ); + accountDropDown->SetSelection(0); + itemPanelSizer->Add(accountDropDown, flags); //--End of Row -------------------------------------------------------- dateRangeCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXDATERANGE, _("Date Range: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); dateRangeCheckBox->SetValue(FALSE); - itemPanelSizer->Add(dateRangeCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(dateRangeCheckBox, flags); fromDateCtrl = new wxDatePickerCtrl( itemPanel, ID_CHOICE5, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN); @@ -165,35 +169,36 @@ wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN); wxBoxSizer* dateSizer = new wxBoxSizer(wxHORIZONTAL); - dateSizer->Add(fromDateCtrl, 0, wxALIGN_LEFT|wxALL, 5); - dateSizer->Add(toDateControl, 0, wxALIGN_LEFT|wxALL, 5); - itemPanelSizer->Add(dateSizer, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0); + dateSizer->Add(fromDateCtrl, flags); + dateSizer->AddSpacer(10); + dateSizer->Add(toDateControl, flags); + itemPanelSizer->Add(dateSizer, flags); //--End of Row -------------------------------------------------------- payeeCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXPAYEE, _("Payee: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); payeeCheckBox->SetValue(FALSE); - itemPanelSizer->Add(payeeCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(payeeCheckBox, flags); btnPayee = new wxButton( itemPanel, ID_BUTTONPAYEE, _("Select Payee"), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); - itemPanelSizer->Add(btnPayee, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(btnPayee, flags); //--End of Row -------------------------------------------------------- categoryCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXCATEGORY, _("Category: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); categoryCheckBox->SetValue(FALSE); - itemPanelSizer->Add(categoryCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(categoryCheckBox, flags); btnCategory = new wxButton( itemPanel, ID_BUTTONCATEGORY, _("Select Category"), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); - itemPanelSizer->Add(btnCategory, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(btnCategory, flags); //--End of Row -------------------------------------------------------- statusCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXSTATUS, _("Status: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); statusCheckBox->SetValue(FALSE); - itemPanelSizer->Add(statusCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(statusCheckBox, flags); wxString transaction_status[] = { @@ -208,7 +213,7 @@ for(size_t i = 0; i < sizeof(transaction_status)/sizeof(wxString); ++i) choiceStatus->Append(wxGetTranslation(transaction_status[i]), new wxStringClientData(transaction_status[i])); - itemPanelSizer->Add(choiceStatus, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(choiceStatus, flags); choiceStatus->SetSelection(0); choiceStatus->SetToolTip(_("Specify the status for the transaction")); //--End of Row -------------------------------------------------------- @@ -235,45 +240,50 @@ cbTypeTransfer_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_TRANSFER, _("Transfer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); cbTypeTransfer_->Enable(false); - itemPanelSizer->Add(typeCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemPanelSizer->Add(typeSizer, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - typeSizer ->Add(choiceType, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - typeSizer ->Add(cbTypeWithdrawal_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); - typeSizer ->Add(cbTypeDeposit_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); - typeSizer ->Add(cbTypeTransfer_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemPanelSizer->Add(typeCheckBox, flags); + itemPanelSizer->Add(typeSizer, flags); + typeSizer ->Add(choiceType, flags); + typeSizer ->Add(cbTypeWithdrawal_, flags); + typeSizer ->Add(cbTypeDeposit_, flags); + typeSizer ->Add(cbTypeTransfer_, flags); //--End of Row -------------------------------------------------------- - amountRangeCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXAMOUNTRANGE, _("Amount Range: "), - wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + amountRangeCheckBox = new wxCheckBox(itemPanel, ID_CHECKBOXAMOUNTRANGE, _("Amount Range: "), + wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); amountRangeCheckBox->SetValue(FALSE); - itemPanelSizer->Add(amountRangeCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(amountRangeCheckBox, flags); - amountMinEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL13, (""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , wxFloatingPointValidator<float>(2) ); - amountMaxEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL14, (""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , wxFloatingPointValidator<float>(2) ); + amountMinEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL13, (""), + wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER, + wxFloatingPointValidator<float>(2)); + amountMaxEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL14, (""), + wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER, + wxFloatingPointValidator<float>(2) ); wxBoxSizer* amountSizer = new wxBoxSizer(wxHORIZONTAL); - amountSizer->Add(amountMinEdit, 0, wxALIGN_LEFT|wxALL, 5); - amountSizer->Add(amountMaxEdit, 0, wxALIGN_LEFT|wxALL, 5); - itemPanelSizer->Add(amountSizer, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0); + amountSizer->Add(amountMinEdit, flags); + amountSizer->AddSpacer(10); + amountSizer->Add(amountMaxEdit, flags); + itemPanelSizer->Add(amountSizer, flags); //--End of Row -------------------------------------------------------- transNumberCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXTRANSNUM, _("Number: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); transNumberCheckBox->SetValue(FALSE); - itemPanelSizer->Add(transNumberCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(transNumberCheckBox, flags); - transNumberEdit = new wxTextCtrl( itemPanel, ID_TEXTTRANSNUM, _T(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); - itemPanelSizer->Add(transNumberEdit, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + transNumberEdit = new wxTextCtrl( itemPanel, ID_TEXTTRANSNUM, "", wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); + itemPanelSizer->Add(transNumberEdit, flags); //--End of Row -------------------------------------------------------- notesCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXNOTES, _("Notes: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); notesCheckBox->SetValue(FALSE); - itemPanelSizer->Add(notesCheckBox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemPanelSizer->Add(notesCheckBox, flags); - notesEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL15, _T(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); - itemPanelSizer->Add(notesEdit, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + notesEdit = new wxTextCtrl( itemPanel, ID_TEXTCTRL15, "", wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); + itemPanelSizer->Add(notesEdit, flags); //--End of Row -------------------------------------------------------- /****************************************************************************** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-20 12:48:19
|
Revision: 2643 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2643&view=rev Author: vomikan Date: 2012-06-20 12:48:08 +0000 (Wed, 20 Jun 2012) Log Message: ----------- Maches for notes Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-06-20 12:35:17 UTC (rev 2642) +++ trunk/mmex/src/filtertransdialog.cpp 2012-06-20 12:48:08 UTC (rev 2643) @@ -122,7 +122,7 @@ int fieldWidth = 210; wxSizerFlags flags; - flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxTOP|wxLEFT, 0); + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5); wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); this->SetSizer(itemBoxSizer2); @@ -149,7 +149,7 @@ accountCheckBox = new wxCheckBox( itemPanel, ID_CHECKBOXACCOUNT, _("Account: "), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); accountCheckBox->SetValue(FALSE); - itemPanelSizer->Add(accountCheckBox, flags); + itemPanelSizer->Add(accountCheckBox, flags.Border(wxALL, 0)); wxArrayString as = core_->getAccountsName(); @@ -233,11 +233,14 @@ choiceType->SetToolTip(_("Specify the type of transaction.")); wxBoxSizer* typeSizer = new wxBoxSizer(wxVERTICAL); - cbTypeWithdrawal_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_WITHDRAWAL, _("Withdrawal"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + cbTypeWithdrawal_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_WITHDRAWAL, + _("Withdrawal"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); cbTypeWithdrawal_->Enable(false); - cbTypeDeposit_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_DEPOSIT, _("Deposit"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + cbTypeDeposit_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_DEPOSIT, + _("Deposit"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); cbTypeDeposit_->Enable(false); - cbTypeTransfer_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_TRANSFER, _("Transfer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + cbTypeTransfer_ = new wxCheckBox( itemPanel, ID_DIALOG_TRANSFILTER_CB_TYPE_TRANSFER, + _("Transfer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); cbTypeTransfer_->Enable(false); itemPanelSizer->Add(typeCheckBox, flags); @@ -290,16 +293,16 @@ Button Panel with OK/Cancel buttons *******************************************************************************/ wxPanel* buttonPanel = new wxPanel( this, ID_PANEL12, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - itemBoxSizer3->Add(buttonPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer3->Add(buttonPanel, flags.Center().Border(wxALL, 5)); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); wxButton* itemButton30 = new wxButton( buttonPanel, wxID_OK); - buttonPanelSizer->Add(itemButton30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + buttonPanelSizer->Add(itemButton30, flags); wxButton* itemButtonCancel = new wxButton( buttonPanel, wxID_CANCEL); - buttonPanelSizer->Add(itemButtonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + buttonPanelSizer->Add(itemButtonCancel, flags); itemButtonCancel->SetFocus(); // disable all controls at startup @@ -511,7 +514,7 @@ { wxString notes = notesEdit->GetValue().Trim().Lower(); wxString orig = pBankTransaction->notes_.Lower(); - if (!orig.Contains(notes)) + if (!orig.Matches(notes+"*")) continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-10-16 18:38:26
|
Revision: 3061 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3061&view=rev Author: vomikan Date: 2012-10-16 18:38:20 +0000 (Tue, 16 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-10-16 18:32:43 UTC (rev 3060) +++ trunk/mmex/src/filtertransdialog.cpp 2012-10-16 18:38:20 UTC (rev 3061) @@ -245,16 +245,20 @@ typeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Type"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - wxBoxSizer* typeSizer = new wxBoxSizer(wxVERTICAL); - cbTypeWithdrawal_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Withdrawal"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - cbTypeDeposit_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Deposit"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - cbTypeTransfer_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Transfer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + wxFlexGridSizer* typeSizer = new wxFlexGridSizer(0, 2, 0, 0); + cbTypeWithdrawal_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Withdrawal"), + wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + cbTypeDeposit_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Deposit"), + wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + cbTypeTransfer_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Transfer"), + wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(typeCheckBox_, flags); itemPanelSizer->Add(typeSizer, flags); typeSizer ->Add(cbTypeWithdrawal_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); typeSizer ->Add(cbTypeDeposit_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); typeSizer ->Add(cbTypeTransfer_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 2); + typeSizer ->AddSpacer(2); //--End of Row -------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-17 22:52:51
|
Revision: 3142 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3142&view=rev Author: vomikan Date: 2012-11-17 22:52:45 +0000 (Sat, 17 Nov 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-11-17 21:48:29 UTC (rev 3141) +++ trunk/mmex/src/filtertransdialog.cpp 2012-11-17 22:52:45 UTC (rev 3142) @@ -431,14 +431,14 @@ { return getAccountCheckBox() - && getDateRangeCheckBox() - && getPayeeCheckBox() - && getCategoryCheckBox() - && getStatusCheckBox() - && getTypeCheckBox() - && getAmountRangeCheckBox() - && getNumberCheckBox() - && getNotesCheckBox(); + || getDateRangeCheckBox() + || getPayeeCheckBox() + || getCategoryCheckBox() + || getStatusCheckBox() + || getTypeCheckBox() + || getAmountRangeCheckBox() + || getNumberCheckBox() + || getNotesCheckBox(); } wxString mmFilterTransactionsDialog::getAccountName() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-15 11:59:50
|
Revision: 3208 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3208&view=rev Author: vomikan Date: 2012-12-15 11:59:43 +0000 (Sat, 15 Dec 2012) Log Message: ----------- fix for wx-2.9 Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-12-15 11:21:12 UTC (rev 3207) +++ trunk/mmex/src/filtertransdialog.cpp 2012-12-15 11:59:43 UTC (rev 3208) @@ -669,7 +669,7 @@ } #if wxCHECK_VERSION(2,9,0) - cbSourcePayee_->AutoComplete(data); + cbPayeeInFocus->AutoComplete(data); #endif if (cbPayeeInFocus->GetCount() == 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-16 21:13:03
|
Revision: 3216 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3216&view=rev Author: vomikan Date: 2012-12-16 21:12:57 +0000 (Sun, 16 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-12-16 15:58:57 UTC (rev 3215) +++ trunk/mmex/src/filtertransdialog.cpp 2012-12-16 21:12:57 UTC (rev 3216) @@ -158,7 +158,7 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); itemBoxSizer2->Add(itemBoxSizer3, flags); - wxStaticBox* static_box_sizer = new wxStaticBox(this, wxID_STATIC, _(" Specify ")); + wxStaticBox* static_box_sizer = new wxStaticBox(this, wxID_ANY, _(" Specify ")); wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(static_box_sizer, wxVERTICAL); itemBoxSizer3->Add(itemStaticBoxSizer4, flags); @@ -167,7 +167,7 @@ /****************************************************************************** Items Panel *******************************************************************************/ - wxPanel* itemPanel = new wxPanel( this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* itemPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemStaticBoxSizer4->Add(itemPanel, 1, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); @@ -176,24 +176,24 @@ itemBoxSizer4->Add(itemPanelSizer); //--Start of Row -------------------------------------------------------- - accountCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Account"), + accountCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Account"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(accountCheckBox_, flags); wxArrayString as = core_->accountList_.getAccountsName(); - accountDropDown_ = new wxChoice( itemPanel, wxID_STATIC, wxDefaultPosition, wxSize(fieldWidth,-1), as, 0 ); + accountDropDown_ = new wxChoice( itemPanel, wxID_ANY, wxDefaultPosition, wxSize(fieldWidth,-1), as, 0 ); itemPanelSizer->Add(accountDropDown_, flags); //--End of Row -------------------------------------------------------- - dateRangeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Date Range"), + dateRangeCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Date Range"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(dateRangeCheckBox_, flags); - fromDateCtrl_ = new wxDatePickerCtrl( itemPanel, wxID_STATIC, wxDefaultDateTime, + fromDateCtrl_ = new wxDatePickerCtrl( itemPanel, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxDP_DROPDOWN); - toDateControl_ = new wxDatePickerCtrl( itemPanel, wxID_STATIC, wxDefaultDateTime, + toDateControl_ = new wxDatePickerCtrl( itemPanel, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxDP_DROPDOWN); false; @@ -203,7 +203,7 @@ itemPanelSizer->Add(dateSizer, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0); //--End of Row -------------------------------------------------------- - payeeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Payee"), + payeeCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Payee"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(payeeCheckBox_, flags); @@ -220,25 +220,25 @@ itemPanelSizer->Add(cbPayee_, flags); //--End of Row -------------------------------------------------------- - categoryCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Category"), + categoryCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); //categoryCheckBox_->SetValue(false); itemPanelSizer->Add(categoryCheckBox_, flags); - btnCategory_ = new wxButton( itemPanel, wxID_STATIC, wxT(""), + btnCategory_ = new wxButton( itemPanel, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(fieldWidth,-1)); - btnCategory_->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED, + btnCategory_->Connect(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmFilterTransactionsDialog::OnCategs), NULL, this); itemPanelSizer->Add(btnCategory_, flags); //--End of Row -------------------------------------------------------- - statusCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Status"), + statusCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Status"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); statusCheckBox_->SetValue(false); itemPanelSizer->Add(statusCheckBox_, flags); - choiceStatus_ = new wxChoice(itemPanel, wxID_STATIC); + choiceStatus_ = new wxChoice(itemPanel, wxID_ANY); for(size_t i = 0; i < sizeof(TRANSACTION_STATUS)/sizeof(wxString); ++i) choiceStatus_->Append(wxGetTranslation(TRANSACTION_STATUS[i]), @@ -248,15 +248,15 @@ choiceStatus_->SetToolTip(_("Specify the status for the transaction")); //--End of Row -------------------------------------------------------- - typeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Type"), + typeCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); wxFlexGridSizer* typeSizer = new wxFlexGridSizer(0, 2, 0, 0); - cbTypeWithdrawal_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Withdrawal"), + cbTypeWithdrawal_ = new wxCheckBox( itemPanel, wxID_ANY, _("Withdrawal"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - cbTypeDeposit_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Deposit"), + cbTypeDeposit_ = new wxCheckBox( itemPanel, wxID_ANY, _("Deposit"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - cbTypeTransfer_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Transfer"), + cbTypeTransfer_ = new wxCheckBox( itemPanel, wxID_ANY, _("Transfer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(typeCheckBox_, flags); @@ -268,12 +268,12 @@ //--End of Row -------------------------------------------------------- - amountRangeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Amount Range"), + amountRangeCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Amount Range"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(amountRangeCheckBox_, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - amountMinEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); - amountMaxEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); + amountMinEdit_ = new wxTextCtrl( itemPanel, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); + amountMaxEdit_ = new wxTextCtrl( itemPanel, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(fieldWidth/2-5,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); wxBoxSizer* amountSizer = new wxBoxSizer(wxHORIZONTAL); amountSizer->Add(amountMinEdit_, flags); @@ -281,19 +281,19 @@ itemPanelSizer->Add(amountSizer, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0); //--End of Row -------------------------------------------------------- - transNumberCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Number"), + transNumberCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Number"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(transNumberCheckBox_, flags); - transNumberEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, _T(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); + transNumberEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, wxT(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); itemPanelSizer->Add(transNumberEdit_, flags); //--End of Row -------------------------------------------------------- - notesCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Notes"), + notesCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Notes"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(notesCheckBox_, flags); - notesEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, _T(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); + notesEdit_ = new wxTextCtrl( itemPanel, wxID_ANY, _T(""), wxDefaultPosition, wxSize(fieldWidth,-1), 0 ); itemPanelSizer->Add(notesEdit_, flags); //--End of Row -------------------------------------------------------- @@ -316,7 +316,7 @@ /****************************************************************************** Button Panel with OK/Cancel buttons *******************************************************************************/ - wxPanel* buttonPanel = new wxPanel( this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* buttonPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer3->Add(buttonPanel, flags); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); @@ -328,11 +328,11 @@ itemButtonCancel->SetFocus(); wxBitmapButton* save_button = new wxBitmapButton( buttonPanel, - wxID_SAVE, wxNullBitmap, wxDefaultPosition, + wxID_SAVE, wxBitmap(save_xpm), wxDefaultPosition, wxSize(itemButtonOK->GetSize().GetHeight(), itemButtonOK->GetSize().GetHeight())); - //TODO: Under constraction + save_button->Show(true); - save_button->SetBitmapLabel(save_xpm); + buttonPanelSizer->Add(save_button, flags); buttonPanelSizer->Add(itemButtonOK, flags); buttonPanelSizer->Add(itemButtonCancel, flags); @@ -348,39 +348,41 @@ return TRUE; } -void mmFilterTransactionsDialog::OnCheckboxClick( wxCommandEvent& /*event*/ ) +void mmFilterTransactionsDialog::OnCheckboxClick( wxCommandEvent& event ) { - btnCategory_->Enable(categoryCheckBox_->GetValue()); - accountDropDown_->Enable(accountCheckBox_->GetValue()); - fromDateCtrl_->Enable(dateRangeCheckBox_->GetValue()); - toDateControl_->Enable(dateRangeCheckBox_->GetValue()); - cbPayee_->Enable(payeeCheckBox_->GetValue()); - btnCategory_->Enable(categoryCheckBox_->GetValue()); - choiceStatus_->Enable(statusCheckBox_->GetValue()); - cbTypeWithdrawal_->Enable(typeCheckBox_->GetValue()); - cbTypeDeposit_->Enable(typeCheckBox_->GetValue()); - cbTypeTransfer_->Enable(typeCheckBox_->GetValue()); - amountMinEdit_->Enable(amountRangeCheckBox_->GetValue()); - amountMaxEdit_->Enable(amountRangeCheckBox_->GetValue()); - notesEdit_->Enable(notesCheckBox_->GetValue()); - transNumberEdit_->Enable(transNumberCheckBox_->GetValue()); - accountDropDown_->Enable(accountCheckBox_->GetValue()); + btnCategory_->Enable(categoryCheckBox_->IsChecked()); + accountDropDown_->Enable(accountCheckBox_->IsChecked()); + fromDateCtrl_->Enable(dateRangeCheckBox_->IsChecked()); + toDateControl_->Enable(dateRangeCheckBox_->IsChecked()); + cbPayee_->Enable(payeeCheckBox_->IsChecked()); + btnCategory_->Enable(categoryCheckBox_->IsChecked()); + choiceStatus_->Enable(statusCheckBox_->IsChecked()); + cbTypeWithdrawal_->Enable(typeCheckBox_->IsChecked()); + cbTypeDeposit_->Enable(typeCheckBox_->IsChecked()); + cbTypeTransfer_->Enable(typeCheckBox_->IsChecked()); + amountMinEdit_->Enable(amountRangeCheckBox_->IsChecked()); + amountMaxEdit_->Enable(amountRangeCheckBox_->IsChecked()); + notesEdit_->Enable(notesCheckBox_->IsChecked()); + transNumberEdit_->Enable(transNumberCheckBox_->IsChecked()); + accountDropDown_->Enable(accountCheckBox_->IsChecked()); + + event.Skip(); } void mmFilterTransactionsDialog::OnButtonokClick( wxCommandEvent& /*event*/ ) { - if (accountCheckBox_->GetValue()) + if (accountCheckBox_->IsChecked()) { refAccountStr_ = accountDropDown_->GetStringSelection(); refAccountID_ = core_->accountList_.GetAccountId(refAccountStr_); } - if (payeeCheckBox_->GetValue()) + if (payeeCheckBox_->IsChecked()) { payeeID_ = core_->payeeList_.GetPayeeId(cbPayee_->GetValue()); } - if (amountRangeCheckBox_->GetValue()) + if (amountRangeCheckBox_->IsChecked()) { wxString minamt = amountMinEdit_->GetValue(); wxString maxamt = amountMaxEdit_->GetValue(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-17 20:27:48
|
Revision: 3221 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3221&view=rev Author: vomikan Date: 2012-12-17 20:27:40 +0000 (Mon, 17 Dec 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-12-17 16:47:07 UTC (rev 3220) +++ trunk/mmex/src/filtertransdialog.cpp 2012-12-17 20:27:40 UTC (rev 3221) @@ -365,7 +365,7 @@ notesEdit_->Enable(notesCheckBox_->IsChecked()); transNumberEdit_->Enable(transNumberCheckBox_->IsChecked()); accountDropDown_->Enable(accountCheckBox_->IsChecked()); - + event.Skip(); } @@ -651,34 +651,32 @@ void mmFilterTransactionsDialog::OnPayeeUpdated(wxCommandEvent& event) { - wxComboBox* cbPayeeInFocus = (wxComboBox*)FindFocus(); + wxString value = cbPayee_->GetValue(); - wxString value = cbPayeeInFocus->GetValue(); - if (value == prev_value_) return; //Line above to fix infinite loop for wx-2.9 GTK //Line below seems does not working in wx-2.9 GTK - cbPayeeInFocus -> SetEvtHandlerEnabled(false); + cbPayee_ -> SetEvtHandlerEnabled(false); prev_value_ = value; - cbPayeeInFocus -> Clear(); + cbPayee_ -> Clear(); wxArrayString data; data = core_->payeeList_.FilterPayees(wxT("")); for (size_t i = 0; i < data.Count(); ++i) { if (data[i].Lower().Matches(value.Lower().Append(wxT("*")))) - cbPayeeInFocus ->Append(data[i]); + cbPayee_ ->Append(data[i]); } #if wxCHECK_VERSION(2,9,0) - cbPayeeInFocus->AutoComplete(data); + cbPayee_->AutoComplete(data); #endif - if (cbPayeeInFocus->GetCount() == 1) - cbPayeeInFocus->SetSelection(0); + if (cbPayee_->GetCount() == 1) + cbPayee_->SetSelection(0); else - cbPayeeInFocus->SetValue(value); - cbPayeeInFocus->SetInsertionPoint(value.Length()); - cbPayeeInFocus -> SetEvtHandlerEnabled(true); + cbPayee_->SetValue(value); + cbPayee_->SetInsertionPoint(value.Length()+1); + cbPayee_ -> SetEvtHandlerEnabled(true); event.Skip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-12 19:42:13
|
Revision: 3348 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3348&view=rev Author: vomikan Date: 2013-01-12 19:42:01 +0000 (Sat, 12 Jan 2013) Log Message: ----------- UI aligment Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2013-01-12 19:22:57 UTC (rev 3347) +++ trunk/mmex/src/filtertransdialog.cpp 2013-01-12 19:42:01 UTC (rev 3348) @@ -149,8 +149,8 @@ void mmFilterTransactionsDialog::CreateControls() { wxSizerFlags flags, flagsExpand; - flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5); - flagsExpand.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND).Border(wxALL, 5).Proportion(1); + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 0); + flagsExpand.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND).Border(wxALL, 0).Proportion(1); wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); @@ -159,7 +159,7 @@ wxStaticBox* static_box_sizer = new wxStaticBox(this, wxID_ANY, _(" Specify ")); wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(static_box_sizer, wxVERTICAL); - itemBoxSizer3->Add(itemStaticBoxSizer4, flagsExpand); + itemBoxSizer3->Add(itemStaticBoxSizer4, 1, wxGROW|wxALL, 10); this->SetSizer(itemBoxSizer2); @@ -170,7 +170,7 @@ itemStaticBoxSizer4->Add(itemPanel, 1, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); - wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(0, 2, 0, 0); + wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(0, 2, 10, 5); itemPanelSizer->AddGrowableCol(1, 1); itemPanel->SetSizer(itemBoxSizer4); @@ -286,7 +286,7 @@ //--End of Row -------------------------------------------------------- transNumberCheckBox_ = new wxCheckBox( itemPanel, wxID_ANY, _("Number"), - wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemPanelSizer->Add(transNumberCheckBox_, flags); transNumberEdit_ = new wxTextCtrl( itemPanel, wxID_STATIC, wxT("")); @@ -321,7 +321,7 @@ Button Panel with OK/Cancel buttons *******************************************************************************/ wxPanel* buttonPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - itemBoxSizer3->Add(buttonPanel, flags); + itemBoxSizer3->Add(buttonPanel, flags.Border(wxALL, 5)); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); @@ -337,7 +337,7 @@ save_button->Show(true); - buttonPanelSizer->Add(save_button, flags); + buttonPanelSizer->Add(save_button, flags.Border(wxALL, 5)); buttonPanelSizer->Add(itemButtonOK, flags); buttonPanelSizer->Add(itemButtonCancel, flags); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-30 07:12:20
|
Revision: 3413 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3413&view=rev Author: vomikan Date: 2013-01-30 07:12:13 +0000 (Wed, 30 Jan 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2013-01-29 20:52:23 UTC (rev 3412) +++ trunk/mmex/src/filtertransdialog.cpp 2013-01-30 07:12:13 UTC (rev 3413) @@ -343,7 +343,6 @@ buttonPanelSizer->Add(save_button, flags.Border(wxALL, 5)); buttonPanelSizer->Add(itemButtonOK, flags); buttonPanelSizer->Add(itemButtonCancel, flags); - } /*! @@ -419,6 +418,15 @@ void mmFilterTransactionsDialog::OnButtoncancelClick( wxCommandEvent& /*event*/ ) { + wxWindow *w = FindFocus(); + if (w && w->GetId() == ID_DIALOG_TRANS_PAYEECOMBO && !(cbPayee_->GetValue()).IsEmpty()) + { + cbPayee_->SetValue(wxT("")); + prev_value_ = wxT("*"); + wxCommandEvent evt(wxEVT_COMMAND_TEXT_UPDATED, ID_DIALOG_TRANS_PAYEECOMBO); + OnPayeeUpdated(evt); + return; + } EndModal(wxID_CANCEL); } @@ -659,20 +667,21 @@ void mmFilterTransactionsDialog::OnPayeeUpdated(wxCommandEvent& event) { - wxString value = cbPayee_->GetValue(); + wxString value = cbPayee_->GetValue().Lower(); - if (value == prev_value_) return; + if (value == prev_value_.Lower()) return; //Line above to fix infinite loop for wx-2.9 GTK //Line below seems does not working in wx-2.9 GTK - cbPayee_ -> SetEvtHandlerEnabled(false); + cbPayee_->SetEvtHandlerEnabled(false); + prev_value_ = value; - cbPayee_ -> Clear(); + cbPayee_->Clear(); wxArrayString data; data = core_->payeeList_.FilterPayees(wxT("")); for (size_t i = 0; i < data.Count(); ++i) { - if (data[i].Lower().Matches(value.Lower().Append(wxT("*")))) + if (data[i].Lower().Matches(wxString(value).Append(wxT("*")))) cbPayee_ ->Append(data[i]); } @@ -681,14 +690,11 @@ #endif if (cbPayee_->GetCount() == 1) - { cbPayee_->SetSelection(0); - value = cbPayee_->GetStringSelection(); - } else cbPayee_->SetValue(value); - cbPayee_->SetInsertionPoint(value.Length()); - cbPayee_ -> SetEvtHandlerEnabled(true); + cbPayee_->SetInsertionPointEnd(); + cbPayee_->SetEvtHandlerEnabled(true); event.Skip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-02-14 12:18:45
|
Revision: 3480 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3480&view=rev Author: vomikan Date: 2013-02-14 12:18:36 +0000 (Thu, 14 Feb 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2013-02-14 06:03:12 UTC (rev 3479) +++ trunk/mmex/src/filtertransdialog.cpp 2013-02-14 12:18:36 UTC (rev 3480) @@ -23,15 +23,6 @@ #include "payeedialog.h" #include "paths.h" -#include <algorithm> -#include <vector> - -bool sortTransactionsByDate1( boost::shared_ptr<mmBankTransaction> elem1, - boost::shared_ptr<mmBankTransaction> elem2 ) -{ - return elem1->date_ < elem2->date_; -} - IMPLEMENT_DYNAMIC_CLASS( mmFilterTransactionsDialog, wxDialog ) BEGIN_EVENT_TABLE( mmFilterTransactionsDialog, wxDialog ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-10 18:14:16
|
Revision: 3561 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3561&view=rev Author: vomikan Date: 2013-03-10 18:14:09 +0000 (Sun, 10 Mar 2013) Log Message: ----------- gramma fix Modified Paths: -------------- trunk/mmex/src/filtertransdialog.cpp Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2013-03-10 18:13:24 UTC (rev 3560) +++ trunk/mmex/src/filtertransdialog.cpp 2013-03-10 18:14:09 UTC (rev 3561) @@ -473,7 +473,7 @@ { wxString dtBegin = mmGetDateForDisplay(fromDateCtrl_->GetValue()); wxString dtEnd = mmGetDateForDisplay(toDateControl_->GetValue()); - dateStr << wxString::Format(_("From %s to %s"), dtBegin.c_str(), dtEnd.c_str()); + dateStr << wxString::Format(_("From %s till %s"), dtBegin.c_str(), dtEnd.c_str()); } return dateStr; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |