From: <gua...@us...> - 2013-06-16 12:13:43
|
Revision: 4101 http://sourceforge.net/p/moneymanagerex/code/4101 Author: guanlisheng Date: 2013-06-16 12:13:40 +0000 (Sun, 16 Jun 2013) Log Message: ----------- use object direcly Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-06-16 11:48:49 UTC (rev 4100) +++ trunk/src/mmex.cpp 2013-06-16 12:13:40 UTC (rev 4101) @@ -1007,31 +1007,28 @@ if ( (repeats < 11) || (numRepeats > 0) || (repeats > 14)) { continueExecution = true; - mmBankTransaction* pTransaction; - mmBankTransaction* pTemp(new mmBankTransaction(m_core.get())); - pTransaction = pTemp; + mmBankTransaction tran(m_core.get()); std::shared_ptr<mmCurrency> pCurrencyPtr = m_core.get()->accountList_.getCurrencySharedPtr(th.accountID_); wxASSERT(pCurrencyPtr); - pTransaction->accountID_ = th.accountID_; - pTransaction->toAccountID_ = th.toAccountID_; - pTransaction->payee_ = m_core.get()->payeeList_.GetPayeeSharedPtr(th.payeeID_); - pTransaction->transType_ = th.transType_; - pTransaction->amt_ = th.amt_; - pTransaction->status_ = q1.GetString("STATUS"); - pTransaction->transNum_ = q1.GetString("TRANSACTIONNUMBER"); - pTransaction->notes_ = th.notes_; - pTransaction->category_ = m_core.get()->categoryList_.GetCategorySharedPtr(th.categID_, th.subcategID_); - pTransaction->date_ = th.nextOccurDate_; - pTransaction->toAmt_ = th.toAmt_; + tran.accountID_ = th.accountID_; + tran.toAccountID_ = th.toAccountID_; + tran.payee_ = m_core.get()->payeeList_.GetPayeeSharedPtr(th.payeeID_); + tran.transType_ = th.transType_; + tran.amt_ = th.amt_; + tran.status_ = q1.GetString("STATUS"); + tran.transNum_ = q1.GetString("TRANSACTIONNUMBER"); + tran.notes_ = th.notes_; + tran.category_ = m_core.get()->categoryList_.GetCategorySharedPtr(th.categID_, th.subcategID_); + tran.date_ = th.nextOccurDate_; + tran.toAmt_ = th.toAmt_; std::shared_ptr<mmSplitTransactionEntries> split(new mmSplitTransactionEntries()); split->loadFromBDDB(m_core.get(),th.id_); - *pTransaction->splitEntries_.get() = *split.get(); + *tran.splitEntries_.get() = *split.get(); - //pTransaction->updateAllData(m_core.get(), th.accountID_, pCurrencyPtr); - m_core.get()->bTransactionList_.addTransaction(pTransaction); + m_core.get()->bTransactionList_.addTransaction(&tran); } mmDBWrapper::completeBDInSeries(m_db.get(), th.id_); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-06-25 15:07:47
|
Revision: 4184 http://sourceforge.net/p/moneymanagerex/code/4184 Author: vomikan Date: 2013-06-25 15:07:44 +0000 (Tue, 25 Jun 2013) Log Message: ----------- fix for missing recent file Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-06-25 14:47:15 UTC (rev 4183) +++ trunk/src/mmex.cpp 2013-06-25 15:07:44 UTC (rev 4184) @@ -3967,7 +3967,11 @@ void mmGUIFrame::OnRecentFiles(wxCommandEvent& event) { wxString file_name = recentFiles_->getRecentFile(event.GetId() - wxID_FILE1 +1); - SetDatabaseFile(file_name); + wxFileName file(file_name); + if (file.FileExists()) + SetDatabaseFile(file_name); + else //TODO: Clear wrong record + wxMessageBox(wxString::Format(_("File %s not found"), file_name), _("Error"), wxOK|wxICON_ERROR); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-03 03:52:32
|
Revision: 4240 http://sourceforge.net/p/moneymanagerex/code/4240 Author: guanlisheng Date: 2013-07-03 03:52:26 +0000 (Wed, 03 Jul 2013) Log Message: ----------- do not refresh page when no report Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-02 18:49:45 UTC (rev 4239) +++ trunk/src/mmex.cpp 2013-07-03 03:52:26 UTC (rev 4240) @@ -2210,6 +2210,7 @@ void mmGUIFrame::createReportsPage(mmPrintableBase* rs) { + if (!rs) return; wxSizer *sizer = cleanupHomePanel(); panelCurrent_ = new mmReportsPanel(this, m_core.get(), rs, homePanel_, wxID_STATIC, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-03 22:59:06
|
Revision: 4256 http://sourceforge.net/p/moneymanagerex/code/4256 Author: guanlisheng Date: 2013-07-03 22:59:04 +0000 (Wed, 03 Jul 2013) Log Message: ----------- sample asset model Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-03 22:58:33 UTC (rev 4255) +++ trunk/src/mmex.cpp 2013-07-03 22:59:04 UTC (rev 4256) @@ -65,6 +65,7 @@ #include "import_export/univcsvdialog.h" #include "db/transactionbill.h" #include "mmex_settings.h" +#include "model/model_asset.h" //---------------------------------------------------------------------------- #include <wx/debugrpt.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-04 02:42:53
|
Revision: 4259 http://sourceforge.net/p/moneymanagerex/code/4259 Author: guanlisheng Date: 2013-07-04 02:42:50 +0000 (Thu, 04 Jul 2013) Log Message: ----------- remove the test code Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-04 02:26:44 UTC (rev 4258) +++ trunk/src/mmex.cpp 2013-07-04 02:42:50 UTC (rev 4259) @@ -65,7 +65,6 @@ #include "import_export/univcsvdialog.h" #include "db/transactionbill.h" #include "mmex_settings.h" -#include "model/model_asset.h" //---------------------------------------------------------------------------- #include <wx/debugrpt.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-04 04:06:27
|
Revision: 4260 http://sourceforge.net/p/moneymanagerex/code/4260 Author: guanlisheng Date: 2013-07-04 04:06:21 +0000 (Thu, 04 Jul 2013) Log Message: ----------- comment out ISMAXIMIZED to terminate program normally Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-04 02:42:50 UTC (rev 4259) +++ trunk/src/mmex.cpp 2013-07-04 04:06:21 UTC (rev 4260) @@ -1065,7 +1065,7 @@ this->GetSize(&value_w, &value_h); m_inisettings->SetSetting("SIZEW", value_w); m_inisettings->SetSetting("SIZEH", value_h); - m_inisettings->SetSetting("ISMAXIMIZED", this->IsMaximized()); +// m_inisettings->SetSetting("ISMAXIMIZED", this->IsMaximized()); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-04 19:45:45
|
Revision: 4275 http://sourceforge.net/p/moneymanagerex/code/4275 Author: vomikan Date: 2013-07-04 19:45:42 +0000 (Thu, 04 Jul 2013) Log Message: ----------- fix for saving ISMAXIMIZED parameter Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-04 14:45:22 UTC (rev 4274) +++ trunk/src/mmex.cpp 2013-07-04 19:45:42 UTC (rev 4275) @@ -1066,7 +1066,7 @@ this->GetSize(&value_w, &value_h); m_inisettings->SetSetting("SIZEW", value_w); m_inisettings->SetSetting("SIZEH", value_h); -// m_inisettings->SetSetting("ISMAXIMIZED", this->IsMaximized()); + m_inisettings->SetSetting("ISMAXIMIZED", (bool)this->IsMaximized()); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-06 13:21:04
|
Revision: 4288 http://sourceforge.net/p/moneymanagerex/code/4288 Author: guanlisheng Date: 2013-07-06 13:20:59 +0000 (Sat, 06 Jul 2013) Log Message: ----------- format Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-06 13:11:13 UTC (rev 4287) +++ trunk/src/mmex.cpp 2013-07-06 13:20:59 UTC (rev 4288) @@ -135,12 +135,12 @@ } //---------------------------------------------------------------------------- -bool OnInitImpl(mmGUIApp &app) +bool OnInitImpl(mmGUIApp* app) { - app.SetAppName(mmex::GetAppName()); + app->SetAppName(mmex::GetAppName()); /* Setting Locale causes unexpected problems, so default to English Locale */ - app.getLocale().Init(wxLANGUAGE_ENGLISH); + app->getLocale().Init(wxLANGUAGE_ENGLISH); /* Initialize Image Handlers */ wxImage::AddHandler(new wxICOHandler()); @@ -159,7 +159,7 @@ mmIniOptions::instance().loadOptions(pIniSettings); /* Was App Maximized? */ - bool isMaxStr = pIniSettings->GetBoolSetting("ISMAXIMIZED", false); + bool isMax = pIniSettings->GetBoolSetting("ISMAXIMIZED", false); /* Load Dimensions of Window */ int valx = pIniSettings->GetIntSetting("ORIGINX",50); @@ -171,12 +171,8 @@ mmGUIFrame *frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh), pIniSettings); bool ok = frame->Show(); - wxASSERT(ok); - if (isMaxStr) - { - frame->Maximize(true); - } + if (isMax) frame->Maximize(true); // success: wxApp::OnRun() will be called which will enter the main message // loop and the application will run. If we returned FALSE here, the @@ -191,7 +187,7 @@ try { - ok = wxApp::OnInit() && OnInitImpl(*this); + ok = wxApp::OnInit() && OnInitImpl(this); } catch (const wxSQLite3Exception &e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-06 13:55:16
|
Revision: 4289 http://sourceforge.net/p/moneymanagerex/code/4289 Author: guanlisheng Date: 2013-07-06 13:55:13 +0000 (Sat, 06 Jul 2013) Log Message: ----------- use object not pointer Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-06 13:20:59 UTC (rev 4288) +++ trunk/src/mmex.cpp 2013-07-06 13:55:13 UTC (rev 4289) @@ -3788,13 +3788,13 @@ void mmGUIFrame::OnCategoryRelocation(wxCommandEvent& /*event*/) { - relocateCategoryDialog* dlg = new relocateCategoryDialog(m_core.get(), this); - if (dlg->ShowModal() == wxID_OK) + relocateCategoryDialog dlg(m_core.get(), this); + if (dlg.ShowModal() == wxID_OK) { wxString msgStr; msgStr << _("Category Relocation Completed.") << "\n\n" << wxString::Format( _("Records have been updated in the database: %s"), - dlg->updatedCategoriesCount()) + dlg.updatedCategoriesCount()) << "\n\n" << _("MMEX must be shutdown and restarted for all the changes to be seen."); wxMessageBox(msgStr,_("Category Relocation Result")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-08 05:51:52
|
Revision: 4323 http://sourceforge.net/p/moneymanagerex/code/4323 Author: guanlisheng Date: 2013-07-08 05:51:47 +0000 (Mon, 08 Jul 2013) Log Message: ----------- init m_frame Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-08 05:39:26 UTC (rev 4322) +++ trunk/src/mmex.cpp 2013-07-08 05:51:47 UTC (rev 4323) @@ -79,7 +79,7 @@ //---------------------------------------------------------------------------- -mmGUIApp::mmGUIApp() +mmGUIApp::mmGUIApp(): m_frame(0) { wxHandleFatalExceptions(); // tell the library to call OnFatalException() } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-08 06:16:34
|
Revision: 4324 http://sourceforge.net/p/moneymanagerex/code/4324 Author: guanlisheng Date: 2013-07-08 06:16:29 +0000 (Mon, 08 Jul 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-08 05:51:47 UTC (rev 4323) +++ trunk/src/mmex.cpp 2013-07-08 06:16:29 UTC (rev 4324) @@ -3397,12 +3397,8 @@ pinterData->SetMarginBottomRight(bottomRight); wxPrintData* printerData = printer_->GetPrintData(); - // fix warning for wxWidgets 2.9.3 -#if wxCHECK_VERSION(2,9,0) printerData->SetOrientation((wxPrintOrientation)pageOrientation); -#else // use code for wxWidgets 2.8.x - printerData->SetOrientation(pageOrientation); -#endif + printerData->SetPaperId( (wxPaperSize)paperID ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-07-09 03:09:01
|
Revision: 4329 http://sourceforge.net/p/moneymanagerex/code/4329 Author: guanlisheng Date: 2013-07-09 03:08:53 +0000 (Tue, 09 Jul 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-09 01:15:22 UTC (rev 4328) +++ trunk/src/mmex.cpp 2013-07-09 03:08:53 UTC (rev 4329) @@ -814,88 +814,6 @@ //---------------------------------------------------------------------------- void mmGUIFrame::OnAutoRepeatTransactionsTimer(wxTimerEvent& /*event*/) { -/* TODO: Activate new AutoRepeatTransactions code - when other sections are completed and tested. -*/ -//#define USING_NEW_DB_CLASSES // Activation switch -#ifdef USING_NEW_DB_CLASSES - - /* Use local list for testing. Convert to global list in final version. - For now, we only want to add new transactions. - */ - TTransactionList transactions(m_db, false); - TTransactionBillList bills(m_db); - - bool continueExecution = true; // allow the process to start - while (continueExecution) - { - continueExecution = false; - int index = 0; - while (index < bills.CurrentListSize()) - { - TTransactionBillEntry* pBillEntry = bills.entrylist_[index].get(); - - int remaining_days; - if (pBillEntry->RequiresExecution(remaining_days)) - { - /* TODO: Obtain split transactions for the repeat transaction - and apply to main list. - */ - bool using_repeats = false; - if (pBillEntry->UsingRepeatProcessing()) - { - using_repeats = true; - } - - if (pBillEntry->autoExecuteSilent_) - { - TTransactionEntry* pTransactionEntry = pBillEntry->GetTransaction(); - pTransactionEntry->trans_date_ = pBillEntry->NextOccurDate(); - pBillEntry->AdjustNextOccuranceDate(); - transactions.AddEntry(pTransactionEntry); - //ProcessSplitTransactionForTransaction(int trans_id) - pBillEntry->Update(bills.ListDatabase()); - if (pBillEntry->num_repeats_ != 0) - { - continueExecution = true; - } - } - - if (pBillEntry->autoExecuteManual_) - { - /* TODO: Set up the transaction dialog to accept a TTransactionEntry - and return wx_OK to allow a save from a a possible updated transaction. - */ - int style = wxOK|wxCANCEL|wxICON_EXCLAMATION; - if (wxMessageBox(_("Tempoary message."), _("Repeat Transaction Auto Execution Check"), style) == wxOK) - { - TTransactionEntry* pTransactionEntry = pBillEntry->GetTransaction(); - pTransactionEntry->trans_date_ = pBillEntry->NextOccurDate(); - pBillEntry->AdjustNextOccuranceDate(); - transactions.AddEntry(pTransactionEntry); - //ProcessSplitTransactionForTransaction(trans_id) - pBillEntry->Update(bills.ListDatabase()); - if (pBillEntry->num_repeats_ != 0) - { - continueExecution = true; - } - } - } - - if (using_repeats && pBillEntry->num_repeats_ == 0) - { - bills.DeleteEntry(pBillEntry->GetId()); - } - } - ++index; - } - } - if (activeHomePage_) - { - createHomePage(); // Update home page details only if it is being displayed - } - -#else bool continueExecution = false; m_core->currencyList_.LoadBaseCurrencySettings(); @@ -1037,7 +955,6 @@ { autoRepeatTransactionsTimer_.Start(5, wxTIMER_ONE_SHOT); } -#endif } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-11 08:57:01
|
Revision: 4348 http://sourceforge.net/p/moneymanagerex/code/4348 Author: vomikan Date: 2013-07-11 08:56:57 +0000 (Thu, 11 Jul 2013) Log Message: ----------- format Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-11 08:07:03 UTC (rev 4347) +++ trunk/src/mmex.cpp 2013-07-11 08:56:57 UTC (rev 4348) @@ -2102,11 +2102,11 @@ { wxSizer *sizer = cleanupHomePanel(); panelCurrent_ = new mmHomePagePanel(m_core.get(), - homePanel_, - wxID_STATIC, - wxDefaultPosition, - wxDefaultSize, - wxNO_BORDER|wxTAB_TRAVERSAL); + homePanel_, + wxID_STATIC, + wxDefaultPosition, + wxDefaultSize, + wxNO_BORDER|wxTAB_TRAVERSAL); sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-11 17:38:19
|
Revision: 4357 http://sourceforge.net/p/moneymanagerex/code/4357 Author: vomikan Date: 2013-07-11 17:38:16 +0000 (Thu, 11 Jul 2013) Log Message: ----------- fix for show HomePage on startup for non Windows systems Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-11 15:54:19 UTC (rev 4356) +++ trunk/src/mmex.cpp 2013-07-11 17:38:16 UTC (rev 4357) @@ -2096,9 +2096,11 @@ void mmGUIFrame::createHomePage() { - /* On init for Windows system that function start twice. - First time it should be skiped */ +# if defined (__WXWIN__) + /* On init for Windows system that function start twice. * + * First time it should be skiped */ if (!activeHomePage_ && initHomePage_) +#endif { wxSizer *sizer = cleanupHomePanel(); panelCurrent_ = new mmHomePagePanel(m_core.get(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-15 14:09:10
|
Revision: 4380 http://sourceforge.net/p/moneymanagerex/code/4380 Author: vomikan Date: 2013-07-15 14:09:08 +0000 (Mon, 15 Jul 2013) Log Message: ----------- fix for Home Page initialization on Windows Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-15 13:36:15 UTC (rev 4379) +++ trunk/src/mmex.cpp 2013-07-15 14:09:08 UTC (rev 4380) @@ -2104,7 +2104,7 @@ # if defined (__WINDOWS__) /* On init for Windows system that function start twice. * * First time it should be skiped */ - if (!activeHomePage_ && initHomePage_) + if (initHomePage_) #endif { wxSizer *sizer = cleanupHomePanel(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-16 10:47:29
|
Revision: 4385 http://sourceforge.net/p/moneymanagerex/code/4385 Author: vomikan Date: 2013-07-16 10:47:18 +0000 (Tue, 16 Jul 2013) Log Message: ----------- warnings fix Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-16 09:42:16 UTC (rev 4384) +++ trunk/src/mmex.cpp 2013-07-16 10:47:18 UTC (rev 4385) @@ -648,7 +648,7 @@ /* Create the Controls for the frame */ createMenu(); - CreateToolBar(); + CreateToolBar(wxTB_FLAT | wxTB_NODIVIDER, wxID_ANY, "ToolBar"); createControls(); CreateStatusBar(); recentFiles_ = new RecentDatabaseFiles(menuRecentFiles_); @@ -2473,7 +2473,7 @@ wxToolBar* mmGUIFrame::CreateToolBar(long style, wxWindowID id, const wxString &name) { - toolBar_ = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxTB_NODIVIDER); + toolBar_ = new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); wxBitmap toolBarBitmaps[12]; toolBarBitmaps[0] = wxBitmap(new_xpm); toolBarBitmaps[1] = wxBitmap(open_xpm); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-18 19:28:00
|
Revision: 4393 http://sourceforge.net/p/moneymanagerex/code/4393 Author: vomikan Date: 2013-07-18 19:27:56 +0000 (Thu, 18 Jul 2013) Log Message: ----------- fix for .emb file extention filter Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-18 14:08:41 UTC (rev 4392) +++ trunk/src/mmex.cpp 2013-07-18 19:27:56 UTC (rev 4393) @@ -2717,11 +2717,11 @@ void mmGUIFrame::OnOpen(wxCommandEvent& /*event*/) { autoRepeatTransactionsTimer_.Stop(); - wxString fileName = wxFileSelector(_("Choose database file to open"), - wxEmptyString, wxEmptyString, wxEmptyString, - "MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb)", - wxFD_FILE_MUST_EXIST, - this + wxString fileName = wxFileSelector( _("Choose database file to open") + , wxEmptyString, wxEmptyString, wxEmptyString + , "MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb" + , wxFD_FILE_MUST_EXIST|wxFD_OPEN + , this ); if (!fileName.empty()) @@ -2734,11 +2734,11 @@ void mmGUIFrame::OnConvertEncryptedDB(wxCommandEvent& /*event*/) { - wxString encFileName = wxFileSelector(_("Choose Encrypted database file to open"), - wxEmptyString, wxEmptyString, wxEmptyString, - "Encrypted MMB files (*.emb)|*.emb", - wxFD_FILE_MUST_EXIST, - this + wxString encFileName = wxFileSelector( _("Choose Encrypted database file to open") + , wxEmptyString, wxEmptyString, wxEmptyString + , "Encrypted MMB files (*.emb)|*.emb" + , wxFD_FILE_MUST_EXIST + , this ); if (encFileName.empty()) @@ -2748,12 +2748,12 @@ if (password.empty()) return; - wxFileDialog dlg(this, - _("Choose database file to Save As"), - wxEmptyString, - wxEmptyString, - "MMB Files(*.mmb)|*.mmb", - wxFD_SAVE | wxFD_OVERWRITE_PROMPT + wxFileDialog dlg( this + , _("Choose database file to Save As") + , wxEmptyString + , wxEmptyString + , "MMB Files(*.mmb)|*.mmb" + , wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if(dlg.ShowModal() != wxID_OK) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-20 05:14:58
|
Revision: 4399 http://sourceforge.net/p/moneymanagerex/code/4399 Author: vomikan Date: 2013-07-20 05:14:55 +0000 (Sat, 20 Jul 2013) Log Message: ----------- [bugs:#214] MMEX Window is "off screen" fix Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-19 14:32:17 UTC (rev 4398) +++ trunk/src/mmex.cpp 2013-07-20 05:14:55 UTC (rev 4399) @@ -161,12 +161,20 @@ /* Was App Maximized? */ bool isMax = Model_Setting::instance().GetBoolSetting("ISMAXIMIZED", false); - /* Load Dimensions of Window */ - int valx = Model_Setting::instance().GetIntSetting(wxT("ORIGINX"), 50); - int valy = Model_Setting::instance().GetIntSetting("ORIGINY",50); - int valw = Model_Setting::instance().GetIntSetting("SIZEW",800); - int valh = Model_Setting::instance().GetIntSetting("SIZEH",600); + //Get System screen size + int sys_screen_x = wxSystemSettings::GetMetric(wxSYS_SCREEN_X); + int sys_screen_y = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y); + /* Load Dimensions of Window */ + int valx = Model_Setting::instance().GetIntSetting("ORIGINX", 50); + int valy = Model_Setting::instance().GetIntSetting("ORIGINY", 50); + int valw = Model_Setting::instance().GetIntSetting("SIZEW", sys_screen_x/4*3); + int valh = Model_Setting::instance().GetIntSetting("SIZEH", sys_screen_y/4*3); + + //BUGFIX: #214 MMEX Window is "off screen" + if (valx >= sys_screen_x ) valx = sys_screen_x - valw; + if (valy >= sys_screen_y ) valy = sys_screen_y - valh; + mmSelectLanguage(0, false); app->m_frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-23 09:17:18
|
Revision: 4404 http://sourceforge.net/p/moneymanagerex/code/4404 Author: vomikan Date: 2013-07-23 09:17:14 +0000 (Tue, 23 Jul 2013) Log Message: ----------- fix context menu view all/open/favorites functions Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-23 08:41:48 UTC (rev 4403) +++ trunk/src/mmex.cpp 2013-07-23 09:17:14 UTC (rev 4404) @@ -675,10 +675,6 @@ m_mgr.GetArtProvider()->SetMetric(16, 0); m_mgr.GetArtProvider()->SetMetric(3, 1); - // Save default perspective - m_perspective = m_mgr.SavePerspective(); - Model_Setting::instance().Set("AUIPERSPECTIVE", m_perspective); - // "commit" all changes made to wxAuiManager m_mgr.Update(); @@ -1572,7 +1568,10 @@ /* Load Nav Tree Control */ - wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", "ALL"); + wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); + wxASSERT(vAccts == VIEW_ACCOUNTS_ALL_STR || vAccts == VIEW_ACCOUNTS_FAVORITES_STR || vAccts == VIEW_ACCOUNTS_OPEN_STR); + if (vAccts != VIEW_ACCOUNTS_ALL_STR && vAccts != VIEW_ACCOUNTS_FAVORITES_STR && vAccts != VIEW_ACCOUNTS_OPEN_STR) + vAccts = VIEW_ACCOUNTS_ALL_STR; for (const auto& account: m_core->accountList_.accounts_) { @@ -2036,27 +2035,25 @@ void mmGUIFrame::OnViewAllAccounts(wxCommandEvent&) { //Get current settings for view accounts - wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", "ALL"); + wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); - //Set view ALL - Model_Setting::instance().Set("VIEWACCOUNTS", "ALL"); - //Refresh Navigation Panel + //Set view ALL & Refresh Navigation Panel + Model_Setting::instance().Set("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); mmGUIFrame::updateNavTreeControl(); //Restore settings Model_Setting::instance().Set("VIEWACCOUNTS", vAccts); + vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); } //---------------------------------------------------------------------------- void mmGUIFrame::OnViewFavoriteAccounts(wxCommandEvent&) { //Get current settings for view accounts - wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", "ALL"); + wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); - //Set view ALL - Model_Setting::instance().Set("VIEWACCOUNTS", "Favorites"); - - //Refresh Navigation Panel + //Set view Favorites & Refresh Navigation Panel + Model_Setting::instance().Set("VIEWACCOUNTS", VIEW_ACCOUNTS_FAVORITES_STR); mmGUIFrame::updateNavTreeControl(); //Restore settings @@ -2067,12 +2064,10 @@ void mmGUIFrame::OnViewOpenAccounts(wxCommandEvent&) { //Get current settings for view accounts - wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", "ALL"); + wxString vAccts = Model_Setting::instance().GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); - //Set view ALL - Model_Setting::instance().Set("VIEWACCOUNTS", "Open"); - - //Refresh Navigation Panel + //Set view Open & Refresh Navigation Panel + Model_Setting::instance().Set("VIEWACCOUNTS", VIEW_ACCOUNTS_OPEN_STR); mmGUIFrame::updateNavTreeControl(); //Restore settings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-07-24 06:55:28
|
Revision: 4410 http://sourceforge.net/p/moneymanagerex/code/4410 Author: vomikan Date: 2013-07-24 06:55:25 +0000 (Wed, 24 Jul 2013) Log Message: ----------- progress bar for startup removed Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-24 06:38:16 UTC (rev 4409) +++ trunk/src/mmex.cpp 2013-07-24 06:55:25 UTC (rev 4410) @@ -2544,7 +2544,7 @@ passwordCheckPassed = false; } - wxString dialogErrorMessageHeading = _("Opening MMEX Database - Error"); + const wxString dialogErrorMessageHeading = _("Opening MMEX Database - Error"); // Existing Database if (!openingNew @@ -2571,8 +2571,9 @@ { wxString note = mmex::getProgramName() + _(" - No File opened "); this->SetTitle(note); - wxMessageBox(_("Sorry. The Database version is too old or Database password is incorrect"), - dialogErrorMessageHeading, wxOK|wxICON_EXCLAMATION); + wxMessageBox(_("Sorry. The Database version is too old or Database password is incorrect") + , dialogErrorMessageHeading + , wxOK|wxICON_EXCLAMATION); m_db->Close(); m_db.reset(); @@ -3797,14 +3798,6 @@ void mmGUIFrame::SetDatabaseFile(const wxString& dbFileName, bool newDatabase) { autoRepeatTransactionsTimer_.Stop(); - wxProgressDialog *progress = NULL; - if (! newDatabase) - { - progress = new wxProgressDialog( - _("Setting new Database file"), - _("Please wait while the new database is being loaded."), 100, this); - progress->Update(33); - } // Ensure database is in a steady state first if (m_db && !activeHomePage_) @@ -3813,25 +3806,16 @@ createHomePage(); } - if (progress) progress->Update(65); if (openFile(dbFileName, newDatabase)) { - if (progress) progress->Update(80); recentFiles_->updateRecentList(dbFileName); } else { createHomePage(); - if (progress) progress->Update(90); updateNavTreeControl(); showBeginAppDialog(true); } - - if (progress) - { - progress->Update(100); - progress->Destroy(); - } } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-08-29 02:24:56
|
Revision: 4445 http://sourceforge.net/p/moneymanagerex/code/4445 Author: guanlisheng Date: 2013-08-29 02:24:51 +0000 (Thu, 29 Aug 2013) Log Message: ----------- init currecy table Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-08-28 09:22:21 UTC (rev 4444) +++ trunk/src/mmex.cpp 2013-08-29 02:24:51 UTC (rev 4445) @@ -2615,11 +2615,12 @@ } else { - m_db = mmDBWrapper::Open(fileName, password); - password_ = password; + m_db = mmDBWrapper::Open(fileName, password); + password_ = password; Model_Asset::instance(m_db.get()); Model_Stock::instance(m_db.get()); Model_Currency::instance().db_ = m_db.get(); + Model_Currency::instance().all(); Model_Budgetyear::instance().db_ = m_db.get(); Model_Infotable::instance().db_ = m_db.get(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-08-29 02:32:53
|
Revision: 4446 http://sourceforge.net/p/moneymanagerex/code/4446 Author: guanlisheng Date: 2013-08-29 02:32:41 +0000 (Thu, 29 Aug 2013) Log Message: ----------- format with 4 steps Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-08-29 02:24:51 UTC (rev 4445) +++ trunk/src/mmex.cpp 2013-08-29 02:32:41 UTC (rev 4446) @@ -2599,22 +2599,22 @@ } else if (openingNew) // New Database { - if (mmIniOptions::instance().enableCustomTemplateDB_ + if (mmIniOptions::instance().enableCustomTemplateDB_ && wxFileName::FileExists(mmIniOptions::instance().customTemplateDB_)) - { - wxCopyFile(mmIniOptions::instance().customTemplateDB_, fileName, true); - m_db = mmDBWrapper::Open(fileName); - password_ = password; + { + wxCopyFile(mmIniOptions::instance().customTemplateDB_, fileName, true); + m_db = mmDBWrapper::Open(fileName); + password_ = password; Model_Asset::instance(m_db.get()); Model_Stock::instance(m_db.get()); Model_Currency::instance().db_ = m_db.get(); Model_Budgetyear::instance().db_ = m_db.get(); Model_Infotable::instance().db_ = m_db.get(); - m_core.reset(new mmCoreDB(m_db)); - } - else - { + m_core.reset(new mmCoreDB(m_db)); + } + else + { m_db = mmDBWrapper::Open(fileName, password); password_ = password; Model_Asset::instance(m_db.get()); @@ -2624,23 +2624,23 @@ Model_Budgetyear::instance().db_ = m_db.get(); Model_Infotable::instance().db_ = m_db.get(); - openDataBase(fileName); - m_core.reset(new mmCoreDB(m_db)); + openDataBase(fileName); + m_core.reset(new mmCoreDB(m_db)); - mmNewDatabaseWizard* wizard = new mmNewDatabaseWizard(this, m_core.get()); - wizard->CenterOnParent(); - wizard->RunIt(true); + mmNewDatabaseWizard* wizard = new mmNewDatabaseWizard(this, m_core.get()); + wizard->CenterOnParent(); + wizard->RunIt(true); - m_core->currencyList_.LoadBaseCurrencySettings(); + m_core->currencyList_.LoadBaseCurrencySettings(); - /* Load User Name and Other Settings */ - mmOptions::instance().loadOptions(); + /* Load User Name and Other Settings */ + mmOptions::instance().loadOptions(); - /* Jump to new account creation screen */ - wxCommandEvent evt; - OnNewAccount(evt); - return true; - } + /* Jump to new account creation screen */ + wxCommandEvent evt; + OnNewAccount(evt); + return true; + } } else // open of existing database failed { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-09-08 07:33:14
|
Revision: 4453 http://sourceforge.net/p/moneymanagerex/code/4453 Author: vomikan Date: 2013-09-08 07:33:10 +0000 (Sun, 08 Sep 2013) Log Message: ----------- [bugs:#215] custom report crashes mmex on export to HTML Fixed Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-09-08 01:30:00 UTC (rev 4452) +++ trunk/src/mmex.cpp 2013-09-08 07:33:10 UTC (rev 4453) @@ -1657,7 +1657,7 @@ , sScript , custRepIndex_->CurrentReportFileType()); createReportsPage(csr); - delete csr; // CEHCK + //delete csr; // BUG: #215 custom report crashes mmex on export to HTML } } processPendingEvents(); // clear out pending events @@ -3483,8 +3483,8 @@ void mmGUIFrame::OnExportToHtml(wxCommandEvent& WXUNUSED(event)) { - mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_); - if (rp) + mmReportsPanel* report_panel = dynamic_cast<mmReportsPanel*>(panelCurrent_); + if (report_panel) { wxString fileName = wxFileSelector("Choose HTML file to Export", wxEmptyString, wxEmptyString, wxEmptyString, "*.html", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); @@ -3493,7 +3493,8 @@ correctEmptyFileExt("html",fileName); wxFileOutputStream output( fileName ); wxTextOutputStream text( output ); - text << rp->getReportText(); + text << report_panel->getReportText(); + output.Close(); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-09-08 11:46:02
|
Revision: 4458 http://sourceforge.net/p/moneymanagerex/code/4458 Author: vomikan Date: 2013-09-08 11:45:58 +0000 (Sun, 08 Sep 2013) Log Message: ----------- constants replaced by function for app site string Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-09-08 09:43:31 UTC (rev 4457) +++ trunk/src/mmex.cpp 2013-09-08 11:45:58 UTC (rev 4458) @@ -3220,7 +3220,7 @@ int numTokens = (int)tkz.CountTokens(); if (numTokens != 4) { - wxString url = "http://www.codelathe.com/mmex"; + wxString url = mmex::getProgramWebSite(); wxLaunchDefaultBrowser(url); return false; } @@ -3277,7 +3277,7 @@ << "\n"; // Access current version details page - wxString site = "http://www.codelathe.com/mmex/version.html"; + wxString site = mmex::getProgramWebSite() + "/version.html"; wxString page; int err_code = site_content(site, page); @@ -3311,7 +3311,7 @@ style = wxICON_INFORMATION|style; } - wxString urlString = "http://www.codelathe.com/mmex"; + wxString urlString = mmex::getProgramWebSite(); versionDetails << "\n\n" << _("Proceed to website: ") << urlString; if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK) wxLaunchDefaultBrowser(urlString); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-09-18 06:46:43
|
Revision: 4507 http://sourceforge.net/p/moneymanagerex/code/4507 Author: guanlisheng Date: 2013-09-18 06:46:41 +0000 (Wed, 18 Sep 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-09-18 03:39:54 UTC (rev 4506) +++ trunk/src/mmex.cpp 2013-09-18 06:46:41 UTC (rev 4507) @@ -461,12 +461,7 @@ wxWizardPageSimple(parent), parent_(parent) { - wxArrayString itemAcctTypeStrings; - itemAcctTypeStrings.Add(_("Checking/Savings")); // ACCOUNT_TYPE_BANK - itemAcctTypeStrings.Add(_("Investment")); // ACCOUNT_TYPE_STOCK - itemAcctTypeStrings.Add(_("Term")); // ACCOUNT_TYPE_TERM - - itemChoiceType_ = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, itemAcctTypeStrings); + itemChoiceType_ = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, Model_Account::instance().types_); itemChoiceType_->SetToolTip(_("Specify the type of account to be created.")); wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |