From: <vo...@us...> - 2011-05-20 10:35:06
|
Revision: 1286 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1286&view=rev Author: vomikan Date: 2011-05-20 10:34:59 +0000 (Fri, 20 May 2011) Log Message: ----------- . Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2011-05-20 10:30:11 UTC (rev 1285) +++ trunk/mmex/src/univcsvdialog.cpp 2011-05-20 10:34:59 UTC (rev 1286) @@ -569,7 +569,7 @@ msg << wxT ("\n"); msg << wxString::Format(_("Total Imported : %d") ,countImported) ; msg << wxT ("\n\n"); - msg << wxString::Format(_("Log file written to : %s."), logFile.GetFullPath().c_str()); + msg << wxString::Format(_("Log file written to : %s"), logFile.GetFullPath().c_str()); msg << wxT ("\n\n"); if (countImported > 0) msg << _ ("Imported transactions have been flagged so you can review them.") ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-10 02:34:17
|
Revision: 1621 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1621&view=rev Author: guanlisheng Date: 2012-01-10 02:34:11 +0000 (Tue, 10 Jan 2012) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-09 15:10:52 UTC (rev 1620) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-10 02:34:11 UTC (rev 1621) @@ -697,7 +697,7 @@ //reselect the source csvListBox_->SetSelection(selIndex + 1, true); - std::swap(csvFieldOrder_[selIndex - 1], csvFieldOrder_[selIndex]); + std::swap(csvFieldOrder_[selIndex + 1], csvFieldOrder_[selIndex]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-10 06:02:40
|
Revision: 1622 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1622&view=rev Author: guanlisheng Date: 2012-01-10 06:02:33 +0000 (Tue, 10 Jan 2012) Log Message: ----------- format and remove the hardcode Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-10 02:34:11 UTC (rev 1621) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-10 06:02:33 UTC (rev 1622) @@ -43,7 +43,7 @@ enum EUnivCvs { - UNIV_CSV_DATE, + UNIV_CSV_DATE = 0, UNIV_CSV_PAYEE, UNIV_CSV_AMOUNT, UNIV_CSV_CATEGORY, @@ -52,7 +52,8 @@ UNIV_CSV_TRANSNUM, UNIV_CSV_DONTCARE, UNIV_CSV_WITHDRAWAL, - UNIV_CSV_DEPOSIT + UNIV_CSV_DEPOSIT, + UNIV_CSV_LAST }; //---------------------------------------------------------------------------- @@ -300,23 +301,19 @@ { wxArrayString csvArray; wxArrayInt csvArrayLocation; - for(int i = 0; i < 10; i++) + for(int i = 0; i < UNIV_CSV_LAST; i++) { //check if the field is already selected unless it is "Don't Care" //multiple fields of "Don't Care" may be necessary - //the code for "Don't Care" is 7 std::vector<int>::const_iterator loc = find(csvFieldOrder_.begin(), csvFieldOrder_.end(), i); - if(loc == csvFieldOrder_.end() || i == 7 ) + if(loc == csvFieldOrder_.end() || i == UNIV_CSV_DONTCARE) { csvArray.Add((getCSVFieldName(i))); csvArrayLocation.Add((i)); } } - int index = wxGetSingleChoiceIndex( - _("Add CSV field"), - _("CSV Field"), - csvArray); + int index = wxGetSingleChoiceIndex(_("Add CSV field"), _("CSV Field"), csvArray); if (index != -1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-12 08:09:15
|
Revision: 1634 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1634&view=rev Author: guanlisheng Date: 2012-01-12 08:09:05 +0000 (Thu, 12 Jan 2012) Log Message: ----------- format & cleanup Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-12 07:12:30 UTC (rev 1633) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-12 08:09:05 UTC (rev 1634) @@ -165,9 +165,8 @@ itemButton_MoveDown -> SetToolTip (_("Move &Down")); //ListBox of attribute order - wxString* itemListBox4Strings = NULL; csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, - wxDefaultPosition, wxDefaultSize, 0, itemListBox4Strings, wxLB_SINGLE); + wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); itemBoxSizer3->Add(csvListBox_, 1, wxGROW|wxALL, 1); //Add Remove Area This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-15 14:34:30
|
Revision: 1640 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1640&view=rev Author: guanlisheng Date: 2012-01-15 14:34:24 +0000 (Sun, 15 Jan 2012) Log Message: ----------- '' Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-15 11:40:47 UTC (rev 1639) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-15 14:34:24 UTC (rev 1640) @@ -144,32 +144,7 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - //Arranger Area - wxPanel* itemPanel_Arranger = new wxPanel(itemDialog1, ID_PANEL10, - wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - itemBoxSizer3->Add(itemPanel_Arranger, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); - - wxBoxSizer* itemBoxSizer_Arranger = new wxBoxSizer(wxVERTICAL); - itemPanel_Arranger->SetSizer(itemBoxSizer_Arranger); - - //Move Up button - wxButton* itemButton_MoveUp = new wxButton(itemPanel_Arranger, wxID_UP, _("&Up"), - wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer_Arranger->Add(itemButton_MoveUp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemButton_MoveUp -> SetToolTip (_("Move Up")); - - //Move down button - wxButton* itemButton_MoveDown = new wxButton(itemPanel_Arranger, wxID_DOWN, _("&Down"), - wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer_Arranger->Add(itemButton_MoveDown, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemButton_MoveDown -> SetToolTip (_("Move &Down")); - - //ListBox of attribute order - csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, - wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); - itemBoxSizer3->Add(csvListBox_, 1, wxGROW|wxALL, 1); - - //Add Remove Area + //Add Remove Area wxPanel* itemPanel_AddRemove = new wxPanel(itemDialog1, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer3->Add(itemPanel_AddRemove, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); @@ -193,7 +168,32 @@ wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemPanel5->SetSizer(itemBoxSizer6); + + //ListBox of attribute order + csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, + wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); + itemBoxSizer3->Add(csvListBox_, 1, wxGROW|wxALL, 1); + //Arranger Area + wxPanel* itemPanel_Arranger = new wxPanel(itemDialog1, ID_PANEL10, + wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + itemBoxSizer3->Add(itemPanel_Arranger, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + + wxBoxSizer* itemBoxSizer_Arranger = new wxBoxSizer(wxVERTICAL); + itemPanel_Arranger->SetSizer(itemBoxSizer_Arranger); + + //Move Up button + wxButton* itemButton_MoveUp = new wxButton(itemPanel_Arranger, wxID_UP, _("&Up"), + wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer_Arranger->Add(itemButton_MoveUp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemButton_MoveUp -> SetToolTip (_("Move Up")); + + //Move down button + wxButton* itemButton_MoveDown = new wxButton(itemPanel_Arranger, wxID_DOWN, _("&Down"), + wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer_Arranger->Add(itemButton_MoveDown, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemButton_MoveDown -> SetToolTip (_("Move &Down")); + //Load Template button wxButton* itemButton_Load = new wxButton(itemPanel5, wxID_OPEN, _("&Open"), wxDefaultPosition, wxDefaultSize, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-17 01:57:05
|
Revision: 1643 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1643&view=rev Author: guanlisheng Date: 2012-01-17 01:56:59 +0000 (Tue, 17 Jan 2012) Log Message: ----------- fix compiler warning Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-17 00:18:09 UTC (rev 1642) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-17 01:56:59 UTC (rev 1643) @@ -573,7 +573,7 @@ csvListBox_->Delete(selIndex); csvFieldOrder_.erase(csvFieldOrder_.begin() + selIndex); - if (selIndex < csvListBox_->GetCount()) + if (selIndex < (int)csvListBox_->GetCount()) csvListBox_->SetSelection(selIndex, true); else csvListBox_->SetSelection(csvListBox_->GetCount() - 1, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 01:28:07
|
Revision: 1651 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1651&view=rev Author: guanlisheng Date: 2012-01-18 01:28:01 +0000 (Wed, 18 Jan 2012) Log Message: ----------- patch form Nikolay Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-17 15:51:00 UTC (rev 1650) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 01:28:01 UTC (rev 1651) @@ -229,13 +229,13 @@ itemPanel6->SetSizer(itemBoxSizer7); wxStaticText* itemStaticText5 = new wxStaticText(itemPanel6, wxID_ANY, _("File to import:"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_LEFT, 5); + itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_text_ctrl_ = new wxTextCtrl(itemPanel6, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, -1), 0); itemBoxSizer7->Add(m_text_ctrl_, 0, wxALL|wxEXPAND, 5); wxButton* button_search = new wxButton(itemPanel6, wxID_SEARCH, _("&Search")); - itemBoxSizer7->Add(button_search, 0, wxALIGN_RIGHT, 5); + itemBoxSizer7->Add(button_search, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // account to import wxPanel* itemPanel7 = new wxPanel(itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); @@ -245,7 +245,7 @@ itemPanel7->SetSizer(itemBoxSizer8); wxStaticText* itemStaticText6 = new wxStaticText(itemPanel7, wxID_ANY, _("Account to import:"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer8->Add(itemStaticText6, 0, wxALIGN_LEFT, 5); + itemBoxSizer8->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString as = mmDBWrapper::getAccountsName(db_); m_choice_account_ = new wxChoice(itemPanel7, wxID_ANY, wxDefaultPosition, wxSize(100, -1), as); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 02:05:29
|
Revision: 1652 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1652&view=rev Author: guanlisheng Date: 2012-01-18 02:05:23 +0000 (Wed, 18 Jan 2012) Log Message: ----------- http://trac.wxwidgets.org/ticket/13213 Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 01:28:01 UTC (rev 1651) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 02:05:23 UTC (rev 1652) @@ -258,7 +258,7 @@ wxStaticText* itemStaticText4 = new wxStaticText(itemDialog1, wxID_STATIC, _("Preview"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer2->Add(itemStaticText4, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); - m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_ICON|wxLC_REPORT); + m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_REPORT); itemBoxSizer2->Add(m_list_ctrl_, 0, wxALL|wxEXPAND, 5); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 05:58:52
|
Revision: 1654 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1654&view=rev Author: guanlisheng Date: 2012-01-18 05:58:45 +0000 (Wed, 18 Jan 2012) Log Message: ----------- more polishing Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 05:26:28 UTC (rev 1653) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 05:58:45 UTC (rev 1654) @@ -161,12 +161,7 @@ wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer_AddRemove->Add(m_button_remove_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxPanel* itemPanel5 = new wxPanel(itemDialog1, ID_PANEL10, - wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); - wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); - itemPanel5->SetSizer(itemBoxSizer6); //ListBox of attribute order csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, @@ -194,30 +189,18 @@ itemButton_MoveDown -> SetToolTip (_("Move &Down")); //Load Template button - wxButton* itemButton_Load = new wxButton(itemPanel5, wxID_OPEN, _("&Open"), + wxButton* itemButton_Load = new wxButton(itemPanel_Arranger, wxID_OPEN, _("&Open"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Load, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_Load, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton_Load -> SetToolTip (_("Load Template")); //Save As Template button - wxButton* itemButton_Save = new wxButton(itemPanel5, wxID_SAVEAS, _("Save &As..."), + wxButton* itemButton_Save = new wxButton(itemPanel_Arranger, wxID_SAVEAS, _("Save &As..."), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Save, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_Save, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton_Save -> SetToolTip (_("Save Template")); - //Import File button - wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), - wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemButton_Import -> SetToolTip (_("Import File")); - wxBoxSizer* itemBoxSizer66 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer6->Add(itemBoxSizer66, 1, wxGROW|wxALL, 5); - - wxButton* itemCancelButton = new wxButton(itemPanel5, wxID_CANCEL, _("&Cancel")); - itemBoxSizer66->Add(itemCancelButton); - itemCancelButton->SetFocus(); - wxStaticLine* m_staticline1 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer2->Add(m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -260,6 +243,25 @@ m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_REPORT); itemBoxSizer2->Add(m_list_ctrl_, 0, wxALL|wxEXPAND, 5); + + //Import File button + wxPanel* itemPanel5 = new wxPanel(itemDialog1, ID_PANEL10, + wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + + wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); + itemPanel5->SetSizer(itemBoxSizer6); + wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), + wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemButton_Import -> SetToolTip (_("Import File")); + + wxBoxSizer* itemBoxSizer66 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer6->Add(itemBoxSizer66, 1, wxGROW|wxALL, 5); + + wxButton* itemCancelButton = new wxButton(itemPanel5, wxID_CANCEL, _("&Cancel")); + itemBoxSizer66->Add(itemCancelButton); + itemCancelButton->SetFocus(); } /*! @@ -654,10 +656,11 @@ { this->m_list_ctrl_->ClearAll(); long index = 0; + this->m_list_ctrl_->InsertColumn(index, wxT("")); for (std::vector<int>::const_iterator it = csvFieldOrder_.begin(); it != csvFieldOrder_.end(); ++ it) { + ++ index; this->m_list_ctrl_->InsertColumn(index, this->getCSVFieldName(*it)); - ++ index; } wxString fileName = m_text_ctrl_->GetValue(); @@ -678,19 +681,21 @@ { wxStringTokenizer tkz(line, delimit, wxTOKEN_RET_EMPTY_ALL); + int col = 0; wxString buf; - + buf.Printf(_T("%d"), col); long itemIndex = m_list_ctrl_->InsertItem(row, buf, 0); - int col = 0; + buf.Printf(_T("%d"), row + 1); + m_list_ctrl_->SetItem(itemIndex, col, buf); while (tkz.HasMoreTokens()) { + ++ col; wxString token = tkz.GetNextToken(); if (col >= m_list_ctrl_->GetColumnCount()) break; else m_list_ctrl_->SetItem(itemIndex, col, token); - ++ col; } if (++ count >= 10) break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 07:01:24
|
Revision: 1655 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1655&view=rev Author: guanlisheng Date: 2012-01-18 07:01:14 +0000 (Wed, 18 Jan 2012) Log Message: ----------- CSV import UI polish Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 05:58:45 UTC (rev 1654) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 07:01:14 UTC (rev 1655) @@ -160,8 +160,6 @@ m_button_remove_ = new wxButton(itemPanel_AddRemove, wxID_REMOVE, _("Remove"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer_AddRemove->Add(m_button_remove_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - //ListBox of attribute order csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, @@ -200,7 +198,6 @@ itemBoxSizer_Arranger->Add(itemButton_Save, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton_Save -> SetToolTip (_("Save Template")); - wxStaticLine* m_staticline1 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer2->Add(m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -247,20 +244,17 @@ //Import File button wxPanel* itemPanel5 = new wxPanel(itemDialog1, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_RIGHT|wxALL, 1); wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemPanel5->SetSizer(itemBoxSizer6); wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemButton_Import -> SetToolTip (_("Import File")); - wxBoxSizer* itemBoxSizer66 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer6->Add(itemBoxSizer66, 1, wxGROW|wxALL, 5); - wxButton* itemCancelButton = new wxButton(itemPanel5, wxID_CANCEL, _("&Cancel")); - itemBoxSizer66->Add(itemCancelButton); + itemBoxSizer6->Add(itemCancelButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemCancelButton->SetFocus(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 08:37:26
|
Revision: 1656 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1656&view=rev Author: guanlisheng Date: 2012-01-18 08:37:19 +0000 (Wed, 18 Jan 2012) Log Message: ----------- Format Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 07:01:14 UTC (rev 1655) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 08:37:19 UTC (rev 1656) @@ -124,12 +124,10 @@ void mmUnivCSVImportDialog::CreateControls() { - mmUnivCSVImportDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); - wxStaticText* itemStaticText3 = new wxStaticText(itemDialog1, wxID_STATIC, + wxStaticText* itemStaticText3 = new wxStaticText(this, wxID_STATIC, _("Specify the order of fields in the CSV file"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); @@ -137,14 +135,14 @@ itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); //CSV fields candicate - csvFiledCandicate_ = new wxListBox(itemDialog1, ID_LISTBOX_CANDICATE, + csvFiledCandicate_ = new wxListBox(this, ID_LISTBOX_CANDICATE, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); itemBoxSizer3->Add(csvFiledCandicate_, 1, wxGROW|wxALL, 1); for(std::map<int, wxString>::const_iterator it = CSVFieldName_.begin(); it != CSVFieldName_.end(); it ++) csvFiledCandicate_->Append(it->second, new mmListBoxItem(it->first, it->second)); //Add Remove Area - wxPanel* itemPanel_AddRemove = new wxPanel(itemDialog1, ID_PANEL10, + wxPanel* itemPanel_AddRemove = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer3->Add(itemPanel_AddRemove, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); @@ -162,12 +160,12 @@ itemBoxSizer_AddRemove->Add(m_button_remove_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); //ListBox of attribute order - csvListBox_ = new wxListBox(itemDialog1, ID_LISTBOX, + csvListBox_ = new wxListBox(this, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); itemBoxSizer3->Add(csvListBox_, 1, wxGROW|wxALL, 1); //Arranger Area - wxPanel* itemPanel_Arranger = new wxPanel(itemDialog1, ID_PANEL10, + wxPanel* itemPanel_Arranger = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer3->Add(itemPanel_Arranger, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); @@ -202,7 +200,7 @@ itemBoxSizer2->Add(m_staticline1, 0, wxEXPAND | wxALL, 5 ); //file to import, file path and search button - wxPanel* itemPanel6 = new wxPanel(itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxPanel* itemPanel6 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer2->Add(itemPanel6, 0, wxEXPAND|wxALL, 1); wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxHORIZONTAL); @@ -218,7 +216,7 @@ itemBoxSizer7->Add(button_search, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // account to import - wxPanel* itemPanel7 = new wxPanel(itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxPanel* itemPanel7 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer2->Add(itemPanel7, 0, wxEXPAND|wxALL, 1); wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL); @@ -235,14 +233,14 @@ wxStaticLine* m_staticline2 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer2->Add(m_staticline2, 0, wxEXPAND | wxALL, 5 ); // Preview - wxStaticText* itemStaticText4 = new wxStaticText(itemDialog1, wxID_STATIC, _("Preview"), wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* itemStaticText4 = new wxStaticText(this, wxID_STATIC, _("Preview"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer2->Add(itemStaticText4, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_REPORT); itemBoxSizer2->Add(m_list_ctrl_, 0, wxALL|wxEXPAND, 5); //Import File button - wxPanel* itemPanel5 = new wxPanel(itemDialog1, ID_PANEL10, + wxPanel* itemPanel5 = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_RIGHT|wxALL, 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 08:57:33
|
Revision: 1658 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1658&view=rev Author: guanlisheng Date: 2012-01-18 08:57:22 +0000 (Wed, 18 Jan 2012) Log Message: ----------- use # Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 08:50:38 UTC (rev 1657) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 08:57:22 UTC (rev 1658) @@ -648,7 +648,7 @@ { this->m_list_ctrl_->ClearAll(); long index = 0; - this->m_list_ctrl_->InsertColumn(index, wxT("")); + this->m_list_ctrl_->InsertColumn(index, _("#")); for (std::vector<int>::const_iterator it = csvFieldOrder_.begin(); it != csvFieldOrder_.end(); ++ it) { ++ index; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-18 13:39:24
|
Revision: 1659 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1659&view=rev Author: guanlisheng Date: 2012-01-18 13:39:17 +0000 (Wed, 18 Jan 2012) Log Message: ----------- patch from Nikolay and polish CSV import UI Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 08:57:22 UTC (rev 1658) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-18 13:39:17 UTC (rev 1659) @@ -226,18 +226,19 @@ itemBoxSizer8->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString as = mmDBWrapper::getAccountsName(db_); - m_choice_account_ = new wxChoice(itemPanel7, wxID_ANY, wxDefaultPosition, wxSize(100, -1), as); + m_choice_account_ = new wxChoice(itemPanel7, wxID_ANY, wxDefaultPosition, wxSize(210, -1), as, 0); m_choice_account_->SetSelection(0); - itemBoxSizer8->Add(m_choice_account_, 1, wxALL|wxEXPAND, 5); + itemBoxSizer8->Add(m_choice_account_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticLine* m_staticline2 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer2->Add(m_staticline2, 0, wxEXPAND | wxALL, 5 ); + // Preview - wxStaticText* itemStaticText4 = new wxStaticText(this, wxID_STATIC, _("Preview"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer2->Add(itemStaticText4, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); + wxStaticBoxSizer* m_staticbox = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _T("&Preview")), wxVERTICAL); m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_REPORT); - itemBoxSizer2->Add(m_list_ctrl_, 0, wxALL|wxEXPAND, 5); + m_staticbox->Add(m_list_ctrl_, 1, wxGROW|wxALL, 5); + itemBoxSizer2->Add(m_staticbox, 0, wxALL|wxEXPAND, 5); //Import File button wxPanel* itemPanel5 = new wxPanel(this, ID_PANEL10, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-19 01:57:24
|
Revision: 1661 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1661&view=rev Author: guanlisheng Date: 2012-01-19 01:57:18 +0000 (Thu, 19 Jan 2012) Log Message: ----------- stop warning and format Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-18 14:20:47 UTC (rev 1660) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-19 01:57:18 UTC (rev 1661) @@ -208,7 +208,7 @@ wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxHORIZONTAL); itemPanel6->SetSizer(itemBoxSizer7); - wxStaticText* itemStaticText5 = new wxStaticText(itemPanel6, wxID_ANY, _("File to import:"), wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* itemStaticText5 = new wxStaticText(itemPanel6, wxID_ANY, _("File Name:"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_text_ctrl_ = new wxTextCtrl(itemPanel6, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, -1), 0); @@ -224,7 +224,7 @@ wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL); itemPanel7->SetSizer(itemBoxSizer8); - wxStaticText* itemStaticText6 = new wxStaticText(itemPanel7, wxID_ANY, _("Account to import:"), wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* itemStaticText6 = new wxStaticText(itemPanel7, wxID_ANY, _("Account :"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer8->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString as = mmDBWrapper::getAccountsName(db_); @@ -765,7 +765,7 @@ } } -void mmUnivCSVImportDialog::OnCheckOrRadioBox(wxCommandEvent& event) +void mmUnivCSVImportDialog::OnCheckOrRadioBox(wxCommandEvent& /*event*/) { //TODO match value to choices switch(m_radio_box_->GetSelection()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-01-19 03:32:55
|
Revision: 1662 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1662&view=rev Author: guanlisheng Date: 2012-01-19 03:32:49 +0000 (Thu, 19 Jan 2012) Log Message: ----------- patch from Stef: auto resize text ctrl Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-01-19 01:57:18 UTC (rev 1661) +++ trunk/mmex/src/univcsvdialog.cpp 2012-01-19 03:32:49 UTC (rev 1662) @@ -209,13 +209,13 @@ itemPanel6->SetSizer(itemBoxSizer7); wxStaticText* itemStaticText5 = new wxStaticText(itemPanel6, wxID_ANY, _("File Name:"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_LEFT|wxALL, 5); m_text_ctrl_ = new wxTextCtrl(itemPanel6, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, -1), 0); - itemBoxSizer7->Add(m_text_ctrl_, 0, wxALL|wxEXPAND, 5); + itemBoxSizer7->Add(m_text_ctrl_, 1, wxALL|wxGROW, 5); wxButton* button_search = new wxButton(itemPanel6, wxID_SEARCH, _("&Search")); - itemBoxSizer7->Add(button_search, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer7->Add(button_search, 0, wxALIGN_RIGHT|wxALL, 5); // account to import wxPanel* itemPanel7 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-21 13:32:10
|
Revision: 1857 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1857&view=rev Author: guanlisheng Date: 2012-02-21 13:32:04 +0000 (Tue, 21 Feb 2012) Log Message: ----------- refine Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-02-21 09:58:01 UTC (rev 1856) +++ trunk/mmex/src/univcsvdialog.cpp 2012-02-21 13:32:04 UTC (rev 1857) @@ -819,30 +819,23 @@ void mmUnivCSVDialog::OnStandard(wxCommandEvent& /*event*/) { - csvListBox_->Clear(); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_DATE], new mmListBoxItem(UNIV_CSV_DATE, CSVFieldName_[UNIV_CSV_DATE])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_PAYEE], new mmListBoxItem(UNIV_CSV_PAYEE, CSVFieldName_[UNIV_CSV_PAYEE])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_AMOUNT], new mmListBoxItem(UNIV_CSV_AMOUNT, CSVFieldName_[UNIV_CSV_AMOUNT])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_CATEGORY], new mmListBoxItem(UNIV_CSV_CATEGORY, CSVFieldName_[UNIV_CSV_CATEGORY])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_SUBCATEGORY], new mmListBoxItem(UNIV_CSV_SUBCATEGORY, CSVFieldName_[UNIV_CSV_SUBCATEGORY])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_TRANSNUM], new mmListBoxItem(UNIV_CSV_TRANSNUM, CSVFieldName_[UNIV_CSV_TRANSNUM])); - csvListBox_->Append(CSVFieldName_[UNIV_CSV_NOTES], new mmListBoxItem(UNIV_CSV_NOTES, CSVFieldName_[UNIV_CSV_NOTES])); + csvListBox_->Clear(); + csvFieldOrder_.clear(); + int standard[] = {UNIV_CSV_DATE, UNIV_CSV_PAYEE, UNIV_CSV_AMOUNT, UNIV_CSV_CATEGORY, UNIV_CSV_SUBCATEGORY, UNIV_CSV_TRANSNUM, UNIV_CSV_NOTES}; + for (int i = 0; i < sizeof(standard)/sizeof(UNIV_CSV_DATE); ++ i) + { + csvListBox_->Append(CSVFieldName_[i], new mmListBoxItem(i, CSVFieldName_[i])); + csvFieldOrder_.push_back(i); + } - csvFieldOrder_.clear(); - csvFieldOrder_.push_back(UNIV_CSV_DATE); - csvFieldOrder_.push_back(UNIV_CSV_PAYEE); - csvFieldOrder_.push_back(UNIV_CSV_AMOUNT); - csvFieldOrder_.push_back(UNIV_CSV_CATEGORY); - csvFieldOrder_.push_back(UNIV_CSV_SUBCATEGORY); - csvFieldOrder_.push_back(UNIV_CSV_TRANSNUM); - csvFieldOrder_.push_back(UNIV_CSV_NOTES); - - csvFieldCandicate_->Clear(); - csvFieldCandicate_->Append(CSVFieldName_[UNIV_CSV_DONTCARE], new mmListBoxItem(UNIV_CSV_DONTCARE, CSVFieldName_[UNIV_CSV_DONTCARE])); - csvFieldCandicate_->Append(CSVFieldName_[UNIV_CSV_WITHDRAWAL], new mmListBoxItem(UNIV_CSV_WITHDRAWAL, CSVFieldName_[UNIV_CSV_DEPOSIT])); - csvFieldCandicate_->Append(CSVFieldName_[UNIV_CSV_DEPOSIT], new mmListBoxItem(UNIV_CSV_DEPOSIT, CSVFieldName_[UNIV_CSV_DEPOSIT])); - - update_preview(); + csvFieldCandicate_->Clear(); + int rest[] = {UNIV_CSV_DONTCARE, UNIV_CSV_WITHDRAWAL, UNIV_CSV_DEPOSIT}; + for (int i = 0; i < sizeof(rest)/sizeof(UNIV_CSV_DATE); ++ i) + { + csvFieldCandicate_->Append(CSVFieldName_[i], new mmListBoxItem(i, CSVFieldName_[i])); + } + + update_preview(); } void mmUnivCSVDialog::OnSearch(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-04-04 06:24:51
|
Revision: 2102 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2102&view=rev Author: vomikan Date: 2012-04-04 06:24:45 +0000 (Wed, 04 Apr 2012) Log Message: ----------- fix to remove last not needed delimiter Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-03-31 03:35:13 UTC (rev 2101) +++ trunk/mmex/src/univcsvdialog.cpp 2012-04-04 06:24:45 UTC (rev 2102) @@ -697,6 +697,7 @@ wxFileOutputStream output(fileName); wxTextOutputStream text(output); + wxString buffer; int numRecords = 0; @@ -710,46 +711,48 @@ if (pBankTransaction->transType_ == TRANS_TYPE_TRANSFER_STR) continue; //TODO double amount = pBankTransaction->transType_ == TRANS_TYPE_DEPOSIT_STR ? pBankTransaction->amt_ : - pBankTransaction->amt_; + buffer = wxT(""); for (std::vector<int>::const_iterator sit = csvFieldOrder_.begin(); sit != csvFieldOrder_.end(); ++ sit) { switch (*sit) { case UNIV_CSV_DATE: - text << pBankTransaction->dateStr_; + buffer << pBankTransaction->dateStr_; break; case UNIV_CSV_PAYEE: - text << inQuotes(pBankTransaction->payeeStr_); + buffer << inQuotes(pBankTransaction->payeeStr_); break; case UNIV_CSV_AMOUNT: - text << amount; + buffer << amount; break; case UNIV_CSV_CATEGORY: - text << inQuotes(pBankTransaction->catStr_); + buffer << inQuotes(pBankTransaction->catStr_); break; case UNIV_CSV_SUBCATEGORY: - text << inQuotes(pBankTransaction->subCatStr_); + buffer << inQuotes(pBankTransaction->subCatStr_); break; case UNIV_CSV_TRANSNUM: - text << pBankTransaction->transNum_; + buffer << pBankTransaction->transNum_; break; case UNIV_CSV_NOTES: - text << inQuotes(pBankTransaction->notes_); + buffer << inQuotes(pBankTransaction->notes_); break; case UNIV_CSV_WITHDRAWAL: - text << (amount > 0 ? 0.0 : amount); + buffer << (amount > 0 ? 0.0 : amount); break; case UNIV_CSV_DEPOSIT: - text << (amount > 0 ? amount : 0); + buffer << (amount > 0 ? amount : 0); break; case UNIV_CSV_DONTCARE: default: break; } - text << delimit; + buffer << delimit; } - text << endl; + buffer.RemoveLast(1); + text << buffer << endl; ++ numRecords; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-04-10 11:50:49
|
Revision: 2138 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2138&view=rev Author: vomikan Date: 2012-04-10 11:50:43 +0000 (Tue, 10 Apr 2012) Log Message: ----------- fix exception in wrong file name entered Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-04-10 11:26:56 UTC (rev 2137) +++ trunk/mmex/src/univcsvdialog.cpp 2012-04-10 11:50:43 UTC (rev 2138) @@ -829,7 +829,9 @@ if (this->is_importer_) { wxString fileName = m_text_ctrl_->GetValue(); - if (!fileName.IsEmpty()) + wxFileName csv_file(fileName); + + if (!fileName.IsEmpty() && csv_file.FileExists()) { wxTextFile tFile(fileName); if (!tFile.Open()) @@ -1061,10 +1063,7 @@ void mmUnivCSVDialog::OnCheckOrRadioBox(wxCommandEvent& event) { wxString ud_delimit = textDelimiter4->GetValue(); - if (ud_delimit.IsEmpty()) { - event.Skip(); - return; - } + switch(m_radio_box_->GetSelection()) { case 0: @@ -1092,7 +1091,7 @@ textDelimiter4->SetEvtHandlerEnabled(true); event.Skip(); - this->update_preview(); + if (!delimit_.IsEmpty()) this->update_preview(); } void mmUnivCSVDialog::parseToken(int index, wxString& token) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-09 13:01:33
|
Revision: 2286 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2286&view=rev Author: guanlisheng Date: 2012-05-09 13:01:23 +0000 (Wed, 09 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-05-09 12:59:00 UTC (rev 2285) +++ trunk/mmex/src/univcsvdialog.cpp 2012-05-09 13:01:23 UTC (rev 2286) @@ -262,7 +262,7 @@ wxArrayString DateFormat = DateFormats(); wxString default_date_format = mmDBWrapper::getInfoSettingValue(db_, wxT("DATEFORMAT"), mmex::DEFDATEFORMAT); size_t i=0; - for(i; i<DateFormat.Count(); i++) + for(; i<DateFormat.Count(); i++) { if(default_date_format == DateFormat[i]) break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-02 21:12:06
|
Revision: 2495 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2495&view=rev Author: vomikan Date: 2012-06-02 21:12:00 +0000 (Sat, 02 Jun 2012) Log Message: ----------- event handler loop fix Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-06-02 21:05:34 UTC (rev 2494) +++ trunk/mmex/src/univcsvdialog.cpp 2012-06-02 21:12:00 UTC (rev 2495) @@ -1128,9 +1128,9 @@ default: break; } - + //FIXME textDelimiter4->SetEvtHandlerEnabled(false); - textDelimiter4->SetValue(delimit_); + *textDelimiter4<<(delimit_); textDelimiter4->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...> - 2012-06-15 21:35:50
|
Revision: 2613 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2613&view=rev Author: vomikan Date: 2012-06-15 21:35:42 +0000 (Fri, 15 Jun 2012) Log Message: ----------- fix for encoding when import, fix for progress bar Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-06-15 17:21:13 UTC (rev 2612) +++ trunk/mmex/src/univcsvdialog.cpp 2012-06-15 21:35:42 UTC (rev 2613) @@ -321,8 +321,7 @@ if (this->is_importer_) { - wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), - wxDefaultPosition, wxDefaultSize, 0); + wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import")); itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemButton_Import -> SetToolTip (_("Import File")); } @@ -453,7 +452,7 @@ wxTextFile tFile(fileName); if (!tFile.Open()) { - wxMessageBox(_("Unable to open file."), _("Universal CSV Import"), wxICON_WARNING); + wxMessageBox(_("Unable to open file."), _("Universal CSV Import"), wxOK|wxICON_WARNING); return; } csvFieldOrder_.clear(); @@ -500,7 +499,7 @@ //if the file does exist, then skip to else section if (!tFile.Exists() && !tFile.Create()) { - wxMessageBox(_("Unable to write to file."), _("Universal CSV Import"), wxICON_WARNING); + wxMessageBox(_("Unable to write to file."), _("Universal CSV Import"), wxOK|wxICON_WARNING); return; } else @@ -527,7 +526,7 @@ !isIndexPresent(UNIV_CSV_DEPOSIT)))) { wxMessageBox(_("Incorrect fields specified for CSV import! Requires at least Date, Amount and Payee."), - _("Universal CSV Import"), wxICON_WARNING); + _("Universal CSV Import"), wxOK|wxICON_WARNING); return; } @@ -543,14 +542,19 @@ mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); wxString fileName = m_text_ctrl_->GetValue(); - if (fileName.IsEmpty()) + wxFileName csv_file(fileName); + if (fileName.IsEmpty() || !csv_file.FileExists()) { return; } else { - wxFileInputStream input(fileName); - wxTextInputStream text(input); + wxTextFile tFile(fileName); + if (!tFile.Open()) + { + wxMessageBox(_("Unable to open file."), _("Universal CSV Import"), wxOK|wxICON_WARNING); + return; + } wxFileName logFile = mmex::GetLogDir(true); logFile.SetFullName(fileName); @@ -565,23 +569,23 @@ std::vector<int> CSV_transID; - wxProgressDialog progressDlg(_("Universal CSV Import"), _("Transactions imported from CSV: "), 100, + wxProgressDialog* progressDlg = new wxProgressDialog(_("Universal CSV Import"), + _("Transactions imported from CSV: "), 100, NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT); db_->Begin(); - while (!input.Eof()) + wxString line; + for (line = tFile.GetFirstLine(); !tFile.Eof(); line = tFile.GetNextLine()) { wxString progressMsg; progressMsg << _("Transactions imported from CSV\nto account ") << acctName << (": ") << countImported; - progressDlg.Update(static_cast<int>((static_cast<double>(countImported)/100.0 - countNumTotal/100) *99), progressMsg); - - if (!progressDlg.Update(-1)) // if cancel clicked + if (!progressDlg->Update(static_cast<int>((static_cast<double>(countImported)/100.0 + - countNumTotal/100) *99), progressMsg)) { canceledbyuser = true; break; // abort processing } - wxString line = text.ReadLine(); if (!line.IsEmpty()) ++countNumTotal; else @@ -601,6 +605,7 @@ val_ = 0.0; line = csv2tab_separated_values(line, delimit_); + wxStringTokenizer tkz(line, ("\t"), wxTOKEN_RET_EMPTY_ALL); int numTokens = (int)tkz.CountTokens(); if (numTokens < (int)csvFieldOrder_.size()) @@ -615,7 +620,7 @@ std::vector<wxString> tokens; while (tkz.HasMoreTokens()) { - wxString token = tkz.GetNextToken(); + wxString token = tkz.GetNextToken(); tokens.push_back(token); } @@ -692,7 +697,7 @@ *log_field_ << _("Line : ") << countNumTotal << _(" imported OK.") << ("\n"); } - progressDlg.Update(100); + progressDlg->Destroy(); wxString msg = wxString::Format(_("Total Lines : %d"), countNumTotal); msg << wxT ("\n"); @@ -860,10 +865,6 @@ //TODO re use code in OnImport & OnExport if (this->is_importer_) { - wxString date_format = mmOptions::instance().dateFormat;; - wxStringClientData* date_mask_obj = (wxStringClientData *)choiceDateFormat_->GetClientObject(choiceDateFormat_->GetSelection()); - if (date_mask_obj) date_format = date_mask_obj->GetData(); - wxString fileName = m_text_ctrl_->GetValue(); wxFileName csv_file(fileName); @@ -872,7 +873,7 @@ wxTextFile tFile(fileName); if (!tFile.Open()) { - wxMessageBox(_("Unable to open file."), _("Universal CSV Import"), wxICON_WARNING); + wxMessageBox(_("Unable to open file."), _("Universal CSV Import"), wxOK|wxICON_WARNING); return; } @@ -900,9 +901,7 @@ break; else { - if (col == date_position) token = mmParseDisplayStringToDate(db_, token, date_format).Format(date_format); m_list_ctrl_->SetItem(itemIndex, col, token); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-15 22:05:22
|
Revision: 2614 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2614&view=rev Author: vomikan Date: 2012-06-15 22:05:15 +0000 (Fri, 15 Jun 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-06-15 21:35:42 UTC (rev 2613) +++ trunk/mmex/src/univcsvdialog.cpp 2012-06-15 22:05:15 UTC (rev 2614) @@ -123,6 +123,9 @@ void mmUnivCSVDialog::CreateControls() { + wxSizerFlags flags; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxLEFT|wxTOP, 5); + // Define the staticBox font and set it as wxFONTWEIGHT_BOLD wxFont staticBoxFontSetting = this->GetFont(); staticBoxFontSetting.SetWeight(wxFONTWEIGHT_BOLD); @@ -152,23 +155,23 @@ //Add Remove Area wxPanel* itemPanel_AddRemove = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - itemBoxSizer3->Add(itemPanel_AddRemove, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + itemBoxSizer3->Add(itemPanel_AddRemove, flags); wxBoxSizer* itemBoxSizer_AddRemove = new wxBoxSizer(wxVERTICAL); itemPanel_AddRemove->SetSizer(itemBoxSizer_AddRemove); //Add button m_button_add_= new wxButton(itemPanel_AddRemove, wxID_ADD); - itemBoxSizer_AddRemove->Add(m_button_add_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_AddRemove->Add(m_button_add_, flags); //Remove button m_button_remove_ = new wxButton(itemPanel_AddRemove, wxID_REMOVE); - itemBoxSizer_AddRemove->Add(m_button_remove_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_AddRemove->Add(m_button_remove_, flags); //Standard MMEX CSV wxButton* itemButton_standard = new wxButton(itemPanel_AddRemove, wxID_STANDARD, _("&MMEX format"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer_AddRemove->Add(itemButton_standard, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_AddRemove->Add(itemButton_standard, flags); itemButton_standard->SetToolTip(_("MMEX standard format")); //ListBox of attribute order @@ -186,22 +189,22 @@ //Move Up button wxButton* itemButton_MoveUp = new wxButton(itemPanel_Arranger, wxID_UP); - itemBoxSizer_Arranger->Add(itemButton_MoveUp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_MoveUp, flags); itemButton_MoveUp -> SetToolTip (_("Move Up")); //Move down button wxButton* itemButton_MoveDown = new wxButton(itemPanel_Arranger, wxID_DOWN); - itemBoxSizer_Arranger->Add(itemButton_MoveDown, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_MoveDown, flags); itemButton_MoveDown -> SetToolTip (_("Move Down")); //Load Template button wxButton* itemButton_Load = new wxButton(itemPanel_Arranger, wxID_OPEN); - itemBoxSizer_Arranger->Add(itemButton_Load, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_Load, flags); itemButton_Load -> SetToolTip (_("Load Template")); //Save As Template button wxButton* itemButton_Save = new wxButton(itemPanel_Arranger, wxID_SAVEAS, _("Save As...")); - itemBoxSizer_Arranger->Add(itemButton_Save, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer_Arranger->Add(itemButton_Save, flags); itemButton_Save -> SetToolTip (_("Save Template")); wxStaticLine* m_staticline1 = new wxStaticLine(this, @@ -219,7 +222,7 @@ wxStaticText* itemStaticText5 = new wxStaticText(itemPanel6, wxID_ANY, _("File Name:"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer7->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer7->Add(itemStaticText5, flags); itemStaticText5->SetFont(staticBoxFontSetting); m_text_ctrl_ = new wxTextCtrl(itemPanel6, ID_FILE_NAME, @@ -244,7 +247,7 @@ //TODO replace to _("Account: ") wxStaticText* itemStaticText6 = new wxStaticText(itemPanel7, wxID_ANY, _("Account :")); - itemBoxSizer8->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer8->Add(itemStaticText6, flags); itemStaticText6->SetFont(staticBoxFontSetting); wxArrayString as = core_->getAccountsName(); @@ -256,7 +259,7 @@ itemBoxSizer2->Add(m_staticline2, 0, wxEXPAND | wxALL, 5 ); wxStaticText* itemStaticText66 = new wxStaticText(itemPanel7, wxID_ANY, wxString() << (" ") << _("Date Format") << (": "), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer8->Add(itemStaticText66, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer8->Add(itemStaticText66, flags); itemStaticText66->SetFont(staticBoxFontSetting); wxString default_date_format = mmDBWrapper::getInfoSettingValue(db_, ("DATEFORMAT"), mmex::DEFDATEFORMAT); @@ -564,8 +567,8 @@ wxTextOutputStream log(outputLog); /* date, payeename, amount(+/-), Number, status, category : subcategory, notes */ - int countNumTotal = 0; - int countImported = 0; + long countNumTotal = 0; + long countImported = 0; std::vector<int> CSV_transID; @@ -610,9 +613,9 @@ int numTokens = (int)tkz.CountTokens(); if (numTokens < (int)csvFieldOrder_.size()) { - log << _("Line : ") << countNumTotal + log << _("Line: ") << wxString::Format("%ld", countNumTotal) << _(" file contains insufficient number of tokens") << endl; - *log_field_ << _("Line : ") << countNumTotal + *log_field_ << _("Line: ") << wxString::Format("%ld", countNumTotal) << _(" file contains insufficient number of tokens") << ("\n"); continue; } @@ -635,10 +638,10 @@ if (dt_.Trim().IsEmpty() || payeeID_ == -1 || amount_.Trim().IsEmpty() || type_.Trim().IsEmpty()) { - log << _("Line : ") << countNumTotal - << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << endl; - *log_field_ << _("Line : ") << countNumTotal - << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << ("\n"); + log << _("Line: ") << wxString::Format("%ld", countNumTotal) + << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping.") << endl; + *log_field_ << _("Line: ") << wxString::Format("%ld", countNumTotal) + << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping.") << ("\n"); continue; } @@ -693,15 +696,15 @@ CSV_transID.push_back(transID); countImported++; - log << _("Line : ") << countNumTotal << _(" imported OK.") << endl; - *log_field_ << _("Line : ") << countNumTotal << _(" imported OK.") << ("\n"); + log << wxString::Format(_("Line : %ld imported OK."), countNumTotal) << endl; + *log_field_ << wxString::Format(_("Line : %ld imported OK."), countNumTotal) << ("\n"); } progressDlg->Destroy(); - wxString msg = wxString::Format(_("Total Lines : %d"), countNumTotal); + wxString msg = wxString::Format(_("Total Lines : %ld"), countNumTotal); msg << wxT ("\n"); - msg << wxString::Format(_("Total Imported : %d"), countImported); + msg << wxString::Format(_("Total Imported : %ld"), countImported); msg << wxT ("\n\n"); msg << wxString::Format(_("Log file written to : %s"), logFile.GetFullPath().c_str()); msg << wxT ("\n\n"); @@ -741,6 +744,7 @@ *log_field_ << msg; outputLog.Close(); + tFile.Close(); //clear the vector to avoid memory leak - done at same level created. CSV_transID.clear(); } @@ -768,14 +772,14 @@ wxEmptyString, wxEmptyString, wxEmptyString, chooseExt, wxFD_SAVE | wxFD_OVERWRITE_PROMPT); if (fileName.empty()) return; - correctEmptyFileExt(("csv"),fileName); + correctEmptyFileExt("csv",fileName); wxFileOutputStream output(fileName); wxTextOutputStream text(output); wxString buffer; wxDateTime trx_date; - int numRecords = 0; + long numRecords = 0; for(std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator it = core_->bTransactionList_.transactions_.begin(); it != core_->bTransactionList_.transactions_.end(); @@ -787,7 +791,7 @@ if (pBankTransaction->transType_ == TRANS_TYPE_TRANSFER_STR) continue; //TODO double amount = pBankTransaction->transType_ == TRANS_TYPE_DEPOSIT_STR ? pBankTransaction->amt_ : - pBankTransaction->amt_; - buffer = (""); + buffer.clear(); for (std::vector<int>::const_iterator sit = csvFieldOrder_.begin(); sit != csvFieldOrder_.end(); ++ sit) { switch (*sit) @@ -836,7 +840,7 @@ } } - wxString msg = wxString::Format(("%d transactions exported"), numRecords); + wxString msg = wxString::Format(("Transactions exported: %ld"), numRecords); mmShowErrorMessage(0, msg, _("Export to CSV")); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-10-28 13:15:48
|
Revision: 3097 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3097&view=rev Author: vomikan Date: 2012-10-28 13:15:41 +0000 (Sun, 28 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-10-28 12:45:37 UTC (rev 3096) +++ trunk/mmex/src/univcsvdialog.cpp 2012-10-28 13:15:41 UTC (rev 3097) @@ -880,7 +880,7 @@ } wxString msg = wxString::Format(wxTRANSLATE("Transactions exported: %ld"), numRecords); - mmShowErrorMessage(0, wxGetTranslation(msg), _("Export to CSV")); + mmShowErrorMessage(this, wxGetTranslation(msg), _("Export to CSV")); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-11 14:49:07
|
Revision: 3567 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3567&view=rev Author: vomikan Date: 2013-03-11 14:48:58 +0000 (Mon, 11 Mar 2013) Log Message: ----------- UI update Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2013-03-11 10:53:19 UTC (rev 3566) +++ trunk/mmex/src/univcsvdialog.cpp 2013-03-11 14:48:58 UTC (rev 3567) @@ -5,12 +5,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -71,15 +71,15 @@ } mmUnivCSVDialog::mmUnivCSVDialog( - mmCoreDB* core, - wxWindow* parent, + mmCoreDB* core, + wxWindow* parent, bool is_importer, - wxWindowID id, - const wxString& caption, - const wxPoint& pos, - const wxSize& size, + wxWindowID id, + const wxString& caption, + const wxPoint& pos, + const wxSize& size, long style -) : +) : core_(core), is_importer_(is_importer), delimit_(wxT(",")), @@ -101,10 +101,10 @@ Create(parent, id, caption, pos, size, style); } -bool mmUnivCSVDialog::Create(wxWindow* parent, wxWindowID id, - const wxString& caption, - const wxPoint& pos, - const wxSize& size, +bool mmUnivCSVDialog::Create(wxWindow* parent, wxWindowID id, + const wxString& caption, + const wxPoint& pos, + const wxSize& size, long style) { SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); @@ -122,7 +122,7 @@ } void mmUnivCSVDialog::CreateControls() -{ +{ wxSizerFlags flags, flagsExpand; flags.Align(wxALIGN_LEFT|wxALIGN_TOP).Border(wxLEFT|wxRIGHT|wxTOP, 5); flagsExpand.Align(wxALIGN_LEFT|wxALIGN_TOP).Border(wxLEFT|wxRIGHT|wxTOP, 5); @@ -130,15 +130,17 @@ // Define the staticBox font and set it as wxFONTWEIGHT_BOLD wxFont staticBoxFontSetting = this->GetFont(); staticBoxFontSetting.SetWeight(wxFONTWEIGHT_BOLD); - + + wxBoxSizer* itemBoxSizer0 = new wxBoxSizer(wxVERTICAL); + this->SetSizer(itemBoxSizer0); wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxHORIZONTAL); - this->SetSizer(itemBoxSizer1); + itemBoxSizer0->Add(itemBoxSizer1, 7, wxGROW|wxALL, 0); wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); itemBoxSizer1->Add(itemBoxSizer2, 8, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); itemBoxSizer1->Add(itemBoxSizer11, 5, wxGROW|wxALL, 5); - wxStaticText* itemStaticText3 = new wxStaticText(this, wxID_STATIC, + wxStaticText* itemStaticText3 = new wxStaticText(this, wxID_STATIC, _("Specify the order of fields in the CSV file")); itemBoxSizer2->Add(itemStaticText3, flags); itemStaticText3->SetFont(staticBoxFontSetting); @@ -147,14 +149,14 @@ itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); //CSV fields candicate - csvFieldCandicate_ = new wxListBox(this, ID_LISTBOX_CANDICATE, + csvFieldCandicate_ = new wxListBox(this, ID_LISTBOX_CANDICATE, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); itemBoxSizer3->Add(csvFieldCandicate_, 1, wxGROW|wxALL, 1); for(std::map<int, wxString>::const_iterator it = CSVFieldName_.begin(); it != CSVFieldName_.end(); it ++) csvFieldCandicate_->Append(it->second, new mmListBoxItem(it->first, it->second)); //Add Remove Area - wxPanel* itemPanel_AddRemove = new wxPanel(this, ID_PANEL10, + wxPanel* itemPanel_AddRemove = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer3->Add(itemPanel_AddRemove, flags); @@ -168,19 +170,19 @@ //Remove button m_button_remove_ = new wxButton(itemPanel_AddRemove, wxID_REMOVE); itemBoxSizer_AddRemove->Add(m_button_remove_, flags); - + //Standard MMEX CSV wxButton* itemButton_standard = new wxButton(itemPanel_AddRemove, wxID_STANDARD, _("&MMEX format")); itemBoxSizer_AddRemove->Add(itemButton_standard, flags); itemButton_standard->SetToolTip(_("MMEX standard format")); //ListBox of attribute order - csvListBox_ = new wxListBox(this, ID_LISTBOX, + csvListBox_ = new wxListBox(this, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB); itemBoxSizer3->Add(csvListBox_, 1, wxGROW|wxALL, 1); //Arranger Area - wxPanel* itemPanel_Arranger = new wxPanel(this, ID_PANEL10, + wxPanel* itemPanel_Arranger = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer3->Add(itemPanel_Arranger, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); @@ -196,7 +198,7 @@ wxButton* itemButton_MoveDown = new wxButton(itemPanel_Arranger, wxID_DOWN, _("&Down")); itemBoxSizer_Arranger->Add(itemButton_MoveDown, flags); itemButton_MoveDown -> SetToolTip (_("Move &Down")); - + //Load Template button wxButton* itemButton_Load = new wxButton(itemPanel_Arranger, wxID_OPEN, _("&Open")); itemBoxSizer_Arranger->Add(itemButton_Load, flags); @@ -256,7 +258,7 @@ itemBoxSizer8->Add(itemStaticText66, flags); itemStaticText66->SetFont(staticBoxFontSetting); //itemStaticText66->Enable(!this->is_importer_); - + wxString default_date_format = core_->dbInfoSettings_->GetStringSetting(wxT("DATEFORMAT"), mmex::DEFDATEFORMAT); choiceDateFormat_ = new wxChoice(itemPanel7, ID_DIALOG_OPTIONS_DATE_FORMAT); for(size_t i = 0; i < date_format_mask().Count(); ++i) @@ -271,9 +273,9 @@ wxString choices[] = { _("Comma"), _("Semicolon"), _("TAB"), _("User Defined")}; int num = sizeof(choices) / sizeof(wxString); m_radio_box_ = new wxRadioBox(this, wxID_RADIO_BOX, wxT(""), wxDefaultPosition, wxDefaultSize, num, choices, 4, wxRA_SPECIFY_COLS); - + delimit_ = core_->dbInfoSettings_->GetStringSetting(wxT("DELIMITER"), mmex::DEFDELIMTER); - + textDelimiter4 = new wxTextCtrl( this, ID_UD_DELIMIT, delimit_, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); textDelimiter4->SetToolTip(_("Specify the delimiter to use when importing/exporting CSV files")); textDelimiter4->SetMaxLength(1); @@ -294,58 +296,59 @@ wxStaticBox* importExportStaticBox = new wxStaticBox(this, wxID_ANY, _("CSV Delimiter")); importExportStaticBox->SetFont(staticBoxFontSetting); wxStaticBoxSizer* importExportStaticBoxSizer = new wxStaticBoxSizer(importExportStaticBox, wxHORIZONTAL); - + itemBoxSizer2->Add(importExportStaticBoxSizer, 0, wxALL|wxEXPAND, 5); - + importExportStaticBoxSizer->Add(m_radio_box_, 0, wxALL|wxEXPAND, 3); importExportStaticBoxSizer->Add(textDelimiter4, 0, wxALIGN_BOTTOM|wxALL, 8); - // Preview + // Preview wxStaticBoxSizer* m_staticbox = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _T("&Preview")), wxVERTICAL); - - m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 100), wxLC_REPORT); + + m_list_ctrl_ = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT); m_staticbox->Add(m_list_ctrl_, 1, wxGROW|wxALL, 5); - itemBoxSizer2->Add(m_staticbox, 0, wxALL|wxEXPAND, 5); + itemBoxSizer0->Add(m_staticbox, 3, wxALL|wxEXPAND, 5); //Import File button - wxPanel* itemPanel5 = new wxPanel(this, ID_PANEL10, + wxPanel* itemPanel5 = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_RIGHT|wxALL, 1); + itemBoxSizer0->Add(itemPanel5, 0, wxALIGN_RIGHT|wxALL, 1); wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemPanel5->SetSizer(itemBoxSizer6); if (this->is_importer_) { - wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), + wxButton* itemButton_Import = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_IMPORT, _("&Import"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer6->Add(itemButton_Import, 0, wxALIGN_CENTER|wxALL, 5); itemButton_Import -> SetToolTip (_("Import File")); } else { - wxButton* itemButton_Export = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_EXPORT, _("&Export"), + wxButton* itemButton_Export = new wxButton(itemPanel5, ID_UNIVCSVBUTTON_EXPORT, _("&Export"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer6->Add(itemButton_Export, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer6->Add(itemButton_Export, 0, wxALIGN_CENTER|wxALL, 5); itemButton_Export -> SetToolTip (_("Export File")); } wxButton* itemCancelButton = new wxButton(itemPanel5, wxID_CANCEL, _("&Cancel")); - itemBoxSizer6->Add(itemCancelButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer6->Add(itemCancelButton, 0, wxALIGN_CENTER|wxALL, 5); itemCancelButton->SetFocus(); - - //Log viewer + + //Log viewer wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxVERTICAL); - + itemBoxSizer11->Add(itemBoxSizer22, 1, wxGROW|wxALL, 0); - + log_field_ = new wxTextCtrl( this, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL ); itemBoxSizer22->Add(log_field_, 1, wxGROW|wxALL, 5); - - wxButton* itemClearButton = new wxButton(this, wxID_CLEAR); - itemBoxSizer22->Add(itemClearButton, 0, wxALIGN_LEFT|wxALL, 5); - itemClearButton->Connect(wxID_CLEAR, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmUnivCSVDialog::OnButtonClear), NULL, this); - + + wxButton* itemClearButton = new wxButton(this, wxID_CLEAR, _("Clear")); + itemBoxSizer22->Add(itemClearButton, 0, wxALIGN_CENTER|wxALL, 5); + itemClearButton->Connect(wxID_CLEAR, wxEVT_COMMAND_BUTTON_CLICKED + , wxCommandEventHandler(mmUnivCSVDialog::OnButtonClear), NULL, this); + } bool mmUnivCSVDialog::ShowToolTips() @@ -374,7 +377,7 @@ csvListBox_->Append(item->getName(), new mmListBoxItem(item->getIndex(), item->getName())); csvFieldOrder_.push_back(item->getIndex()); - if (item->getIndex() != UNIV_CSV_DONTCARE) + if (item->getIndex() != UNIV_CSV_DONTCARE) { csvFieldCandicate_->Delete(index); if (index < (int)csvFieldCandicate_->GetCount()) @@ -442,7 +445,7 @@ void mmUnivCSVDialog::OnLoad(wxCommandEvent& /*event*/) { - wxString fileName = wxFileSelector(_("Choose Universal CSV format file to load"), + wxString fileName = wxFileSelector(_("Choose Universal CSV format file to load"), wxEmptyString, wxEmptyString, wxEmptyString, wxT("CSV Template(*.mcv)|*.mcv"), wxFD_FILE_MUST_EXIST); if (!fileName.empty()) { @@ -485,7 +488,7 @@ //Saves the field order to a template file void mmUnivCSVDialog::OnSave(wxCommandEvent& /*event*/) { - wxString fileName = wxFileSelector(_("Choose Universal CSV format file to save"), + wxString fileName = wxFileSelector(_("Choose Universal CSV format file to save"), wxEmptyString, wxEmptyString, wxEmptyString, wxT("CSV Template(*.mcv)|*.mcv"), wxFD_SAVE); if (!fileName.empty()) { @@ -517,9 +520,9 @@ void mmUnivCSVDialog::OnImport(wxCommandEvent& /*event*/) { // date, amount, payee are required - if (!isIndexPresent(UNIV_CSV_DATE) || + if (!isIndexPresent(UNIV_CSV_DATE) || !isIndexPresent(UNIV_CSV_PAYEE) || - (!isIndexPresent(UNIV_CSV_AMOUNT) && (!isIndexPresent(UNIV_CSV_WITHDRAWAL) || + (!isIndexPresent(UNIV_CSV_AMOUNT) && (!isIndexPresent(UNIV_CSV_WITHDRAWAL) || !isIndexPresent(UNIV_CSV_DEPOSIT)))) { wxMessageBox(_("Incorrect fields specified for CSV import! Requires at least Date, Amount and Payee."), @@ -533,11 +536,11 @@ if (fromAccountID_ > 0) { - + boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(fromAccountID_).lock(); wxASSERT(pCurrencyPtr); mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - + wxString fileName = m_text_ctrl_->GetValue(); wxFileName csv_file(fileName); if (fileName.IsEmpty() || !csv_file.FileExists()) @@ -559,7 +562,7 @@ wxFileOutputStream outputLog(logFile.GetFullPath()); wxTextOutputStream log(outputLog); - + /* date, payeename, amount(+/-), Number, status, category : subcategory, notes */ long countNumTotal = 0; long countImported = 0; @@ -602,17 +605,17 @@ val_ = 0.0; line = csv2tab_separated_values(line, delimit_); - wxStringTokenizer tkz(line, wxT("\t"), wxTOKEN_RET_EMPTY_ALL); + wxStringTokenizer tkz(line, wxT("\t"), wxTOKEN_RET_EMPTY_ALL); int numTokens = (int)tkz.CountTokens(); if (numTokens < (int)csvFieldOrder_.size()) { - log << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) + log << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) << _(" file contains insufficient number of tokens") << endl; - *log_field_ << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) + *log_field_ << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) << _(" file contains insufficient number of tokens") << wxT("\n"); continue; } - + std::vector<wxString> tokens; while (tkz.HasMoreTokens()) { @@ -622,7 +625,7 @@ for (size_t i = 0; i < csvFieldOrder_.size(); ++i) { - if (tokens.size() >= i) + if (tokens.size() >= i) { parseToken(csvFieldOrder_[i], tokens[i]); } @@ -633,7 +636,7 @@ { log << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << endl; - *log_field_ << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) + *log_field_ << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << wxT("\n"); continue; } @@ -665,11 +668,11 @@ // if (pCategory->parent_.lock()) // { // categID_ = pCategory->parent_.lock()->categID_; - // subCategID_ = pCategory->categID_; + // subCategID_ = pCategory->categID_; // } // else // { - // categID_ = pCategory->categID_; + // categID_ = pCategory->categID_; // subCategID_ = -1; // } //} @@ -701,12 +704,12 @@ *log_field_ << _("Line : ") << wxString::Format(wxT("%ld"), countNumTotal) << _(" imported OK.") << wxT("\n"); } - progressDlg->Destroy(); + progressDlg->Destroy(); //FIXME: %ld - wxString msg = wxString::Format(_("Total Lines : %d"), countNumTotal); + wxString msg = wxString::Format(_("Total Lines : %d"), countNumTotal); msg << wxT ("\n"); - msg << wxString::Format(_("Total Imported : %d"), countImported); + msg << wxString::Format(_("Total Imported : %d"), countImported); msg << wxT ("\n\n"); msg << wxString::Format(_("Log file written to : %s"), logFile.GetFullPath().c_str()); msg << wxT ("\n\n"); @@ -717,16 +720,16 @@ if (countImported > 0) msg << _ ("Imported transactions have been flagged so you can review them."); - + // Since all database transactions are only in memory, if (!canceledbyuser) { - // we need to save them to the database. + // we need to save them to the database. db_->Commit(); importSuccessful_ = true; msg << _("Transactions saved to database in account: ") << acctName; } - else + else { // we need to remove the transactions from the transaction list while (countImported > 0) @@ -766,7 +769,7 @@ wxString fileName = wxFileSelector(_("Choose CSV data file to Export"), wxEmptyString, wxEmptyString, wxEmptyString, chooseExt, wxFD_SAVE | wxFD_OVERWRITE_PROMPT); if (fileName.empty()) return; - + correctEmptyFileExt(wxT("csv"),fileName); wxFileOutputStream output(fileName); @@ -822,7 +825,7 @@ wxString amount_tmp; mmex::formatDoubleToCurrencyEdit(-value, amount_tmp); - + buffer = wxT(""); for (std::vector<int>::const_iterator sit = csvFieldOrder_.begin(); sit != csvFieldOrder_.end(); ++ sit) { @@ -863,7 +866,7 @@ default: break; } - + buffer << delimit; } @@ -898,9 +901,9 @@ else if (item_name == _("Date")) { date_position = index; } - + } - + //TODO re use code in OnImport & OnExport if (this->is_importer_) { @@ -938,7 +941,7 @@ if (col >= m_list_ctrl_->GetColumnCount()) break; - else + else { m_list_ctrl_->SetItem(itemIndex, col, token); } @@ -974,12 +977,12 @@ int fAccountID = pBankTransaction->accountID_; int tAccountID = pBankTransaction->toAccountID_; const wxString amtSeparator = core_->accountList_.getAccountCurrencyDecimalChar(fromAccountID); - + double value = pBankTransaction->amt_; double tovalue = 0; wxString toamount = wxT(""); double value_temp = value; - + if (type == wxT("Transfer")) { const wxString fromAccount = core_->accountList_.GetAccountName(fAccountID); @@ -1000,11 +1003,11 @@ } else if (type == wxT("Withdrawal")) value = -value; - + wxString amount = adjustedExportAmount(amtSeparator, wxString()<<value); mmex::formatCurrencyToDouble(amount, value); mmex::formatDoubleToCurrencyEdit(value, amount); - + wxString amount_tmp; mmex::formatDoubleToCurrencyEdit(-value, amount_tmp); @@ -1057,12 +1060,12 @@ } if (col >= m_list_ctrl_->GetColumnCount()) break; - else + else { if (col == date_position) text = mmParseDisplayStringToDate(text, date_format).Format(date_format); m_list_ctrl_->SetItem(itemIndex, col, text); } - + } if (++ count >= 10) break; ++ row; @@ -1101,7 +1104,7 @@ wxString item_name = item->getName(); csvListBox_->Delete(index); - csvListBox_->Insert(item_name, index + 1, new mmListBoxItem(item_index, item_name)); + csvListBox_->Insert(item_name, index + 1, new mmListBoxItem(item_index, item_name)); csvListBox_->SetSelection(index + 1, true); std::swap(csvFieldOrder_[index + 1], csvFieldOrder_[index]); @@ -1112,7 +1115,7 @@ void mmUnivCSVDialog::OnStandard(wxCommandEvent& /*event*/) { - csvListBox_->Clear(); + csvListBox_->Clear(); csvFieldOrder_.clear(); int standard[] = {UNIV_CSV_DATE, UNIV_CSV_PAYEE, UNIV_CSV_AMOUNT, UNIV_CSV_CATEGORY, UNIV_CSV_SUBCATEGORY, UNIV_CSV_TRANSNUM, UNIV_CSV_NOTES, UNIV_CSV_TOAMOUNT}; for (size_t i = 0; i < sizeof(standard)/sizeof(UNIV_CSV_DATE); ++ i) @@ -1127,7 +1130,7 @@ { csvFieldCandicate_->Append(CSVFieldName_[rest[i]], new mmListBoxItem(rest[i], CSVFieldName_[rest[i]])); } - + update_preview(); } @@ -1135,13 +1138,13 @@ { wxString fileName = m_text_ctrl_->GetValue(); - fileName = wxFileSelector(_("Choose CSV data file to import"), + fileName = wxFileSelector(_("Choose CSV data file to import"), wxEmptyString, fileName, wxEmptyString, wxT("*.csv"), wxFD_FILE_MUST_EXIST); if (!fileName.IsEmpty()) { m_text_ctrl_->SetValue(fileName); - + wxTextFile tFile(fileName); if (!tFile.Open()) { @@ -1209,7 +1212,7 @@ } textDelimiter4->SetEvtHandlerEnabled(false); - textDelimiter4->SetValue(delimit_); + textDelimiter4->SetValue(delimit_); textDelimiter4->SetEvtHandlerEnabled(true); event.Skip(); @@ -1218,7 +1221,7 @@ void mmUnivCSVDialog::parseToken(int index, wxString& token) { - if (token.Trim().IsEmpty()) return; + if (token.Trim().IsEmpty()) return; wxString date_format = DisplayDate2FormatDate(choiceDateFormat_->GetStringSelection()); switch (index) @@ -1262,7 +1265,7 @@ case UNIV_CSV_SUBCATEGORY: if (categID_ == -1) return; - + subCategID_ = core_->categoryList_.GetSubCategoryID(categID_, token); if (subCategID_ == -1) subCategID_ = core_->categoryList_.AddSubCategory(categID_, token); @@ -1279,7 +1282,7 @@ case UNIV_CSV_DONTCARE: // do nothing break; - + case UNIV_CSV_DEPOSIT: if (!token.ToDouble(&val_)) return; if (val_ <= 0.0) return; @@ -1310,7 +1313,7 @@ void mmUnivCSVDialog::OnFileNameChanged(wxCommandEvent& event) { wxString file_name = m_text_ctrl_->GetValue(); - if (file_name.Contains(wxT("\n")) || file_name.Contains(wxT("file://"))) + if (file_name.Contains(wxT("\n")) || file_name.Contains(wxT("file://"))) { file_name.Replace(wxT("\n"), wxT("")); @@ -1319,11 +1322,11 @@ file_name.Trim(); #endif m_text_ctrl_->SetEvtHandlerEnabled(false); - m_text_ctrl_->SetValue(file_name); + m_text_ctrl_->SetValue(file_name); m_text_ctrl_->SetEvtHandlerEnabled(true); } event.Skip(); - + wxFileName csv_file(file_name); if (csv_file.FileExists()) this->update_preview(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |