[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[6541] trunk/src

[<vo...@us...>]

Revision: 6541
          http://sourceforge.net/p/moneymanagerex/code/6541
Author:   vomikan
Date:     2014-05-08 09:54:41 +0000 (Thu, 08 May 2014)
Log Message:
-----------
wxRichToolTip for error values

Modified Paths:
--------------
    trunk/src/assetdialog.cpp
    trunk/src/util.cpp
    trunk/src/util.h

Modified: trunk/src/assetdialog.cpp
===================================================================
--- trunk/src/assetdialog.cpp	2014-05-08 09:18:27 UTC (rev 6540)
+++ trunk/src/assetdialog.cpp	2014-05-08 09:54:41 UTC (rev 6541)
@@ -20,6 +20,7 @@
 #include "paths.h"
 #include "constants.h"
 #include "validators.h"
+#include "util.h"
 #include "model/Model_Asset.h"
 #include "model/Model_Attachment.h"
 #include "../resources/attachment.xpm"
@@ -113,9 +114,11 @@
     wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(0, 2, 0, 0);
     itemPanel5->SetSizer(itemFlexGridSizer6);
 
-    itemFlexGridSizer6->Add(new wxStaticText( itemPanel5, wxID_STATIC, _("Name")), g_flags);
+    wxStaticText* n = new wxStaticText(itemPanel5, wxID_STATIC, _("Name"));
+    itemFlexGridSizer6->Add(n, g_flags);
+    n->SetFont(this->GetFont().Bold());
 
-    m_assetName = new mmTextCtrl(itemPanel5, wxID_ANY, wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0);
+    m_assetName = new mmTextCtrl(itemPanel5, wxID_ANY, wxGetEmptyString());
     m_assetName->SetToolTip(_("Enter the name of the asset"));
     itemFlexGridSizer6->Add(m_assetName, g_flagsExpand);
 
@@ -137,7 +140,9 @@
     itemFlexGridSizer6->Add(m_assetType, 0,
         wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    itemFlexGridSizer6->Add(new wxStaticText(itemPanel5, wxID_STATIC, _("Value")), g_flags);
+    wxStaticText* v = new wxStaticText(itemPanel5, wxID_STATIC, _("Value"));
+    itemFlexGridSizer6->Add(v, g_flags);
+    v->SetFont(this->GetFont().Bold());
 
     m_value = new mmTextCtrl(itemPanel5, IDC_VALUE, wxGetEmptyString()
         , wxDefaultPosition, wxSize(150,-1), wxALIGN_RIGHT|wxTE_PROCESS_ENTER
@@ -221,29 +226,23 @@
 
 void mmAssetDialog::OnOk(wxCommandEvent& /*event*/)
 {
-    double value;
+    const wxString name = m_assetName->GetValue().Trim();
+    if (name.empty()){
+        mmMessageNameInvalid(m_assetName);
+        return;
+    }
+
+    double value = 0, valueChangeRate = 0;
     if (!m_value->checkValue(value))
     {
         return;
     }
 
     int valueChangeType = m_valueChange->GetSelection();
-    wxString valueChangeRateStr = m_valueChangeRate->GetValue().Trim();
-    if (valueChangeRateStr.IsEmpty() && valueChangeType != Model_Asset::RATE_NONE)
+    if (valueChangeType != Model_Asset::RATE_NONE && !m_valueChangeRate->checkValue(valueChangeRate))
     {
-        wxMessageBox(_("Rate of Change in Value"), _("Invalid Entry"), wxOK | wxICON_ERROR);
         return;
     }
-    double valueChangeRate = 0;
-    if (!wxNumberFormatter::FromString(valueChangeRateStr, &valueChangeRate) || valueChangeRate < 0)
-    {
-        if (valueChangeType != Model_Asset::RATE_NONE)
-        {
-            wxMessageBox(_("Invalid Value "), _("Invalid Entry"), wxOK | wxICON_ERROR);
-            return;
-        }
-        valueChangeRate = 0;
-    }
 
     wxString asset_type = "";
     wxStringClientData* type_obj = (wxStringClientData *)m_assetType->GetClientObject(m_assetType->GetSelection());
@@ -253,7 +252,7 @@
 
     m_asset->STARTDATE        = m_dpc->GetValue().FormatISODate();
     m_asset->NOTES            = m_notes->GetValue().Trim();
-    m_asset->ASSETNAME        = m_assetName->GetValue().Trim();
+    m_asset->ASSETNAME        = name;
     m_asset->VALUE            = value;
     m_asset->VALUECHANGE      = Model_Asset::all_rate()[valueChangeType];
     m_asset->VALUECHANGERATE  = valueChangeRate;

Modified: trunk/src/util.cpp
===================================================================
--- trunk/src/util.cpp	2014-05-08 09:18:27 UTC (rev 6540)
+++ trunk/src/util.cpp	2014-05-08 09:54:41 UTC (rev 6541)
@@ -434,6 +434,16 @@
     tip.ShowFor((wxWindow*)comboBox);
 }
 
+void mmMessageNameInvalid(wxTextCtrl *textBox)
+{
+    const wxString errorHeader = _("Invalid Name");
+    const wxString errorMessage = (_("Please type in a non empty name.")
+        + "\n");
+    wxRichToolTip tip(errorHeader, errorMessage);
+    tip.SetIcon(wxICON_WARNING);
+    tip.ShowFor((wxWindow*) textBox);
+}
+
 //
 const wxString mmPlatformType()
 {

Modified: trunk/src/util.h
===================================================================
--- trunk/src/util.h	2014-05-08 09:18:27 UTC (rev 6540)
+++ trunk/src/util.h	2014-05-08 09:54:41 UTC (rev 6541)
@@ -113,6 +113,7 @@
 void mmMessageCategoryInvalid(wxButton *button);
 void mmMessageAccountInvalid(wxComboBox *comboBox, bool transfer = false);
 void mmMessagePayeeInvalid(wxComboBox *comboBox);
+void mmMessageNameInvalid(wxTextCtrl *textBox);
 
 const wxString mmSelectLanguage(wxWindow *parent, bool forced_show_dlg, bool save_setting = true);
 

This was sent by MMEX an easy to use, money management application.