|
| From: | Greg Chicares |
| Subject: | [lmi-commits] (no subject) |
| Date: | Fri, 1 Jul 2016 16:27:42 +0000 (UTC) |
branch: master
commit 0888f213f4fec5f013611dee5f4ab5e4f183b924
Author: Vadim Zeitlin <address@hidden>
Date: Mon Jun 27 01:22:38 2016 +0200
Improve layout of the "Names" page of group carveout skin
Align the labels vertically with their corresponding text controls.
Also put the street address on its own line and combine city, state and
ZIP controls on another one as they typically need less space
(especially the latter).
The text controls for the various entities are still not aligned
vertically because of an over long "Employee Class" string in the top
one, this could be fixed in the future by either shortening this label,
if possible, making another one artificially longer or, in the worst
case, by creating an invisible (but with space still reserved for it)
control with the same label in the two other zones too.
---
skin_group_carveout.xrc | 417 ++++++++++++++++++++---------------------------
1 file changed, 177 insertions(+), 240 deletions(-)
diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc
index 09d6d6c..7fc4081 100644
--- a/skin_group_carveout.xrc
+++ b/skin_group_carveout.xrc
@@ -2360,114 +2360,93 @@ here, but it looks weird if we don't make this look
like its siblings.
<object class="wxFlexGridSizer">
<cols>2</cols>
<growablecols>1</growablecols>
+ <vgap>2</vgap>
+ <hgap>4</hgap>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Name</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="InsuredName">
+ <help>Insured full name</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Address</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="Address">
+ <help>Insured street address</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>City</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Name</label>
+ <option>1</option>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="City">
+ <help>Insured city</help>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Address</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
<object class="wxStaticText">
<label>State</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Employee Class</label>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
- <growablecols>0</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="InsuredName">
- <help>Insured full name</help>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>0</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="Address">
- <help>Insured street
address</help>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>City</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="City">
- <help>Insured city</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxComboBox" name="State">
+ <help>Insured state</help>
+
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
+
<content><item>MM</item><item>WW</item></content>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>2</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxComboBox"
name="State">
- <help>Insured state</help>
-
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
-
<content><item>MM</item><item>WW</item></content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Zip</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="ZipCode">
- <help>Insured ZIP code</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
+ <object class="wxStaticText">
+ <label>Zip</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="EmployeeClass">
- <help>Employee Class</help>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxTextCtrl" name="ZipCode">
+ <help>Insured ZIP code</help>
</object>
</object>
</object>
</object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Employee Class</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="EmployeeClass">
+ <help>Employee Class</help>
+ </object>
+ </object>
</object>
</object>
</object>
@@ -2484,98 +2463,77 @@ here, but it looks weird if we don't make this look
like its siblings.
<object class="wxFlexGridSizer">
<cols>2</cols>
<growablecols>1</growablecols>
+ <vgap>2</vgap>
+ <hgap>4</hgap>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Name</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="CorporationName">
+ <help>Corporation name</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Address</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl"
name="CorporationAddress">
+ <help>Corporation street address</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>City</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Name</label>
+ <option>1</option>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl"
name="CorporationCity">
+ <help>Corporation city</help>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Address</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
<object class="wxStaticText">
<label>State</label>
</object>
</object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
- <growablecols>0</growablecols>
<object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="CorporationName">
- <help>Corporation name</help>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxComboBox"
name="CorporationState">
+ <help>Corporation state</help>
+
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
+
<content><item>MM</item><item>WW</item></content>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>0</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="CorporationAddress">
- <help>Corporation street
address</help>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>City</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="CorporationCity">
- <help>Corporation city</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
+ <object class="wxStaticText">
+ <label>Zip</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>2</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxComboBox"
name="CorporationState">
- <help>Corporation state</help>
-
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
-
<content><item>MM</item><item>WW</item></content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>2</border>
- <object class="wxStaticText">
- <label>Zip</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="CorporationZipCode">
- <help>Corporation ZIP
code</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxTextCtrl"
name="CorporationZipCode">
+ <help>Corporation ZIP code</help>
</object>
</object>
</object>
@@ -2596,98 +2554,77 @@ here, but it looks weird if we don't make this look
like its siblings.
<object class="wxFlexGridSizer">
<cols>2</cols>
<growablecols>1</growablecols>
+ <vgap>2</vgap>
+ <hgap>4</hgap>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>2</border>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
- <object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Name</label>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Name</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="AgentName">
+ <help>Agent full name</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Address</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl" name="AgentAddress">
+ <help>Agent street address</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>City</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Address</label>
+ <option>1</option>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl"
name="AgentCity">
+ <help>Agent city</help>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
<object class="wxStaticText">
<label>State</label>
</object>
</object>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <border>4</border>
- <object class="wxFlexGridSizer">
- <cols>1</cols>
- <growablecols>0</growablecols>
<object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="AgentName">
- <help>Agent full name</help>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxComboBox"
name="AgentState">
+ <help>Agent state</help>
+
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
+
<content><item>MM</item><item>WW</item></content>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>0</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="AgentAddress">
- <help>Agent street
address</help>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>City</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="AgentCity">
- <help>Agent city</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>8</border>
+ <object class="wxStaticText">
+ <label>Zip</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxGROW|wxALL</flag>
- <object class="wxFlexGridSizer">
- <rows>1</rows>
- <growablecols>2</growablecols>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxComboBox"
name="AgentState">
- <help>Agent state</help>
-
<style>wxCB_DROPDOWN|wxCB_READONLY</style>
-
<content><item>MM</item><item>WW</item></content>
- </object>
- </object>
- <object class="sizeritem">
-
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Zip</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="AgentZipCode">
- <help>Agent ZIP code</help>
- </object>
- </object>
+ <flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
+ <border>2</border>
+ <object class="wxTextCtrl"
name="AgentZipCode">
+ <help>Agent ZIP code</help>
</object>
</object>
</object>
| [Prev in Thread] | Current Thread | [Next in Thread] |