From fd8324adb1e8024a0bb37bf096cf5988be1ead62 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Apr 2013 10:38:11 +0100 Subject: use a size-group for the labels to get things to align nicely It appears I have a small bug in how size-groups and/or generic size-requests work. It seems that margins should be part of the request, but I'm adding those on after the request, not as part of the request. But we can workaround that by putting a one element box around the elements with margins and put those boxes into the size group instead. That way it works now, and will continue to work after I change the request+margin logic tristates are a pain, They are always set to "state unknown" on .ui load, while in .src load they default to "state nocheck". So to be super sure that the logic is unchanged set them explicitly initially in .cxx to "state nocheck" restore accessibility relationship between tristate used as a label and the labeled thing. Change-Id: Ibf4879c3e9a4ecc4726896479377f51bf727b238 --- sw/uiconfig/swriter/ui/numparapage.ui | 172 ++++++++++++++++------------------ 1 file changed, 83 insertions(+), 89 deletions(-) (limited to 'sw/uiconfig') diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui index e7209f1ad383..6ccd65ac1e06 100644 --- a/sw/uiconfig/swriter/ui/numparapage.ui +++ b/sw/uiconfig/swriter/ui/numparapage.ui @@ -41,7 +41,10 @@ True False start + 0 Outline level: + True + comboLB_OUTLINE_LEVEL False @@ -50,10 +53,24 @@ - + True False - liststoreOUTLINE_LEVEL + 0 + 1 + + Body text + Level 1 + Level 2 + Level 3 + Level 4 + Level 5 + Level 6 + Level 7 + Level 8 + Level 9 + Level 10 + False @@ -104,12 +121,13 @@ True False - 6 + 12 True False start + 0 _Numbering style: True @@ -120,10 +138,14 @@ - + True False - liststoreNUMBERING + 0 + 1 + + None + False @@ -143,6 +165,7 @@ R_estart at this paragraph True False + True none True 0 @@ -157,18 +180,35 @@ + False False - 6 + 12 - - S_tart with: + True - True - False - True - 0 - True - True + False + vertical + + + S_tart with: + True + True + False + 12 + True + 0 + True + True + + + + + + True + True + 0 + + False @@ -273,17 +313,31 @@ True + False False - 6 + 12 - + True False - start - 12 - _Start with: - True - spinNF_RESTART_PARA + vertical + + + True + False + start + 12 + 0 + _Start with: + True + spinNF_RESTART_PARA + + + True + True + 0 + + False @@ -334,74 +388,6 @@ - - - - - - - - - - None - 1 - - - - - - - - - - - - - Body text - 0 - - - Level 1 - 1 - - - Level 2 - 2 - - - Level 3 - 3 - - - Level 4 - 4 - - - Level 5 - 5 - - - Level 6 - 6 - - - Level 7 - 7 - - - Level 8 - 8 - - - Level 9 - 9 - - - Level 10 - 10 - - - @@ -410,4 +396,12 @@ + + + + + + + + -- cgit