[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c54532c 1/3: Let CSV and NAAR solve targets s
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master c54532c 1/3: Let CSV and NAAR solve targets share the same input field |
|
Date: |
Tue, 14 Nov 2017 12:57:54 -0500 (EST) |
branch: master
commit c54532cbd1bb88ba2937a01d1ee94ce57dee6647
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Let CSV and NAAR solve targets share the same input field
Renamed the shared field to 'Target amount' in all skins that have it,
and changed its help hint accordingly.
---
ihs_avsolve.cpp | 3 +--
skin.xrc | 4 ++--
skin_coli_boli.xrc | 4 ++--
skin_group_carveout.xrc | 4 ++--
skin_group_carveout3.xrc | 4 ++--
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index 5549387..b71676d 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -206,8 +206,7 @@ double AccountValue::SolveTest(double a_CandidateValue)
// must decrement it.
double value = VariantValues().CSVNet[SolveTargetDuration_ - 1];
// INPUT !! Rename: s/SolveTargetCashSurrenderValue/SolveTargetValue/
- // Use yare_input_.SolveTargetCashSurrenderValue as the target
- // NAAR, for now at least.
+ // because it's used for both target CSV and target NAAR.
if(mce_solve_for_target_naar == SolveTarget_)
{
value =
diff --git a/skin.xrc b/skin.xrc
index c25a625..1848c5f 100644
--- a/skin.xrc
+++ b/skin.xrc
@@ -1909,13 +1909,13 @@ here, but it looks weird if we don't make this look
like its siblings.
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<object class="wxStaticText">
- <label>Target CSV amount </label>
+ <label>Target amount </label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
<object class="wxTextCtrl"
name="SolveTargetCashSurrenderValue">
- <help>Target surrender value</help>
+ <help>Target amount</help>
<size>10,-1</size>
</object>
</object>
diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc
index d5c0391..73a2faf 100644
--- a/skin_coli_boli.xrc
+++ b/skin_coli_boli.xrc
@@ -2224,14 +2224,14 @@ here, but it looks weird if we don't make this look
like its siblings.
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
<border>2</border>
<object class="wxStaticText">
- <label>Target CSV amount</label>
+ <label>Target amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxBOTTOM</flag>
<border>2</border>
<object class="wxTextCtrl"
name="SolveTargetCashSurrenderValue">
- <help>Target surrender value</help>
+ <help>Target amount</help>
</object>
</object>
</object>
diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc
index 7f9c0e7..e738013 100644
--- a/skin_group_carveout.xrc
+++ b/skin_group_carveout.xrc
@@ -1447,14 +1447,14 @@ here, but it looks weird if we don't make this look
like its siblings.
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Target CSV value</label>
+ <label>Target amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxTOP</flag>
<border>4</border>
<object class="wxTextCtrl"
name="SolveTargetCashSurrenderValue">
- <help>Target surrender
value</help>
+ <help>Target amount</help>
</object>
</object>
</object>
diff --git a/skin_group_carveout3.xrc b/skin_group_carveout3.xrc
index c7b733a..e924d10 100644
--- a/skin_group_carveout3.xrc
+++ b/skin_group_carveout3.xrc
@@ -768,14 +768,14 @@
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Target CSV value</label>
+ <label>Target amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxTOP</flag>
<border>4</border>
<object class="wxTextCtrl"
name="SolveTargetCashSurrenderValue">
- <help>Target surrender
value</help>
+ <help>Target amount</help>
</object>
</object>
</object>