From: <vo...@us...> - 2011-03-19 04:14:52
|
Revision: 1195 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1195&view=rev Author: vomikan Date: 2011-03-19 04:14:45 +0000 (Sat, 19 Mar 2011) Log Message: ----------- minorchanges for looks better if names of buttons translated Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2011-03-19 02:22:00 UTC (rev 1194) +++ trunk/mmex/src/maincurrencydialog.cpp 2011-03-19 04:14:45 UTC (rev 1195) @@ -125,15 +125,15 @@ itemPanel5->SetSizer(itemBoxSizer6); wxButton* itemButton7 = new wxButton( itemPanel5, ID_MAINCURRENCYBUTTON_ADD, _("&Add"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxDefaultPosition, wxDefaultSize, 5 ); itemBoxSizer6->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxButton* itemButton8 = new wxButton( itemPanel5, ID_MAINCURRENCYBUTTON_EDIT, _("&Edit"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxDefaultPosition, wxDefaultSize, 5 ); itemBoxSizer6->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxButton* itemButton9 = new wxButton( itemPanel5, ID_MAINCURRENCYBUTTON_SELECT, _("&Select"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxDefaultPosition, wxDefaultSize, 5 ); itemBoxSizer6->Add(itemButton9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); if(bEnableSelect_ == false) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-04-12 01:35:57
|
Revision: 1228 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1228&view=rev Author: stef145g Date: 2011-04-12 01:35:51 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Fix double click to activate correct action depending on mode Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2011-04-11 09:46:01 UTC (rev 1227) +++ trunk/mmex/src/maincurrencydialog.cpp 2011-04-12 01:35:51 UTC (rev 1228) @@ -229,5 +229,8 @@ void mmMainCurrencyDialog::OnDoubleClicked(wxCommandEvent& event) { - OnSelect(event); + if (bEnableSelect_) + OnSelect(event); + else + OnEdit(event); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-01-13 11:57:12
|
Revision: 1635 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1635&view=rev Author: vomikan Date: 2012-01-13 11:57:01 +0000 (Fri, 13 Jan 2012) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-01-12 08:09:05 UTC (rev 1634) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-01-13 11:57:01 UTC (rev 1635) @@ -114,9 +114,8 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - wxString* itemListBox4Strings = NULL; currencyListBox_ = new wxListBox( itemDialog1, ID_LISTBOX, - wxDefaultPosition, wxDefaultSize, 0, itemListBox4Strings, wxLB_SINGLE ); + wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB ); itemBoxSizer3->Add(currencyListBox_, 1, wxGROW|wxALL, 1); wxPanel* itemPanel5 = new wxPanel( itemDialog1, ID_PANEL10, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-02 14:43:33
|
Revision: 1713 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1713&view=rev Author: guanlisheng Date: 2012-02-02 14:43:24 +0000 (Thu, 02 Feb 2012) Log Message: ----------- more cleanup Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-02-02 14:32:16 UTC (rev 1712) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-02-02 14:43:24 UTC (rev 1713) @@ -52,10 +52,6 @@ Create(parent, id, caption, pos, size, style); } -/*! - * MyDialog creator - */ - bool mmMainCurrencyDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, @@ -93,15 +89,9 @@ currencyListBox_->Insert(currencyName, idx, new mmListBoxItem(currencyID, currencyName)); } } -/*! - * Control creation for MyDialog - */ void mmMainCurrencyDialog::CreateControls() { -////@begin MyDialog content construction - // Generated by DialogBlocks, 06/24/06 17:00:25 (Personal Edition) - mmMainCurrencyDialog* itemDialog1 = this; wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); @@ -154,35 +144,19 @@ wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL, _("&Cancel")); itemBoxSizer9->Add(itemCancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); itemCancelButton->SetFocus(); - -////@end MyDialog content construction } -/*! - * Should we show tooltips? - */ - bool mmMainCurrencyDialog::ShowToolTips() { return TRUE; } -/*! - * Get bitmap resources - */ - wxBitmap mmMainCurrencyDialog::GetBitmapResource( const wxString& /*name*/ ) { // Bitmap retrieval -////@begin MyDialog bitmap retrieval return wxNullBitmap; -////@end MyDialog bitmap retrieval } -/*! - * Get icon resources - */ - wxIcon mmMainCurrencyDialog::GetIconResource( const wxString& /*name*/ ) { return wxNullIcon; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-19 14:34:34
|
Revision: 2632 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2632&view=rev Author: vomikan Date: 2012-06-19 14:34:23 +0000 (Tue, 19 Jun 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-06-18 20:52:46 UTC (rev 2631) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-06-19 14:34:23 UTC (rev 2632) @@ -97,9 +97,16 @@ wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer2); + wxFont font_bold = this->GetFont(); + font_bold.SetWeight(wxFONTWEIGHT_BOLD); + wxSizerFlags flags; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5); + + wxStaticText* itemStaticText3 = new wxStaticText( this, wxID_STATIC, - _("Currency List"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); + _("Currency List")); + itemStaticText3->SetFont(font_bold); + itemBoxSizer2->Add(itemStaticText3 , flags); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); @@ -110,30 +117,27 @@ wxPanel* itemPanel5 = new wxPanel( this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + itemBoxSizer2->Add(itemPanel5, flags.Center().Border(0)); wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemPanel5->SetSizer(itemBoxSizer6); - wxButton* itemButton7 = new wxButton( itemPanel5, wxID_ADD, _("Add"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + wxButton* itemButton7 = new wxButton( itemPanel5, wxID_ADD); + itemBoxSizer6->Add(itemButton7, flags.Border(wxALL, 5)); - itemButtonEdit_ = new wxButton( itemPanel5, wxID_EDIT, _("&Edit"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButtonEdit_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemButtonEdit_ = new wxButton( itemPanel5, wxID_EDIT); + itemBoxSizer6->Add(itemButtonEdit_, flags); itemButtonEdit_->Disable(); - itemButtonDelete_ = new wxButton( itemPanel5, wxID_REMOVE, _("Remove"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButtonDelete_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemButtonDelete_ = new wxButton(itemPanel5, wxID_REMOVE); + itemBoxSizer6->Add(itemButtonDelete_, flags); itemButtonDelete_->Disable(); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 4); + itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW); wxButton* itemButtonSelect = new wxButton( this, wxID_SELECTALL, _("&Select")); - itemBoxSizer9->Add(itemButtonSelect, 4, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer9->Add(itemButtonSelect, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); //itemButtonSelect->SetToolTip(_("Select the currently selected currency as the selected currency for the account")); if(bEnableSelect_ == false) { @@ -141,8 +145,8 @@ } //Some interfaces has no any close buttons, it may confuse user. Cancel button added - wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL, _("&Cancel")); - itemBoxSizer9->Add(itemCancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); + itemBoxSizer9->Add(itemCancelButton, flags); itemCancelButton->SetFocus(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-10-21 11:39:35
|
Revision: 3079 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3079&view=rev Author: vomikan Date: 2012-10-21 11:39:28 +0000 (Sun, 21 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-10-21 11:23:58 UTC (rev 3078) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-10-21 11:39:28 UTC (rev 3079) @@ -95,10 +95,12 @@ item.SetData( currencyID ); currencyListBox_->InsertItem( item ); - + wxString mnemo_sign = wxT(""); + if (baseCurrencyID == currencyID) mnemo_sign = wxT("X"); + else if (core_->accountList_.currencyInUse(currencyID)) mnemo_sign = wxT(".."); currencyListBox_->SetItem(idx, 0, (*it)->currencySymbol_); currencyListBox_->SetItem(idx, 1, (*it)->currencyName_); - currencyListBox_->SetItem(idx, 2, baseCurrencyID == currencyID ? wxT("X") : wxT("")); + currencyListBox_->SetItem(idx, 2, mnemo_sign); currencyListBox_->SetItem(idx, 3, wxString()<<(*it)->baseConv_); } @@ -109,12 +111,16 @@ void mmMainCurrencyDialog::CreateControls() { + wxSizerFlags flags, flagsExpand; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5); + flagsExpand.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5).Expand(); + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer2); wxStaticText* itemStaticText3 = new wxStaticText( this, wxID_STATIC, _("Currency List")); - itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer2->Add(itemStaticText3, flagsExpand); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); @@ -159,22 +165,19 @@ wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemPanel5->SetSizer(itemBoxSizer6); - wxButton* itemButton7 = new wxButton( itemPanel5, wxID_ADD, _("Add"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + wxButton* itemButton7 = new wxButton( itemPanel5, wxID_ADD); + itemBoxSizer6->Add(itemButton7, flags); - itemButtonEdit_ = new wxButton( itemPanel5, wxID_EDIT, _("&Edit"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButtonEdit_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemButtonEdit_ = new wxButton( itemPanel5, wxID_EDIT ); + itemBoxSizer6->Add(itemButtonEdit_, flags); itemButtonEdit_->Disable(); - itemButtonDelete_ = new wxButton( itemPanel5, wxID_REMOVE, _("Remove"), - wxDefaultPosition, wxDefaultSize, 4 ); - itemBoxSizer6->Add(itemButtonDelete_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemButtonDelete_ = new wxButton( itemPanel5, wxID_REMOVE ); + itemBoxSizer6->Add(itemButtonDelete_, flags); itemButtonDelete_->Disable(); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 4); + itemBoxSizer2->Add(itemBoxSizer9, flagsExpand); wxButton* itemButtonSelect = new wxButton( this, wxID_SELECTALL, _("&Select")); itemBoxSizer9->Add(itemButtonSelect, 4, wxALIGN_CENTER_VERTICAL|wxALL, 4); @@ -186,7 +189,7 @@ //Some interfaces has no any close buttons, it may confuse user. Cancel button added wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); - itemBoxSizer9->Add(itemCancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer9->Add(itemCancelButton, flags); itemCancelButton->SetFocus(); } @@ -288,17 +291,17 @@ selectedIndex_ = -1; currencyID_ = -1; itemButtonEdit_->Enable(false); - if (!bEnableSelect_) - itemButtonDelete_->Enable(false); + itemButtonDelete_->Enable(false); } void mmMainCurrencyDialog::OnListItemSelected(wxListEvent& event) { selectedIndex_ = event.GetIndex(); currencyID_ = currencyListBox_->GetItemData(selectedIndex_); + itemButtonEdit_->Enable(); if (!bEnableSelect_) // prevent user deleting currencies when editing accounts. - itemButtonDelete_->Enable(); + itemButtonDelete_->Enable(!core_->accountList_.currencyInUse(currencyID_)); } void mmMainCurrencyDialog::OnListItemActivated(wxListEvent& event) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-24 23:17:45
|
Revision: 3159 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3159&view=rev Author: vomikan Date: 2012-11-24 23:17:39 +0000 (Sat, 24 Nov 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-11-24 23:10:20 UTC (rev 3158) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-11-24 23:17:39 UTC (rev 3159) @@ -102,10 +102,9 @@ currencyListBox_->SetItem(idx, 0, (*it)->currencySymbol_); currencyListBox_->SetItem(idx, 1, (*it)->currencyName_); currencyListBox_->SetItem(idx, 2, mnemo_sign); - currencyListBox_->SetItem(idx, 3, wxString()<<(*it)->baseConv_); - + currencyListBox_->SetItem(idx++, 3, wxString()<<(*it)->baseConv_); } - currencyListBox_->SetItemCount(idx); + if (idx>0) currencyListBox_->RefreshItems(0, --idx); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-30 11:39:32
|
Revision: 3173 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3173&view=rev Author: vomikan Date: 2012-11-30 11:39:26 +0000 (Fri, 30 Nov 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-11-30 07:50:35 UTC (rev 3172) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-11-30 11:39:26 UTC (rev 3173) @@ -135,7 +135,7 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - currencyListBox_ = new wxListCtrl( this, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, + currencyListBox_ = new wxListCtrl( this, ID_LISTBOX, wxDefaultPosition, wxSize(-1, 200), wxLC_REPORT); // Add first column @@ -201,6 +201,9 @@ wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); itemBoxSizer9->Add(itemCancelButton, flags); itemCancelButton->SetFocus(); + + this->SetMinSize(wxSize(200,300)); + this->Fit(); } bool mmMainCurrencyDialog::ShowToolTips() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-13 16:08:33
|
Revision: 3197 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3197&view=rev Author: vomikan Date: 2012-12-13 16:08:27 +0000 (Thu, 13 Dec 2012) Log Message: ----------- Compiler warning fix Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-12-13 15:40:28 UTC (rev 3196) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-12-13 16:08:27 UTC (rev 3197) @@ -6,7 +6,6 @@ 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. @@ -347,7 +346,6 @@ void mmMainCurrencyDialog::OnMenuSelected(wxCommandEvent& event) { - int menu_item = event.GetId(); currencyID_ = currencyListBox_->GetItemData(selectedIndex_); int baseCurrencyID = core_->currencyList_.getBaseCurrencySettings(); if (baseCurrencyID == currencyID_) return; @@ -355,6 +353,7 @@ core_->currencyList_.setBaseCurrencySettings(currencyID_); fillControls(); + event.Skip(); } void mmMainCurrencyDialog::OnItemRightClick(wxListEvent& event) @@ -366,4 +365,5 @@ mainMenu->Append(new wxMenuItem(mainMenu, 0, _("Set as Base Currency"))); PopupMenu(mainMenu); + event.Skip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-13 16:21:01
|
Revision: 3198 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3198&view=rev Author: vomikan Date: 2012-12-13 16:20:52 +0000 (Thu, 13 Dec 2012) Log Message: ----------- ups Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-12-13 16:08:27 UTC (rev 3197) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-12-13 16:20:52 UTC (rev 3198) @@ -6,6 +6,7 @@ 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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-07 08:58:34
|
Revision: 3302 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3302&view=rev Author: vomikan Date: 2013-01-07 08:58:27 +0000 (Mon, 07 Jan 2013) Log Message: ----------- icon update Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2013-01-06 20:50:16 UTC (rev 3301) +++ trunk/mmex/src/maincurrencydialog.cpp 2013-01-07 08:58:27 UTC (rev 3302) @@ -33,10 +33,10 @@ EVT_MENU_RANGE(0, 1, mmMainCurrencyDialog::OnMenuSelected) - EVT_LIST_ITEM_ACTIVATED(ID_LISTBOX, mmMainCurrencyDialog::OnListItemActivated) - EVT_LIST_ITEM_SELECTED(ID_LISTBOX, mmMainCurrencyDialog::OnListItemSelected) - EVT_LIST_ITEM_DESELECTED(ID_LISTBOX, mmMainCurrencyDialog::OnListItemDeselected) - EVT_LIST_ITEM_RIGHT_CLICK(ID_LISTBOX, mmMainCurrencyDialog::OnItemRightClick) + EVT_LIST_ITEM_ACTIVATED(wxID_ANY, mmMainCurrencyDialog::OnListItemActivated) + EVT_LIST_ITEM_SELECTED(wxID_ANY, mmMainCurrencyDialog::OnListItemSelected) + EVT_LIST_ITEM_DESELECTED(wxID_ANY, mmMainCurrencyDialog::OnListItemDeselected) + EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY, mmMainCurrencyDialog::OnItemRightClick) END_EVENT_TABLE() @@ -134,7 +134,7 @@ itemBoxSizer2->Add(itemBoxSizer22, flagsExpand); wxBitmapButton* update_button = new wxBitmapButton(this, - wxID_STATIC, wxBitmap(update_currency_xpm)); + wxID_STATIC, wxBitmap(checkupdate_xpm)); itemBoxSizer22->Add(update_button, flags); update_button->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmMainCurrencyDialog::OnOnlineUpdateCurRate), NULL, this); @@ -147,7 +147,7 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - currencyListBox_ = new wxListCtrl( this, ID_LISTBOX, wxDefaultPosition, wxSize(-1, 200), + currencyListBox_ = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxSize(-1, 200), wxLC_REPORT); // Add first column This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-05-18 22:47:41
|
Revision: 3934 http://sourceforge.net/p/moneymanagerex/code/3934 Author: vomikan Date: 2013-05-18 22:47:37 +0000 (Sat, 18 May 2013) Log Message: ----------- fix for set base currency function Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2013-05-18 22:23:55 UTC (rev 3933) +++ trunk/mmex/src/maincurrencydialog.cpp 2013-05-18 22:47:37 UTC (rev 3934) @@ -70,6 +70,8 @@ ColName_[CURR_NAME] = _("Name"); ColName_[BASE_RATE] = _("Base Rate"); + currencyID_ = core_->currencyList_.GetBaseCurrencySettings(); + Create(parent, id, caption, pos, size, style); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-06-08 11:42:23
|
Revision: 4047 http://sourceforge.net/p/moneymanagerex/code/4047 Author: vomikan Date: 2013-06-08 11:42:20 +0000 (Sat, 08 Jun 2013) Log Message: ----------- warning fix Modified Paths: -------------- trunk/mmex/src/maincurrencydialog.cpp Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2013-06-07 09:03:01 UTC (rev 4046) +++ trunk/mmex/src/maincurrencydialog.cpp 2013-06-08 11:42:20 UTC (rev 4047) @@ -278,7 +278,7 @@ { wxDataViewItem item = event.GetItem(); selectedIndex_ = currencyListBox_->ItemToRow(item); - currencyID_ = currencyListBox_->GetItemData(item); + currencyID_ = (int)currencyListBox_->GetItemData(item); wxString currency_name = core_->currencyList_.getCurrencyName(currencyID_); std::shared_ptr<mmCurrency> pCurrency = core_->currencyList_.getCurrencySharedPtr(currencyID_); curr_rate_ = pCurrency->baseConv_; @@ -294,7 +294,6 @@ { wxDataViewItem item = event.GetItem(); selectedIndex_ = currencyListBox_->ItemToRow(item); - currencyID_ = currencyListBox_->GetItemData(item); wxString currency_name = core_->currencyList_.getCurrencyName(currencyID_); wxLogDebug(wxString::Format("activated item:%i currency:%s", selectedIndex_, currency_name)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |