From: <vo...@us...> - 2012-05-08 18:36:07
|
Revision: 2264 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2264&view=rev Author: vomikan Date: 2012-05-08 18:36:01 +0000 (Tue, 08 May 2012) Log Message: ----------- UI elements id moved to header file Modified Paths: -------------- trunk/mmex/src/univcsvdialog.cpp trunk/mmex/src/univcsvdialog.h Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2012-05-08 14:15:16 UTC (rev 2263) +++ trunk/mmex/src/univcsvdialog.cpp 2012-05-08 18:36:01 UTC (rev 2264) @@ -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 @@ -24,7 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(mmUnivCSVDialog, wxDialog) - BEGIN_EVENT_TABLE(mmUnivCSVDialog, wxDialog) EVT_BUTTON(wxID_ADD, mmUnivCSVDialog::OnAdd) EVT_BUTTON(ID_UNIVCSVBUTTON_IMPORT, mmUnivCSVDialog::OnImport) @@ -39,7 +38,7 @@ EVT_CHOICE(wxID_ACCOUNT, mmUnivCSVDialog::OnAccountChange) EVT_LISTBOX(ID_LISTBOX, mmUnivCSVDialog::OnListBox) EVT_RADIOBOX(wxID_RADIO_BOX, mmUnivCSVDialog::OnCheckOrRadioBox) - EVT_CHOICE(ID_DIALOG_OPTIONS_DATE_FORMAT, mmUnivCSVDialog::OnDateFormatChanged) + EVT_CHOICE(ID_UNIVCSVDIALOG_DATE_FORMAT, mmUnivCSVDialog::OnDateFormatChanged) END_EVENT_TABLE() //---------------------------------------------------------------------------- @@ -71,15 +70,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(",")), @@ -100,10 +99,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); @@ -121,11 +120,11 @@ } void mmUnivCSVDialog::CreateControls() -{ +{ // Define the staticBox font and set it as wxFONTWEIGHT_BOLD wxFont staticBoxFontSetting = this->GetFont(); staticBoxFontSetting.SetWeight(wxFONTWEIGHT_BOLD); - + wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxHORIZONTAL); this->SetSizer(itemBoxSizer1); wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); @@ -133,7 +132,7 @@ 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"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); itemStaticText3->SetFont(staticBoxFontSetting); @@ -142,14 +141,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, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); @@ -157,22 +156,22 @@ itemPanel_AddRemove->SetSizer(itemBoxSizer_AddRemove); //Add button - m_button_add_= new wxButton(itemPanel_AddRemove, wxID_ADD, _("Add"), + m_button_add_= new wxButton(itemPanel_AddRemove, wxID_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer_AddRemove->Add(m_button_add_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); //Remove button - m_button_remove_ = new wxButton(itemPanel_AddRemove, wxID_REMOVE, _("Remove"), + 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(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); @@ -180,13 +179,13 @@ itemPanel_Arranger->SetSizer(itemBoxSizer_Arranger); //Move Up button - wxButton* itemButton_MoveUp = new wxButton(itemPanel_Arranger, wxID_UP, _("&Up"), + 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"), + 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")); @@ -196,15 +195,15 @@ wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer_Arranger->Add(itemButton_standard, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton_standard->SetToolTip(_("MMEX standard format")); - + //Load Template button - wxButton* itemButton_Load = new wxButton(itemPanel_Arranger, wxID_OPEN, _("&Open"), + wxButton* itemButton_Load = new wxButton(itemPanel_Arranger, wxID_OPEN, _("&Open"), wxDefaultPosition, wxDefaultSize, 0); 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(itemPanel_Arranger, wxID_SAVEAS, _("Save As..."), + wxButton* itemButton_Save = new wxButton(itemPanel_Arranger, wxID_SAVEAS, _("Save As..."), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer_Arranger->Add(itemButton_Save, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton_Save -> SetToolTip (_("Save Template")); @@ -258,7 +257,7 @@ itemBoxSizer8->Add(itemStaticText66, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemStaticText66->SetFont(staticBoxFontSetting); //itemStaticText66->Enable(!this->is_importer_); - + wxArrayString itemChoice7Strings = itemChoiceStrings(); wxArrayString DateFormat = DateFormats(); wxString default_date_format = mmDBWrapper::getInfoSettingValue(db_, wxT("DATEFORMAT"), mmex::DEFDATEFORMAT); @@ -269,7 +268,7 @@ break; } - choiceDateFormat_ = new wxChoice(itemPanel7, ID_DIALOG_OPTIONS_DATE_FORMAT, wxDefaultPosition, wxSize(140, -1), itemChoice7Strings, 0); + choiceDateFormat_ = new wxChoice(itemPanel7, ID_UNIVCSVDIALOG_DATE_FORMAT, wxDefaultPosition, wxSize(140, -1), itemChoice7Strings, 0); choiceDateFormat_->SetSelection(i); //choiceDateFormat_->Enable(!this->is_importer_); itemBoxSizer8->Add(choiceDateFormat_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -278,9 +277,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_ = mmDBWrapper::getInfoSettingValue(db_, 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); @@ -301,21 +300,21 @@ 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_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, + wxPanel* itemPanel5 = new wxPanel(this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_RIGHT|wxALL, 1); @@ -324,14 +323,14 @@ 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); 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); itemButton_Export -> SetToolTip (_("Export File")); @@ -340,19 +339,19 @@ wxButton* itemCancelButton = new wxButton(itemPanel5, wxID_CANCEL, _("&Cancel")); itemBoxSizer6->Add(itemCancelButton, 0, wxALIGN_CENTER_HORIZONTAL|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, _("&Clear")); itemBoxSizer22->Add(itemClearButton, 0, wxALIGN_LEFT|wxALL, 5); itemClearButton->Connect(wxID_CLEAR, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmUnivCSVDialog::OnButtonClear), NULL, this); - + } bool mmUnivCSVDialog::ShowToolTips() @@ -381,7 +380,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()) @@ -449,7 +448,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()) { @@ -492,7 +491,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()) { @@ -524,9 +523,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."), @@ -540,11 +539,11 @@ if (fromAccountID_ > 0) { - + boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->getCurrencyWeakPtr(fromAccountID_).lock(); wxASSERT(pCurrencyPtr); mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - + wxString fileName = m_text_ctrl_->GetValue(); if (fileName.IsEmpty()) { @@ -561,7 +560,7 @@ wxFileOutputStream outputLog(logFile.GetFullPath()); wxTextOutputStream log(outputLog); - + /* date, payeename, amount(+/-), Number, status, category : subcategory, notes */ int countNumTotal = 0; int countImported = 0; @@ -604,17 +603,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 : ") << countNumTotal + log << _("Line : ") << countNumTotal << _(" file contains insufficient number of tokens") << endl; - *log_field_ << _("Line : ") << countNumTotal + *log_field_ << _("Line : ") << countNumTotal << _(" file contains insufficient number of tokens") << wxT("\n"); continue; } - + std::vector<wxString> tokens; while (tkz.HasMoreTokens()) { @@ -624,7 +623,7 @@ for (size_t i = 0; i < csvFieldOrder_.size(); ++i) { - if (tokens.size() >= i) + if (tokens.size() >= i) { parseToken(csvFieldOrder_[i], tokens[i]); } @@ -633,9 +632,9 @@ if (dt_.Trim().IsEmpty() || payeeID_ == -1 || amount_.Trim().IsEmpty() || type_.Trim().IsEmpty()) { - log << _("Line : ") << countNumTotal + log << _("Line : ") << countNumTotal << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << endl; - *log_field_ << _("Line : ") << countNumTotal + *log_field_ << _("Line : ") << countNumTotal << _(" One of the following fields: Date, Payee, Amount, Type is missing, skipping") << wxT("\n"); continue; } @@ -660,11 +659,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; } } @@ -695,11 +694,11 @@ *log_field_ << _("Line : ") << countNumTotal << _(" imported OK.") << wxT("\n"); } - progressDlg.Update(100); + progressDlg.Update(100); - 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"); @@ -713,16 +712,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) @@ -762,7 +761,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); @@ -781,7 +780,7 @@ { 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) { @@ -819,7 +818,7 @@ default: break; } - + buffer << delimit; } @@ -854,9 +853,9 @@ else if (item_name == _("Date")) { date_position = index; } - + } - + //TODO re use code in OnImport & OnExport if (this->is_importer_) { @@ -896,11 +895,11 @@ if (col >= m_list_ctrl_->GetColumnCount()) break; - else + else { if (col == date_position) token = mmParseDisplayStringToDate(db_, token, date_format).Format(date_format_); m_list_ctrl_->SetItem(itemIndex, col, token); - + } } @@ -937,7 +936,7 @@ long itemIndex = m_list_ctrl_->InsertItem(row, buf, 0); buf.Printf(_T("%d"), row + 1); m_list_ctrl_->SetItem(itemIndex, col, buf); - + for (std::vector<int>::const_iterator sit = csvFieldOrder_.begin(); sit != csvFieldOrder_.end(); ++ sit) { ++ col; @@ -977,12 +976,12 @@ } if (col >= m_list_ctrl_->GetColumnCount()) break; - else + else { if (col == date_position) text = mmParseDisplayStringToDate(db_, text, date_format).Format(date_format); m_list_ctrl_->SetItem(itemIndex, col, text); } - + } if (++ count >= 10) break; ++ row; @@ -1021,7 +1020,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]); @@ -1032,7 +1031,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}; for (size_t i = 0; i < sizeof(standard)/sizeof(UNIV_CSV_DATE); ++ i) @@ -1047,7 +1046,7 @@ { csvFieldCandicate_->Append(CSVFieldName_[rest[i]], new mmListBoxItem(rest[i], CSVFieldName_[rest[i]])); } - + update_preview(); } @@ -1055,13 +1054,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()) { @@ -1129,7 +1128,7 @@ } textDelimiter4->SetEvtHandlerEnabled(false); - textDelimiter4->SetValue(delimit_); + textDelimiter4->SetValue(delimit_); textDelimiter4->SetEvtHandlerEnabled(true); event.Skip(); @@ -1138,7 +1137,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) @@ -1182,7 +1181,7 @@ case UNIV_CSV_SUBCATEGORY: if (categID_ == -1) return; - + subCategID_ = core_->getSubCategoryID(categID_, token); if (subCategID_ == -1) subCategID_ = core_->addSubCategory(categID_, token); @@ -1199,7 +1198,7 @@ case UNIV_CSV_DONTCARE: // do nothing break; - + case UNIV_CSV_DEPOSIT: if (!token.ToDouble(&val_)) return; if (val_ <= 0.0) return; @@ -1230,7 +1229,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("")); @@ -1239,11 +1238,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(); Modified: trunk/mmex/src/univcsvdialog.h =================================================================== --- trunk/mmex/src/univcsvdialog.h 2012-05-08 14:15:16 UTC (rev 2263) +++ trunk/mmex/src/univcsvdialog.h 2012-05-08 18:36:01 UTC (rev 2264) @@ -23,25 +23,11 @@ #include "defs.h" #include "mmcoredb.h" -#define ID_MYDIALOG8 10040 #define SYMBOL_UNIVCSVDIALOG_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX #define SYMBOL_UNIVCSVDIALOG_TITLE _("Universal CSV Dialog") -#define SYMBOL_UNIVCSVDIALOG_IDNAME ID_MYDIALOG8 + #define SYMBOL_UNIVCSVDIALOG_SIZE wxSize(400, 300) #define SYMBOL_UNIVCSVDIALOG_POSITION wxDefaultPosition -#define ID_LISTBOX 10090 -#define ID_PANEL10 10091 -#define ID_PANEL_LOGS 10092 -#define ID_UNIVCSVBUTTON_IMPORT 10094 -#define ID_UNIVCSVBUTTON_EXPORT 10095 -#define ID_LISTBOX_CANDICATE 10099 -#define wxID_SEARCH 10100 -#define wxID_RADIO_BOX 10101 -#define wxID_STANDARD 10102 -#define wxID_ACCOUNT 10103 -#define ID_UD_DELIMIT 10104 -#define ID_FILE_NAME 10105 -////@end control identifiers /*! * Compatibility @@ -54,6 +40,23 @@ #define wxFIXED_MINSIZE 0 #endif +enum { + ID_UNIVCSVDIALOG_DATE_FORMAT = wxID_HIGHEST + 1, + ID_LISTBOX, + ID_PANEL10, + ID_PANEL_LOGS, + ID_UNIVCSVBUTTON_IMPORT, + ID_UNIVCSVBUTTON_EXPORT, + ID_LISTBOX_CANDICATE, + wxID_SEARCH, + wxID_RADIO_BOX, + wxID_STANDARD, + wxID_ACCOUNT, + ID_UD_DELIMIT, + ID_FILE_NAME, + SYMBOL_UNIVCSVDIALOG_IDNAME, +}; + class mmUnivCSVDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(mmUnivCSVDialog) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |