Hi all,
I just fixed some UI problem with CTL. Could you please review the fix,
sign it off and push it?
The problem that may appear here is that I needed to reduce the
available space for some strings. I'm not sure it fits for all locales
thought it should be OK.
Thanks,
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
From f97f0b96e875267db0b39f5808627e1bd7c94868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat.ooo@free.fr>
Date: Fri, 20 May 2011 16:54:46 +0200
Subject: [PATCH] fdo#37387, reorganized columns dialog to show text direction correctly
---
sw/source/ui/frmdlg/column.cxx | 19 --------
sw/source/ui/frmdlg/column.hrc | 2 -
sw/source/ui/frmdlg/column.src | 90 +++++++++++++++++-----------------------
sw/source/ui/inc/column.hxx | 2 -
4 files changed, 38 insertions(+), 75 deletions(-)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 058a622..fc4da4a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -449,8 +449,6 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
aLinePosLbl(this, SW_RES(FT_POSITION)),
aLinePosDLB(this, SW_RES(LB_POSITION)),
- aVertFL(this, SW_RES(FL_VERT)),
- aPropertiesFL( this, SW_RES( FL_PROPERTIES )),
aTextDirectionFT( this, SW_RES( FT_TEXTDIRECTION )),
aTextDirectionLB( this, SW_RES( LB_TEXTDIRECTION )),
@@ -1332,25 +1330,8 @@ void SwColumnPage::SetInSection(sal_Bool bSet)
if(!SW_MOD()->GetCTLOptions().IsCTLFontEnabled())
return;
- aVertFL.Show(bSet);
- aPropertiesFL.Show(bSet);
aTextDirectionFT.Show(bSet);
aTextDirectionLB.Show(bSet);
- if(bSet)
- {
- //resize line type FixedLine
- Point aLtPos = aFLLineType.GetPosPixel();
- Point aPropPos = aPropertiesFL.GetPosPixel();
- Size aSz = aFLLineType.GetSizePixel();
- aSz.Width() = aPropPos.X() - aLtPos.X() - LogicToPixel(Size(8, 8), MAP_APPFONT).Width();
- aFLLineType.SetSizePixel(aSz);
- }
- else
- {
- Size aSz = aFLLineType.GetSizePixel();
- aSz.Width() = LogicToPixel(Size(248, 248), MAP_APPFONT).Width();
- aFLLineType.SetSizePixel(aSz);
- }
}
void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc
index a45c68d..906f1b8 100644
--- a/sw/source/ui/frmdlg/column.hrc
+++ b/sw/source/ui/frmdlg/column.hrc
@@ -75,10 +75,8 @@
#define PB_CANCEL 56
#define PB_OK 57
#define CB_BALANCECOLS 58
-#define FL_PROPERTIES 59
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
-#define FL_VERT 62
#define FT_LINEWIDTH 63
#define ED_LINEWIDTH 64
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 30d96c5..b2b880a 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -85,7 +85,7 @@ TabPage TP_COLUMN
};
FixedText FT_COLUMN
{
- Pos = MAP_APPFONT ( 12 , 70 ) ;
+ Pos = MAP_APPFONT ( 12 , 86 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Column";
@@ -99,28 +99,28 @@ TabPage TP_COLUMN
{
HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN";
Disable = TRUE ;
- Pos = MAP_APPFONT ( 62 , 69 ) ;
+ Pos = MAP_APPFONT ( 62 , 85 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
};
FixedText FT_1
{
- Pos = MAP_APPFONT ( 100 , 71 ) ;
+ Pos = MAP_APPFONT ( 100 , 87 ) ;
Size = MAP_APPFONT ( 10 , 8 ) ;
Text = "~1" ;
Center = TRUE ;
};
FixedText FT_2
{
- Pos = MAP_APPFONT ( 150 , 71 ) ;
+ Pos = MAP_APPFONT ( 150 , 87 ) ;
Size = MAP_APPFONT ( 10 , 8 ) ;
Text = "~2" ;
Center = TRUE ;
};
FixedText FT_3
{
- Pos = MAP_APPFONT ( 200 , 71 ) ;
+ Pos = MAP_APPFONT ( 200 , 87 ) ;
Size = MAP_APPFONT ( 10 , 8 ) ;
Text = "~3" ;
Center = TRUE ;
@@ -129,14 +129,14 @@ TabPage TP_COLUMN
{
HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP";
Disable = TRUE ;
- Pos = MAP_APPFONT ( 238 , 69 ) ;
+ Pos = MAP_APPFONT ( 238 , 85 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
SYMBOL = IMAGEBUTTON_ARROW_RIGHT ;
};
FixedText FT_WIDTH
{
- Pos = MAP_APPFONT ( 12 , 85 ) ;
+ Pos = MAP_APPFONT ( 12 , 101 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Width" ;
@@ -146,7 +146,7 @@ TabPage TP_COLUMN
HelpID = "sw:MetricField:TP_COLUMN:ED_1";
Disable = TRUE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 87 , 83 ) ;
+ Pos = MAP_APPFONT ( 87 , 99 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
@@ -165,7 +165,7 @@ TabPage TP_COLUMN
HelpID = "sw:MetricField:TP_COLUMN:ED_2";
Disable = TRUE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 137 , 83 ) ;
+ Pos = MAP_APPFONT ( 137 , 99 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
@@ -184,7 +184,7 @@ TabPage TP_COLUMN
HelpID = "sw:MetricField:TP_COLUMN:ED_3";
Disable = TRUE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 187 , 83 ) ;
+ Pos = MAP_APPFONT ( 187 , 99 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
@@ -200,7 +200,7 @@ TabPage TP_COLUMN
};
FixedText FT_DIST
{
- Pos = MAP_APPFONT ( 12 , 101 ) ;
+ Pos = MAP_APPFONT ( 12 , 117 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Spacing" ;
@@ -210,7 +210,7 @@ TabPage TP_COLUMN
HelpID = "sw:MetricField:TP_COLUMN:ED_DIST1";
Disable = TRUE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 112 , 99 ) ;
+ Pos = MAP_APPFONT ( 112 , 115 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
@@ -229,7 +229,7 @@ TabPage TP_COLUMN
HelpID = "sw:MetricField:TP_COLUMN:ED_DIST2";
Disable = TRUE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 162 , 99 ) ;
+ Pos = MAP_APPFONT ( 162 , 115 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
@@ -246,45 +246,45 @@ TabPage TP_COLUMN
CheckBox CB_AUTO_WIDTH
{
HelpID = "sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH";
- Pos = MAP_APPFONT ( 87 , 115 ) ;
+ Pos = MAP_APPFONT ( 87 , 131 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "Auto~Width" ;
TabStop = TRUE ;
};
FixedLine FL_LAYOUT
{
- Pos = MAP_APPFONT ( 6 , 58 ) ;
+ Pos = MAP_APPFONT ( 6 , 74 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Width and spacing";
};
FixedText FT_STYLE
{
- Pos = MAP_APPFONT ( 12 , 140 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 12 , 156 ) ;
+ Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "St~yle" ;
Left = TRUE ;
};
ListBox LB_STYLE
{
HelpID = "sw:ListBox:TP_COLUMN:LB_STYLE";
- Pos = MAP_APPFONT ( 50 , 138 ) ;
- Size = MAP_APPFONT ( 60 , 66 ) ;
+ Pos = MAP_APPFONT ( 40 , 154 ) ;
+ Size = MAP_APPFONT ( 35 , 66 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_LINEWIDTH
{
- Pos = MAP_APPFONT ( 12 , 156 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 12 , 172 ) ;
+ Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "~Width" ;
Left = TRUE ;
};
MetricField ED_LINEWIDTH
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 154 ) ;
- Size = MAP_APPFONT ( 60 , 12 ) ;
+ Pos = MAP_APPFONT ( 40 , 170 ) ;
+ Size = MAP_APPFONT ( 35 , 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
@@ -298,15 +298,15 @@ TabPage TP_COLUMN
};
FixedText FT_COLOR
{
- Pos = MAP_APPFONT ( 12 , 172 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 160 , 156 ) ;
+ Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "~Color" ;
Left = TRUE ;
};
ListBox LB_COLOR
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 170 ) ;
+ Pos = MAP_APPFONT ( 188 , 154 ) ;
Size = MAP_APPFONT ( 60 , 68 ) ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -314,8 +314,8 @@ TabPage TP_COLUMN
};
FixedText FT_HEIGHT
{
- Pos = MAP_APPFONT ( 122 , 140 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 86 , 156 ) ;
+ Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "H~eight" ;
Left = TRUE ;
};
@@ -323,8 +323,8 @@ TabPage TP_COLUMN
{
HelpID = "sw:MetricField:TP_COLUMN:ED_HEIGHT";
Border = TRUE ;
- Pos = MAP_APPFONT ( 160 , 138 ) ;
- Size = MAP_APPFONT ( 60 , 12 ) ;
+ Pos = MAP_APPFONT ( 114 , 154 ) ;
+ Size = MAP_APPFONT ( 35 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
@@ -339,16 +339,16 @@ TabPage TP_COLUMN
};
FixedText FT_POSITION
{
- Pos = MAP_APPFONT ( 122 , 156 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 86 , 172 ) ;
+ Size = MAP_APPFONT ( 25 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "~Position" ;
};
ListBox LB_POSITION
{
HelpID = "sw:ListBox:TP_COLUMN:LB_POSITION";
- Pos = MAP_APPFONT ( 160 , 154 ) ;
- Size = MAP_APPFONT ( 60 , 40 ) ;
+ Pos = MAP_APPFONT ( 114 , 170 ) ;
+ Size = MAP_APPFONT ( 35 , 40 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
@@ -360,28 +360,14 @@ TabPage TP_COLUMN
};
FixedLine FL_LINETYPE
{
- Pos = MAP_APPFONT ( 6 , 127 ) ;
+ Pos = MAP_APPFONT ( 6 , 143 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Separator line" ;
};
- FixedLine FL_VERT
- {
- Pos = MAP_APPFONT ( 116 , 138 ) ;
- Size = MAP_APPFONT ( 4 , 43 ) ;
- Hide = TRUE ;
- Vert = TRUE;
- };
- FixedLine FL_PROPERTIES
- {
- Pos = MAP_APPFONT ( 121 , 127 ) ;
- Size = MAP_APPFONT ( 133 , 8 ) ;
- Hide = TRUE ;
- Text [ en-US ] = "Properties";
- };
FixedText FT_TEXTDIRECTION
{
- Pos = MAP_APPFONT ( 127 , 138 ) ;
- Size = MAP_APPFONT ( 127 , 8 ) ;
+ Pos = MAP_APPFONT ( 12 , 60 ) ;
+ Size = MAP_APPFONT ( 60 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Text ~direction";
};
@@ -389,7 +375,7 @@ TabPage TP_COLUMN
{
HelpID = "sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION";
Border = TRUE ;
- Pos = MAP_APPFONT ( 127 , 149 ) ;
+ Pos = MAP_APPFONT ( 75 , 58 ) ;
Size = MAP_APPFONT ( 127 , 50 ) ;
DropDown = TRUE ;
Hide = TRUE ;
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 865e55c..04ca404 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -139,8 +139,6 @@ class SwColumnPage : public SfxTabPage
FixedText aLinePosLbl;
ListBox aLinePosDLB;
- FixedLine aVertFL;
- FixedLine aPropertiesFL;
FixedText aTextDirectionFT;
ListBox aTextDirectionLB;
--
1.7.3.4
Context
- [Libreoffice] [REVIEW] Fix for fdo#37387 · Cedric Bosdonnat
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.