[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 9373edc 6/8: Merge the last two 'skin.xrc' ch
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 9373edc 6/8: Merge the last two 'skin.xrc' changes into 'skin_group_carveout.xrc' |
|
Date: |
Fri, 4 May 2018 16:57:03 -0400 (EDT) |
branch: master
commit 9373edca356a2fa480c87241a66f22de38da04eb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Merge the last two 'skin.xrc' changes into 'skin_group_carveout.xrc'
This merge is in the spirit of the last commit to 'skin_coli_boli.xrc',
but with certain changes:
- CountryCoiMultiplier is copied but commented out, because it really
does belong here but might surprise end users; and
- ProjectedSalary is omitted because, for unfortunate historical
reasons, it's on an "Amounts" tab.
The combined effect of those changes, along with the oddly tall and
narrow geometry of this skin (attributable to the poor design of the
"Plan" tab), makes this "Participant" tab (and other tabs, e.g.,
"Amounts") look a little weird. The real solution to these issues
begins with cleaning up the "Plan" tab first.
---
skin_group_carveout.xrc | 95 +++++++++++++++++++++++++++++++------------------
1 file changed, 60 insertions(+), 35 deletions(-)
diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc
index c21b62d..2e2afe5 100644
--- a/skin_group_carveout.xrc
+++ b/skin_group_carveout.xrc
@@ -350,9 +350,9 @@
<object class="wxPanel" name="participant_panel">
<object class="wxFlexGridSizer">
- <rows>3</rows>
+ <rows>2</rows>
<growablecols>0</growablecols>
- <growablerows>1,2</growablerows>
+ <growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
@@ -475,47 +475,72 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>2</border>
<object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>1</growablecols>
- <object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Substandard table</label>
- </object>
- </object>
+ <cols>1</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1</growablerows>
+<!-- This control really should be here, but end users are not accustomed to
it.
<object class="sizeritem">
- <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxComboBox" name="SubstandardTable">
- <help>Substandard table rating</help>
- <style>wxCB_DROPDOWN|wxCB_READONLY</style>
+ <flag>wxALIGN_BOTTOM|wxGROW|wxALL</flag>
+ <object class="wxFlexGridSizer">
+ <rows>1</rows>
+ <growablecols>1</growablecols>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <object class="wxCheckBox"
name="OverrideCoiMultiplier">
+ <help>Override default country COI multiplier
for current COI rates</help>
+ <label>Override country COI multiplier </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="wxTextCtrl"
name="CountryCoiMultiplier">
+ <help>Country multiplier for current COI
rates</help>
+ <size>10,-1</size>
+ </object>
+ </object>
</object>
</object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>2</cols>
- <rows>2</rows>
- <growablecols>1</growablecols>
+-->
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Flat extra</label>
+ <flag>wxALIGN_BOTTOM|wxGROW|wxALL</flag>
+ <object class="wxFlexGridSizer">
+ <rows>1</rows>
+ <growablecols>1</growablecols>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <object class="wxStaticText">
+ <label>Substandard table </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="wxComboBox" name="SubstandardTable">
+ <help>Substandard table rating</help>
+ <style>wxCB_DROPDOWN|wxCB_READONLY</style>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="InputSequenceEntry" name="FlatExtra">
- <title>Annual flat extra per thousand</title>
- <help>Annual flat extra per thousand</help>
+ <flag>wxALIGN_BOTTOM|wxGROW|wxALL</flag>
+ <object class="wxFlexGridSizer">
+ <rows>1</rows>
+ <growablecols>1</growablecols>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <object class="wxStaticText">
+ <label>Flat extra </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="InputSequenceEntry"
name="FlatExtra">
+ <title>Annual flat extra per thousand</title>
+ <help>Annual flat extra per thousand</help>
+ <size>10,-1</size>
+ </object>
+ </object>
</object>
</object>
</object>
- [lmi-commits] [lmi] master updated (27da585 -> 7e6a56c), Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master 4ee70df 2/8: Rearrange fields that can never be edited, Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master 0a1a70b 1/8: Simplify fields that can never be edited, Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master 9373edc 6/8: Merge the last two 'skin.xrc' changes into 'skin_group_carveout.xrc',
Greg Chicares <=
- [lmi-commits] [lmi] master 17e443a 5/8: Merge the last two 'skin.xrc' changes into 'skin_coli_boli.xrc', Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master 34117af 7/8: Adjust DateOfBirth width, Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master 7e6a56c 8/8: Use style wxSP_ARROW_KEYS for all spin controls, Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master b2abc1d 4/8: Improve control alignment, Greg Chicares, 2018/05/04
- [lmi-commits] [lmi] master c6bda75 3/8: Rearrange controls, Greg Chicares, 2018/05/04