[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 17e443a 5/8: Merge the last two 'skin.xrc' ch
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 17e443a 5/8: Merge the last two 'skin.xrc' changes into 'skin_coli_boli.xrc' |
|
Date: |
Fri, 4 May 2018 16:57:03 -0400 (EDT) |
branch: master
commit 17e443a5f26d2f72ac4e030cde5ab66445a9148b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Merge the last two 'skin.xrc' changes into 'skin_coli_boli.xrc'
---
skin_coli_boli.xrc | 150 ++++++++++++++++++++++++++---------------------------
1 file changed, 74 insertions(+), 76 deletions(-)
diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc
index 67e01c0..02307f2 100644
--- a/skin_coli_boli.xrc
+++ b/skin_coli_boli.xrc
@@ -878,60 +878,6 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxStaticBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <label>Country COI multiplier</label>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxCheckBox"
name="OverrideCoiMultiplier">
- <help>Override default country COI multiplier
for current COI rates</help>
- <label>Override</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxTextCtrl"
name="CountryCoiMultiplier">
- <help>Country multiplier for current COI
rates</help>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxStaticBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <label>Substandard</label>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Table rating</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxComboBox" name="SubstandardTable">
- <help>Substandard table rating</help>
- <size>-1,20</size>
- <style>wxCB_DROPDOWN|wxCB_READONLY</style>
- </object>
- </object>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
@@ -1047,39 +993,91 @@
</object>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <border>4</border>
<object class="wxFlexGridSizer">
- <cols>2</cols>
- <rows>2</rows>
- <growablecols>1</growablecols>
+ <cols>1</cols>
+ <growablecols>0</growablecols>
+ <growablerows>0,1,2,3</growablerows>
<object class="sizeritem">
- <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Salary</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="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 class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="InputSequenceEntry" name="ProjectedSalary">
- <title>Projected annual salary</title>
- <help>Projected annual salary</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>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>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>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 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>Salary </label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="InputSequenceEntry"
name="ProjectedSalary">
+ <title>Projected annual salary</title>
+ <help>Projected annual salary</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, 2018/05/04
- [lmi-commits] [lmi] master 17e443a 5/8: Merge the last two 'skin.xrc' changes into 'skin_coli_boli.xrc',
Greg Chicares <=
- [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