[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 1959dc6 4/4: Align controls less haphazardly
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 1959dc6 4/4: Align controls less haphazardly |
|
Date: |
Fri, 24 Jul 2020 11:35:04 -0400 (EDT) |
branch: master
commit 1959dc6617e29d1d49f4afe6ba75e4cd0acb0c43
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Align controls less haphazardly
---
skin.xrc | 5 +++-
skin_coli_boli.xrc | 4 ----
skin_group_carveout.xrc | 62 ++++++++++++++++++++++++-------------------------
3 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/skin.xrc b/skin.xrc
index 8d63930..87e2909 100644
--- a/skin.xrc
+++ b/skin.xrc
@@ -2623,6 +2623,8 @@ the other is perforce ignored.
<orient>wxVERTICAL</orient>
<label>Funds</label>
<object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>2</border>
<object class="wxRadioBox" name="FundChoiceType">
<help>Fund allocation: for 100% general account, pick
"Choose funds"; for 100% separate account, pick "Average fund"</help>
<style>wxRA_SPECIFY_COLS</style>
@@ -2634,12 +2636,13 @@ the other is perforce ignored.
</object>
</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_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
<object class="wxStaticText">
<label>fee</label>
</object>
diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc
index 7d3307b..6668ca9 100644
--- a/skin_coli_boli.xrc
+++ b/skin_coli_boli.xrc
@@ -611,7 +611,6 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxTOP</flag>
- <border>2</border>
<object class="wxFlexGridSizer">
<cols>3</cols>
<rows>1</rows>
@@ -3243,7 +3242,6 @@ here, but it looks weird if we don't make this look like
its siblings.
<label>Honeymoon</label>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>3</rows>
@@ -3260,7 +3258,6 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxTOP|wxBOTTOM</flag>
- <border>2</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>1</rows>
@@ -3284,7 +3281,6 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
- <border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc
index ed748ad..e3ed0df 100644
--- a/skin_group_carveout.xrc
+++ b/skin_group_carveout.xrc
@@ -76,7 +76,7 @@
<growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxRadioBox"
name="GroupUnderwritingType">
<help>Group underwriting</help>
<style>wxRA_SPECIFY_COLS</style>
@@ -124,10 +124,10 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablerows>1,2,3</growablerows>
+ <growablerows>0,1,2,3,4,5,6,7</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
@@ -136,13 +136,13 @@
<label>Cell</label>
<object class="sizeritem">
<flag>wxALIGN_LEFT</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxFlexGridSizer">
<cols>0</cols>
<rows>1</rows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label># identical
lives</label>
</object>
@@ -170,7 +170,7 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxCheckBox"
name="RetireesCanEnroll">
<help>Let individuals enroll after their
retirement</help>
<label>Retirees eligible to enroll</label>
@@ -179,7 +179,7 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxCheckBox"
name="EffectiveDateToday">
<help>Set effective date to current date</help>
<label>Effective today</label>
@@ -187,7 +187,7 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
<object class="sizeritem">
@@ -199,7 +199,7 @@
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxDatePickerCtrl"
name="EffectiveDate">
<help>Effective date</help>
<size>90,-1</size>
@@ -209,7 +209,7 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
<object class="sizeritem">
@@ -231,7 +231,7 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
<object class="sizeritem">
@@ -257,7 +257,7 @@
<rows>1</rows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label>State of jurisdiction</label>
</object>
@@ -279,14 +279,14 @@
<rows>1</rows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label>Premium tax state</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxLEFT</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxComboBox"
name="PremiumTaxState">
<help>State to which premium tax is
paid--affects premium load if the tax is passed through</help>
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
@@ -1416,7 +1416,7 @@ here, but it looks weird if we don't make this look like
its siblings.
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxRIGHT</flag>
- <border>2</border>
+ <border>4</border>
<object class="wxRadioBox" name="SolveTarget">
<help>Target to solve for</help>
<style>wxRA_SPECIFY_COLS</style>
@@ -1430,7 +1430,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW</flag>
+ <flag>wxGROW|wxLEFT|wxRIGHT</flag>
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
@@ -1446,14 +1446,14 @@ here, but it looks weird if we don't make this look
like its siblings.
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label>Target amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxTOP</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxTextCtrl"
name="SolveTargetValue">
<help>Target amount</help>
</object>
@@ -1468,7 +1468,7 @@ here, but it looks weird if we don't make this look like
its siblings.
<rows>2</rows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to
be achieved</help>
<label>At</label>
@@ -1505,7 +1505,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
<object
class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object
class="wxStaticText">
<label>Year</label>
</object>
@@ -1514,13 +1514,13 @@ here, but it looks weird if we don't make this look
like its siblings.
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
- <border>4</border>
+ <border>2</border>
<object
class="wxFlexGridSizer">
<cols>2</cols>
<rows>1</rows>
<object
class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
- <border>4</border>
+ <border>2</border>
<object
class="wxSpinCtrl" name="SolveTargetAge">
<help>Attained
age to achieve target surrender value</help>
<size>50,-1</size>
@@ -1529,7 +1529,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
<object
class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object
class="wxStaticText">
<label>Age</label>
</object>
@@ -2274,7 +2274,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxCheckBox" name="WaiverOfPremiumBenefit">
<help>Waiver</help>
@@ -2283,7 +2283,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL</flag>
+ <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
@@ -2298,14 +2298,14 @@ here, but it looks weird if we don't make this look
like its siblings.
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label>Amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxTextCtrl" name="ChildRiderAmount">
<help>Child rider amount</help>
<size>100,-1</size>
@@ -2314,7 +2314,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_LEFT|wxLEFT|wxRIGHT|wxBOTTOM</flag>
+ <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
@@ -2329,14 +2329,14 @@ here, but it looks weird if we don't make this look
like its siblings.
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxStaticText">
<label>Amount</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxTextCtrl" name="SpouseRiderAmount">
<help>Spouse rider amount</help>
<size>100,-1</size>
@@ -2351,7 +2351,7 @@ here, but it looks weird if we don't make this look like
its siblings.
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <border>2</border>
<object class="wxSpinCtrl" name="SpouseIssueAge">
<help>Spouse insurance age on date of issue</help>
<style>wxSP_ARROW_KEYS</style>