From: <vo...@us...> - 2011-03-02 09:23:57
|
Revision: 1171 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1171&view=rev Author: vomikan Date: 2011-03-02 09:23:51 +0000 (Wed, 02 Mar 2011) Log Message: ----------- gettext for spaces removed Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-03-02 09:05:44 UTC (rev 1170) +++ trunk/mmex/src/categdialog.cpp 2011-03-02 09:23:51 UTC (rev 1171) @@ -181,7 +181,7 @@ if (text == wxT("")) { wxString errMsg = _("Category cannot be empty"); - errMsg << _(" "); // added to adjust dialog size + errMsg << wxT(" "); // added to adjust dialog size wxMessageBox(errMsg, _("Organise Categories: Adding Error"),wxOK|wxICON_ERROR); // mmShowErrorMessage(this, _("Category cannot be empty"), _("Error")); return; @@ -392,7 +392,7 @@ if (!core_->categoryList_.updateCategory(categID, subcategID, text)) { wxString errMsg = _("Update Failed"); - errMsg << _(" "); // added to adjust dialog size + errMsg << wxT(" "); // added to adjust dialog size wxMessageBox(errMsg, _("Organise Categories"),wxOK|wxICON_ERROR); // mmShowErrorMessage(this, _("Update Failed"), _("Error")); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-03-02 09:50:20
|
Revision: 1172 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1172&view=rev Author: vomikan Date: 2011-03-02 09:50:14 +0000 (Wed, 02 Mar 2011) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-03-02 09:23:51 UTC (rev 1171) +++ trunk/mmex/src/categdialog.cpp 2011-03-02 09:50:14 UTC (rev 1172) @@ -76,6 +76,7 @@ { root_ = treeCtrl_->AddRoot(_("Categories")); treeCtrl_->SetItemBold(root_, true); + treeCtrl_->SetFocus (); if (!core_) return; @@ -96,7 +97,9 @@ } treeCtrl_->SortChildren(maincat); - treeCtrl_->Expand(maincat); + //Do not expand categories is nice + //TODO: May be users will want parameter for this + //treeCtrl_->Expand(maincat); } treeCtrl_->Expand(root_); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-03-21 19:20:18
|
Revision: 1200 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1200&view=rev Author: vomikan Date: 2011-03-21 19:20:12 +0000 (Mon, 21 Mar 2011) Log Message: ----------- window size increased Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-03-21 01:47:49 UTC (rev 1199) +++ trunk/mmex/src/categdialog.cpp 2011-03-21 19:20:12 UTC (rev 1200) @@ -132,10 +132,10 @@ #if defined (__WXGTK__) || defined (__WXMAC__) treeCtrl_ = new wxTreeCtrl( itemDialog1, ID_DIALOG_CATEG_TREECTRL_CATS, - wxDefaultPosition, wxSize(100, 200)); + wxDefaultPosition, wxSize(200, 380)); #else treeCtrl_ = new wxTreeCtrl( itemDialog1, ID_DIALOG_CATEG_TREECTRL_CATS, - wxDefaultPosition, wxSize(100, 200), wxTR_SINGLE + wxDefaultPosition, wxSize(200, 380), wxTR_SINGLE | wxTR_HAS_BUTTONS | wxTR_ROW_LINES ); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-18 18:09:00
|
Revision: 1516 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1516&view=rev Author: vomikan Date: 2011-11-18 18:08:54 +0000 (Fri, 18 Nov 2011) Log Message: ----------- it seems a pice of obsolete code has not been removed Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-11-18 13:54:34 UTC (rev 1515) +++ trunk/mmex/src/categdialog.cpp 2011-11-18 18:08:54 UTC (rev 1516) @@ -72,11 +72,11 @@ return TRUE; } -void mmCategDialog::setFields(int categID, int subcategID) -{ - categID_ = categID; - subcategID_ = subcategID; -} +//void mmCategDialog::setFields(int categID, int subcategID) +//{ +// categID_ = categID; +// subcategID_ = subcategID; +//} void mmCategDialog::fillControls() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-23 12:19:45
|
Revision: 1528 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1528&view=rev Author: vomikan Date: 2011-11-23 12:19:36 +0000 (Wed, 23 Nov 2011) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-11-23 12:17:55 UTC (rev 1527) +++ trunk/mmex/src/categdialog.cpp 2011-11-23 12:19:36 UTC (rev 1528) @@ -30,7 +30,7 @@ EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_SELECT, mmCategDialog::OnBSelect) EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) - EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) + //EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) END_EVENT_TABLE() mmCategDialog::mmCategDialog( ) @@ -322,7 +322,7 @@ void mmCategDialog::OnDoubleClicked(wxTreeEvent& /*event*/) { - if (selectedItemId_ == root_) + if (selectedItemId_ == root_ || selectedItemId_ == -1) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-30 13:50:49
|
Revision: 1545 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1545&view=rev Author: vomikan Date: 2011-11-30 13:50:40 +0000 (Wed, 30 Nov 2011) Log Message: ----------- line 325 fixed compiler warnings. Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-11-30 11:57:34 UTC (rev 1544) +++ trunk/mmex/src/categdialog.cpp 2011-11-30 13:50:40 UTC (rev 1545) @@ -322,7 +322,7 @@ void mmCategDialog::OnDoubleClicked(wxTreeEvent& /*event*/) { - if (selectedItemId_ == root_ || selectedItemId_ == -1) + if (selectedItemId_ == root_) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-30 16:41:52
|
Revision: 1546 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1546&view=rev Author: vomikan Date: 2011-11-30 16:41:45 +0000 (Wed, 30 Nov 2011) Log Message: ----------- double click function fixed Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-11-30 13:50:40 UTC (rev 1545) +++ trunk/mmex/src/categdialog.cpp 2011-11-30 16:41:45 UTC (rev 1546) @@ -28,9 +28,9 @@ EVT_BUTTON(wxID_CANCEL, mmCategDialog::OnCancel) EVT_BUTTON(wxID_ADD, mmCategDialog::OnAdd) EVT_BUTTON(wxID_DELETE, mmCategDialog::OnDelete) - EVT_BUTTON(wxID_SELECTALL, mmCategDialog::OnBSelect) EVT_BUTTON(wxID_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) + EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) END_EVENT_TABLE() mmCategDialog::mmCategDialog( ) @@ -117,7 +117,7 @@ wxTextCtrl* textCtrl = (wxTextCtrl*)FindWindow(ID_DIALOG_CATEG_TEXTCTRL_CATNAME); wxButton* addButton = (wxButton*)FindWindow(wxID_ADD); wxButton* editButton = (wxButton*)FindWindow(wxID_EDIT); - wxButton* selectButton = (wxButton*)FindWindow(wxID_SELECTALL); + wxButton* selectButton = (wxButton*)FindWindow(wxID_OK); wxButton* deleteButton = (wxButton*)FindWindow(wxID_DELETE); treeCtrl_->SelectItem(selectedItemId_); @@ -176,7 +176,7 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 5); - wxButton* itemButton11 = new wxButton( itemDialog1, wxID_SELECTALL, + wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _("&Select"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer9->Add(itemButton11, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton11->SetToolTip(_("Select the currently selected category as the selected category for the transaction")); @@ -276,7 +276,7 @@ if (mmIniOptions::disableCategoryModify_) return; - if (selectedItemId_ == root_) + if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) { return; } @@ -308,7 +308,7 @@ void mmCategDialog::OnBSelect(wxCommandEvent& /*event*/) { - if (selectedItemId_ == root_) + if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) { return; } @@ -322,23 +322,18 @@ void mmCategDialog::OnDoubleClicked(wxTreeEvent& /*event*/) { - if (selectedItemId_ == root_) + if (selectedItemId_ != root_ && selectedItemId_ != wxNOT_FOUND && bEnableSelect_) { - return; - } - - mmTreeItemCateg* iData = dynamic_cast<mmTreeItemCateg*> - (treeCtrl_->GetItemData(selectedItemId_)); - categID_ = iData->getCategID(); - subcategID_ = iData->getSubCategID(); - EndModal(wxID_OK); + mmTreeItemCateg* iData = dynamic_cast<mmTreeItemCateg*> + (treeCtrl_->GetItemData(selectedItemId_)); + categID_ = iData->getCategID(); + subcategID_ = iData->getSubCategID(); + EndModal(wxID_OK); + } + else + return; } -void mmCategDialog::OnOk(wxCommandEvent& /*event*/) -{ - EndModal(wxID_OK); -} - void mmCategDialog::OnCancel(wxCommandEvent& /*event*/) { EndModal(wxID_CANCEL); @@ -365,9 +360,9 @@ wxButton* addButton = (wxButton*)FindWindow(wxID_ADD); wxButton* editButton = (wxButton*)FindWindow(wxID_EDIT); - wxButton* selectButton = (wxButton*)FindWindow(wxID_SELECTALL); + wxButton* selectButton = (wxButton*)FindWindow(wxID_OK); wxButton* deleteButton = (wxButton*)FindWindow(wxID_DELETE); - if (selectedItemId_ == root_) + if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) { textCtrl->SetValue(wxT("")); selectButton->Disable(); @@ -400,7 +395,7 @@ wxTextCtrl* textCtrl = (wxTextCtrl*)FindWindow(ID_DIALOG_CATEG_TEXTCTRL_CATNAME); wxString text = textCtrl->GetValue(); - if (selectedItemId_ == root_) + if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND ) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-12-04 03:34:55
|
Revision: 1552 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1552&view=rev Author: stef145g Date: 2011-12-04 03:34:48 +0000 (Sun, 04 Dec 2011) Log Message: ----------- Fix compiler warnings - and correct constructor initialisation code. Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-12-04 03:13:49 UTC (rev 1551) +++ trunk/mmex/src/categdialog.cpp 2011-12-04 03:34:48 UTC (rev 1552) @@ -35,8 +35,9 @@ mmCategDialog::mmCategDialog( ) { - //categID_ = 1; - //subcategID_ = 1; + // Initialize fields in constructor + categID_ = -1; + subcategID_ = -1; selectedItemId_ = 0; } @@ -45,9 +46,10 @@ wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { + // Initialize fields in constructor core_ = core; - categID_ ; - subcategID_ ; + categID_ = -1; + subcategID_ = -1; selectedItemId_ = 0; bEnableSelect_ = bEnableSelect; Create(parent, id, caption, pos, size, style); @@ -72,12 +74,6 @@ return TRUE; } -//void mmCategDialog::setFields(int categID, int subcategID) -//{ -// categID_ = categID; -// subcategID_ = subcategID; -//} - void mmCategDialog::fillControls() { root_ = treeCtrl_->AddRoot(_("Categories")); @@ -90,10 +86,10 @@ int numCategs = (int)core_->categoryList_.categories_.size(); for (int idx = 0; idx < numCategs; idx++) { - wxTreeItemId maincat = treeCtrl_->AppendItem(root_, core_->categoryList_.categories_[idx]->categName_); - treeCtrl_->SetItemData(maincat, new mmTreeItemCateg(core_->categoryList_.categories_[idx]->categID_, -1)); + wxTreeItemId maincat = treeCtrl_->AppendItem(root_, core_->categoryList_.categories_[idx]->categName_); + treeCtrl_->SetItemData(maincat, new mmTreeItemCateg(core_->categoryList_.categories_[idx]->categID_, -1)); - int numSubCategs = (int)core_->categoryList_.categories_[idx]->children_.size(); + int numSubCategs = (int)core_->categoryList_.categories_[idx]->children_.size(); for (int cidx = 0; cidx < numSubCategs; cidx++) { wxTreeItemId subcat = treeCtrl_->AppendItem(maincat, @@ -101,7 +97,7 @@ treeCtrl_->SetItemData(subcat, new mmTreeItemCateg(core_->categoryList_.categories_[idx]->categID_, core_->categoryList_.categories_[idx]->children_[cidx]->categID_)); - if (categID_ == core_->categoryList_.categories_[idx]->categID_ && subcategID_ == core_->categoryList_.categories_[idx]->children_[cidx]->categID_) + if (categID_ == core_->categoryList_.categories_[idx]->categID_ && subcategID_ == core_->categoryList_.categories_[idx]->children_[cidx]->categID_) selectedItemId_ = subcat; } @@ -273,10 +269,10 @@ void mmCategDialog::OnDelete(wxCommandEvent& /*event*/) { - if (mmIniOptions::disableCategoryModify_) + if (mmIniOptions::disableCategoryModify_) return; - if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) + if (selectedItemId_ == root_ || !selectedItemId_ ) { return; } @@ -308,7 +304,7 @@ void mmCategDialog::OnBSelect(wxCommandEvent& /*event*/) { - if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) + if (selectedItemId_ == root_ || !selectedItemId_ ) { return; } @@ -322,7 +318,7 @@ void mmCategDialog::OnDoubleClicked(wxTreeEvent& /*event*/) { - if (selectedItemId_ != root_ && selectedItemId_ != wxNOT_FOUND && bEnableSelect_) + if (selectedItemId_ != root_ && selectedItemId_ && bEnableSelect_) { mmTreeItemCateg* iData = dynamic_cast<mmTreeItemCateg*> (treeCtrl_->GetItemData(selectedItemId_)); @@ -362,7 +358,7 @@ wxButton* editButton = (wxButton*)FindWindow(wxID_EDIT); wxButton* selectButton = (wxButton*)FindWindow(wxID_OK); wxButton* deleteButton = (wxButton*)FindWindow(wxID_DELETE); - if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND) + if (selectedItemId_ == root_ || !selectedItemId_) { textCtrl->SetValue(wxT("")); selectButton->Disable(); @@ -395,7 +391,7 @@ wxTextCtrl* textCtrl = (wxTextCtrl*)FindWindow(ID_DIALOG_CATEG_TEXTCTRL_CATNAME); wxString text = textCtrl->GetValue(); - if (selectedItemId_ == root_ || selectedItemId_ == wxNOT_FOUND ) + if (selectedItemId_ == root_ || !selectedItemId_ ) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-01-04 20:33:43
|
Revision: 1602 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1602&view=rev Author: vomikan Date: 2012-01-04 20:33:37 +0000 (Wed, 04 Jan 2012) Log Message: ----------- crash fix. by default selected item = 0 that is wrong. Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-01-03 20:04:50 UTC (rev 1601) +++ trunk/mmex/src/categdialog.cpp 2012-01-04 20:33:37 UTC (rev 1602) @@ -77,6 +77,7 @@ void mmCategDialog::fillControls() { root_ = treeCtrl_->AddRoot(_("Categories")); + selectedItemId_ = root_; treeCtrl_->SetItemBold(root_, true); treeCtrl_->SetFocus (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-03-10 06:03:18
|
Revision: 1984 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1984&view=rev Author: guanlisheng Date: 2012-03-10 06:03:12 +0000 (Sat, 10 Mar 2012) Log Message: ----------- format Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-03-10 06:00:44 UTC (rev 1983) +++ trunk/mmex/src/categdialog.cpp 2012-03-10 06:03:12 UTC (rev 1984) @@ -324,9 +324,9 @@ categID_ = iData->getCategID(); subcategID_ = iData->getSubCategID(); EndModal(wxID_OK); - } - else - return; + } + else + return; } void mmCategDialog::OnCancel(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-12 21:13:12
|
Revision: 2582 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2582&view=rev Author: vomikan Date: 2012-06-12 21:13:06 +0000 (Tue, 12 Jun 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-06-12 16:46:11 UTC (rev 2581) +++ trunk/mmex/src/categdialog.cpp 2012-06-12 21:13:06 UTC (rev 2582) @@ -120,7 +120,7 @@ treeCtrl_->SelectItem(selectedItemId_); - textCtrl->SetValue(wxT ("")); + textCtrl->SetValue(""); selectButton->Disable(); deleteButton->Disable(); editButton->Disable(); @@ -147,38 +147,34 @@ itemBoxSizer3->Add(treeCtrl_, 1, wxGROW|wxALL, 1); wxTextCtrl* itemTextCtrl6 = new wxTextCtrl( this, - ID_DIALOG_CATEG_TEXTCTRL_CATNAME, (""), wxDefaultPosition, wxDefaultSize, 0 ); + ID_DIALOG_CATEG_TEXTCTRL_CATNAME, "", wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(itemTextCtrl6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 1); itemTextCtrl6->SetToolTip(_("Enter the name of the category to add or edit here")); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - wxButton* itemButton7 = new wxButton( this, wxID_ADD, - _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton7 = new wxButton(this, wxID_ADD); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton7->SetToolTip(_("Add a new category")); - wxButton* itemButton71 = new wxButton( this, wxID_EDIT, - _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton71 = new wxButton(this, wxID_EDIT); itemBoxSizer5->Add(itemButton71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton71->SetToolTip(_("Edit the name of an existing category")); - wxButton* itemButton8 = new wxButton( this, wxID_REMOVE, - _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton8 = new wxButton(this, wxID_REMOVE); itemBoxSizer5->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton8->SetToolTip(_("Delete an existing category. The category cannot be used by existing transactions.")); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 5); - wxButton* itemButton11 = new wxButton( this, wxID_OK, - _("&Select"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton11 = new wxButton( this, wxID_OK, _("&Select")); itemBoxSizer9->Add(itemButton11, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton11->SetToolTip(_("Select the currently selected category as the selected category for the transaction")); //Some interfaces has no any close buttons, it may confuse user. Cancel button added - wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL, _("&Cancel")); + wxButton* itemCancelButton = new wxButton(this, wxID_CANCEL); itemBoxSizer9->Add(itemCancelButton); } @@ -190,7 +186,7 @@ wxTextCtrl* textCtrl; textCtrl = (wxTextCtrl*)FindWindow(ID_DIALOG_CATEG_TEXTCTRL_CATNAME); wxString text = textCtrl->GetValue(); - if (text == ("")) + if (text == "") { wxString errMsg = _("Category cannot be empty"); errMsg << (" "); // added to adjust dialog size @@ -364,7 +360,7 @@ wxButton* deleteButton = (wxButton*)FindWindow(wxID_REMOVE); if (selectedItemId_ == root_ || !selectedItemId_) { - textCtrl->SetValue(("")); + textCtrl->SetValue(""); selectButton->Disable(); deleteButton->Disable(); editButton->Disable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-19 15:39:49
|
Revision: 2635 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2635&view=rev Author: vomikan Date: 2012-06-19 15:39:39 +0000 (Tue, 19 Jun 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-06-19 15:33:31 UTC (rev 2634) +++ trunk/mmex/src/categdialog.cpp 2012-06-19 15:39:39 UTC (rev 2635) @@ -147,8 +147,8 @@ itemBoxSizer3->Add(treeCtrl_, 1, wxGROW|wxALL, 1); wxTextCtrl* itemTextCtrl6 = new wxTextCtrl( this, - ID_DIALOG_CATEG_TEXTCTRL_CATNAME, "", wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemTextCtrl6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 1); + ID_DIALOG_CATEG_TEXTCTRL_CATNAME, ""); + itemBoxSizer2->Add(itemTextCtrl6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 6); itemTextCtrl6->SetToolTip(_("Enter the name of the category to add or edit here")); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-26 14:23:30
|
Revision: 3162 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3162&view=rev Author: vomikan Date: 2012-11-26 14:23:19 +0000 (Mon, 26 Nov 2012) Log Message: ----------- save Expand / Collapse settings Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-11-26 13:47:06 UTC (rev 3161) +++ trunk/mmex/src/categdialog.cpp 2012-11-26 14:23:19 UTC (rev 3162) @@ -107,9 +107,11 @@ treeCtrl_->SortChildren(maincat); } treeCtrl_->Expand(root_); - //TODO: May be users will want parameter for this - if (itemCheckBox_->IsChecked()) treeCtrl_->ExpandAll(); + bool result = core_->iniSettings_->GetBoolSetting(wxT("EXPAND_CATEGS_TREE"), false); + if (result) treeCtrl_->ExpandAll(); + itemCheckBox_->SetValue(result); + treeCtrl_->SortChildren(root_); treeCtrl_->SelectItem(selectedItemId_); @@ -130,7 +132,7 @@ wxBoxSizer* itemBoxSizer33 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer3->Add(itemBoxSizer33); - wxBitmapButton* bCateg_relocate = new wxBitmapButton(this, + wxBitmapButton* bCateg_relocate = new wxBitmapButton(this, wxID_STATIC, wxBitmap(relocate_categories_xpm)); bCateg_relocate->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmCategDialog::OnCategoryRelocation), NULL, this); @@ -460,5 +462,7 @@ { treeCtrl_->CollapseAll(); treeCtrl_->Expand(root_); - treeCtrl_->SelectItem(selectedItemId_); } + treeCtrl_->SelectItem(selectedItemId_); + } + core_->iniSettings_->SetBoolSetting(wxT("EXPAND_CATEGS_TREE"), itemCheckBox_->IsChecked()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-27 12:28:18
|
Revision: 3163 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3163&view=rev Author: vomikan Date: 2012-11-27 12:28:08 +0000 (Tue, 27 Nov 2012) Log Message: ----------- same interface for add category as for payee Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-11-26 14:23:19 UTC (rev 3162) +++ trunk/mmex/src/categdialog.cpp 2012-11-27 12:28:08 UTC (rev 3163) @@ -197,14 +197,10 @@ if (mmIniOptions::instance().disableCategoryModify_) return; - wxString text = textCtrl_->GetValue(); + wxString text = wxGetTextFromUser(_("Enter the name for the new category:") + , _("Organize Categories: Add Category"), textCtrl_->GetValue()); if (text.IsEmpty()) - { - wxString errMsg = _("Category cannot be empty"); - errMsg << wxT(" "); // added to adjust dialog size - wxMessageBox(errMsg, _("Organise Categories: Adding Error"),wxOK|wxICON_ERROR); return; - } if (selectedItemId_ == root_) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-28 06:32:46
|
Revision: 3164 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3164&view=rev Author: vomikan Date: 2012-11-28 06:32:39 +0000 (Wed, 28 Nov 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-11-27 12:28:08 UTC (rev 3163) +++ trunk/mmex/src/categdialog.cpp 2012-11-28 06:32:39 UTC (rev 3164) @@ -198,7 +198,7 @@ return; wxString text = wxGetTextFromUser(_("Enter the name for the new category:") - , _("Organize Categories: Add Category"), textCtrl_->GetValue()); + , _("Add Category"), textCtrl_->GetValue()); if (text.IsEmpty()) return; @@ -263,9 +263,7 @@ return; if (selectedItemId_ == root_ || !selectedItemId_ ) - { return; - } mmTreeItemCateg* iData = dynamic_cast<mmTreeItemCateg*>(treeCtrl_->GetItemData(selectedItemId_)); @@ -374,11 +372,15 @@ return; if (selectedItemId_ == root_ || !selectedItemId_ ) - { return; - } - wxString text = textCtrl_->GetValue(); + wxString old_name = treeCtrl_->GetItemText(selectedItemId_); + wxString msg = wxString::Format(_("Enter a new name for %s"), old_name.c_str()); + wxString text = wxGetTextFromUser(msg + , _("Edit Category"), textCtrl_->GetValue()); + if (text.IsEmpty()) + return; + textCtrl_->SetValue(text); mmTreeItemCateg* iData = dynamic_cast<mmTreeItemCateg*> (treeCtrl_->GetItemData(selectedItemId_)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-14 10:47:31
|
Revision: 3201 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3201&view=rev Author: vomikan Date: 2012-12-14 10:47:23 +0000 (Fri, 14 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-13 20:29:07 UTC (rev 3200) +++ trunk/mmex/src/categdialog.cpp 2012-12-14 10:47:23 UTC (rev 3201) @@ -115,6 +115,7 @@ treeCtrl_->SortChildren(root_); treeCtrl_->SelectItem(selectedItemId_); + treeCtrl_->EnsureVisible(selectedItemId_); textCtrl_->SetValue(wxT ("")); selectButton_->Disable(); @@ -453,12 +454,16 @@ void mmCategDialog::OnChbClick(wxCommandEvent& /*event*/) { if (itemCheckBox_->IsChecked()) + { treeCtrl_->ExpandAll(); + treeCtrl_->SelectItem(selectedItemId_); + } else { treeCtrl_->CollapseAll(); treeCtrl_->Expand(root_); treeCtrl_->SelectItem(selectedItemId_); } + treeCtrl_->EnsureVisible(selectedItemId_); core_->iniSettings_->SetBoolSetting(wxT("EXPAND_CATEGS_TREE"), itemCheckBox_->IsChecked()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-16 08:53:14
|
Revision: 3213 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3213&view=rev Author: vomikan Date: 2012-12-16 08:53:08 +0000 (Sun, 16 Dec 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-16 05:13:51 UTC (rev 3212) +++ trunk/mmex/src/categdialog.cpp 2012-12-16 08:53:08 UTC (rev 3213) @@ -32,7 +32,7 @@ EVT_BUTTON(wxID_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) - EVT_MENU_RANGE(0, 2, mmCategDialog::OnMenuSelected) + EVT_MENU_RANGE(0, 9, mmCategDialog::OnMenuSelected) EVT_TREE_ITEM_MENU(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnItemRightClick) END_EVENT_TABLE() @@ -59,7 +59,7 @@ //Get Hiden Categories id from stored string hiden_categs_.clear(); - wxString sSettings = core_->iniSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), wxT("")); + wxString sSettings = mmDBWrapper::getInfoSettingValue(core_->db_.get(), wxT("HIDEN_CATEGS_ID"), wxT("")); wxStringTokenizer token(sSettings, wxT(";")); while (token.HasMoreTokens()) { @@ -538,10 +538,10 @@ { sSettings.Append(hiden_categs_[i]).Append(wxT(";")); } - sSettings.RemoveLast(1); - core_->iniSettings_->SetStringSetting(wxT("HIDEN_CATEGS_ID"), sSettings); + mmDBWrapper::setInfoSettingValue(core_->db_.get(), wxT("HIDEN_CATEGS_ID"), sSettings); + if (!cbShowAll_->IsChecked() || id == 2) fillControls(); event.Skip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-16 09:19:43
|
Revision: 3214 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3214&view=rev Author: vomikan Date: 2012-12-16 09:19:36 +0000 (Sun, 16 Dec 2012) Log Message: ----------- fix for MSWIN for right button click Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-16 08:53:08 UTC (rev 3213) +++ trunk/mmex/src/categdialog.cpp 2012-12-16 09:19:36 UTC (rev 3214) @@ -31,6 +31,7 @@ EVT_BUTTON(wxID_REMOVE, mmCategDialog::OnDelete) EVT_BUTTON(wxID_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) + EVT_TREE_ITEM_RIGHT_CLICK(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) EVT_MENU_RANGE(0, 9, mmCategDialog::OnMenuSelected) EVT_TREE_ITEM_MENU(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnItemRightClick) @@ -354,9 +355,10 @@ void mmCategDialog::OnSelChanged(wxTreeEvent& event) { - selectedItemId_ = event.GetItem(); - if (!selectedItemId_) - return; + wxTreeItemId selectedItemId = selectedItemId_; + selectedItemId_ = event.GetItem(); + if (!selectedItemId_) return; + if (selectedItemId != selectedItemId_) treeCtrl_->SelectItem(selectedItemId_); textCtrl_->SetValue(treeCtrl_->GetItemText(selectedItemId_)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-29 21:36:43
|
Revision: 3263 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3263&view=rev Author: vomikan Date: 2012-12-29 21:36:36 +0000 (Sat, 29 Dec 2012) Log Message: ----------- settings cleanup if some category deleted Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-29 16:07:43 UTC (rev 3262) +++ trunk/mmex/src/categdialog.cpp 2012-12-29 21:36:36 UTC (rev 3263) @@ -102,6 +102,9 @@ bool bResult = core_->iniSettings_->GetBoolSetting(wxT("SHOW_HIDEN_CATEGS"), true); cbShowAll_->SetValue(bResult); + wxFont italicFont = wxFont(treeCtrl_->GetFont()); + italicFont.SetStyle(wxFONTSTYLE_ITALIC); + std::pair<mmCategoryList::const_iterator, mmCategoryList::const_iterator> range = core_->categoryList_.Range(); for (mmCategoryList::const_iterator it = range.first; it != range.second; ++ it) { @@ -113,6 +116,8 @@ maincat = treeCtrl_->AppendItem(root_, category->categName_); treeCtrl_->SetItemData(maincat, new mmTreeItemCateg(category->categID_, -1)); if (!bShow) treeCtrl_->SetItemTextColour(maincat, wxColour(wxT("GREY"))); + //TODO: If category does not used - change font to italic + if (false) treeCtrl_->SetItemFont(maincat, italicFont); for (std::vector<boost::shared_ptr<mmCategory> >::const_iterator cit = category->children_.begin(); cit != category->children_.end(); @@ -322,6 +327,13 @@ } treeCtrl_->Delete(selectedItemId_); + + wxString sIndex = wxString::Format(wxT("*%i:%i*"),categID, subcategID); + wxString sSettings = core_->dbInfoSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), wxT("")); + sSettings.Replace(sIndex, wxT("")); + sSettings.Replace(wxT(";;"), wxT(";")); + core_->dbInfoSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), sSettings); + } void mmCategDialog::OnBSelect(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-30 12:23:14
|
Revision: 3267 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3267&view=rev Author: vomikan Date: 2012-12-30 12:23:04 +0000 (Sun, 30 Dec 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-30 01:35:00 UTC (rev 3266) +++ trunk/mmex/src/categdialog.cpp 2012-12-30 12:23:04 UTC (rev 3267) @@ -31,7 +31,7 @@ EVT_BUTTON(wxID_REMOVE, mmCategDialog::OnDelete) EVT_BUTTON(wxID_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) - EVT_TREE_ITEM_RIGHT_CLICK(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) + EVT_TREE_ITEM_RIGHT_CLICK(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) EVT_MENU_RANGE(0, 9, mmCategDialog::OnMenuSelected) EVT_TREE_ITEM_MENU(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnItemRightClick) @@ -332,8 +332,8 @@ wxString sSettings = core_->dbInfoSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), wxT("")); sSettings.Replace(sIndex, wxT("")); sSettings.Replace(wxT(";;"), wxT(";")); - core_->dbInfoSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), sSettings); - + core_->dbInfoSettings_->SetStringSetting(wxT("HIDEN_CATEGS_ID"), sSettings); + core_->dbInfoSettings_->Save(); } void mmCategDialog::OnBSelect(wxCommandEvent& /*event*/) @@ -368,9 +368,9 @@ void mmCategDialog::OnSelChanged(wxTreeEvent& event) { wxTreeItemId selectedItemId = selectedItemId_; - selectedItemId_ = event.GetItem(); + selectedItemId_ = event.GetItem(); if (!selectedItemId_) return; - if (selectedItemId != selectedItemId_) treeCtrl_->SelectItem(selectedItemId_); + if (selectedItemId != selectedItemId_) treeCtrl_->SelectItem(selectedItemId_); textCtrl_->SetValue(treeCtrl_->GetItemText(selectedItemId_)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-30 17:12:40
|
Revision: 3269 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3269&view=rev Author: vomikan Date: 2012-12-30 17:12:29 +0000 (Sun, 30 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/categdialog.cpp Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-12-30 15:36:16 UTC (rev 3268) +++ trunk/mmex/src/categdialog.cpp 2012-12-30 17:12:29 UTC (rev 3269) @@ -332,9 +332,18 @@ treeCtrl_->Delete(selectedItemId_); wxString sIndex = wxString::Format(wxT("*%i:%i*"),categID, subcategID); - wxString sSettings = core_->dbInfoSettings_->GetStringSetting(wxT("HIDEN_CATEGS_ID"), wxT("")); - sSettings.Replace(sIndex, wxT("")); - sSettings.Replace(wxT(";;"), wxT(";")); + wxString sSettings = wxT(""); + for (size_t i = 0; i < hiden_categs_.GetCount(); i++) + { + if (subcategID != -1 && hiden_categs_[i] == sIndex) + hiden_categs_.RemoveAt(i, i); + else if (subcategID == -1 && hiden_categs_[i].Contains(wxString::Format(wxT("*%i:"),categID))) + hiden_categs_.RemoveAt(i, i); + else + sSettings << hiden_categs_[i] << wxT(";"); + } + sIndex.RemoveLast(1); + core_->dbInfoSettings_->SetStringSetting(wxT("HIDEN_CATEGS_ID"), sSettings); core_->dbInfoSettings_->Save(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |