summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--svx/source/dialog/dlgctrl.cxx16
-rw-r--r--svx/source/dialog/tabarea.hrc6
-rw-r--r--svx/source/dialog/tabarea.src617
-rw-r--r--svx/source/dialog/tparea.cxx20
4 files changed, 311 insertions, 348 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index db8760df0d7d..3ce092ead36d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlgctrl.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: dr $ $Date: 2001-06-14 16:14:55 $
+ * last change: $Author: dr $ $Date: 2001-06-15 16:58:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1812,16 +1812,9 @@ SvxXRectPreview::SvxXRectPreview( Window* pParent, const ResId& rResId, XOutputD
pXOutDev( pXOut )
{
+ SetBorderStyle( WINDOW_BORDER_MONO );
SetMapMode( MAP_100TH_MM );
- Size aSize = GetOutputSize();
-
- Size aTmp(1, 1);
- aTmp = PixelToLogic(aTmp);
- aSize.Width() -= aTmp.Width() /2;
- aSize.Height() -= aTmp.Height() /2;
-
- aRect = Rectangle( Point(), aSize );
-
+ aRect = Rectangle( Point(), GetOutputSize() );
InitSettings( TRUE, TRUE );
}
@@ -1854,6 +1847,7 @@ void SvxXRectPreview::InitSettings( BOOL bForeground, BOOL bBackground )
void SvxXRectPreview::Paint( const Rectangle& rRect )
{
+ pXOutDev->SetLineColor( Color( COL_TRANSPARENT ) );
pXOutDev->DrawRect( aRect );
}
diff --git a/svx/source/dialog/tabarea.hrc b/svx/source/dialog/tabarea.hrc
index 70e4f18fc7f4..1906cde285c9 100644
--- a/svx/source/dialog/tabarea.hrc
+++ b/svx/source/dialog/tabarea.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: tabarea.hrc,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fme $ $Date: 2001-05-15 11:46:06 $
+ * last change: $Author: dr $ $Date: 2001-06-15 16:58:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,7 +140,7 @@
#define FL_SIZE 3
#define FL_POSITION 4
#define FL_OFFSET 5
-#define FT_STEPCOUNT 7
+#define FL_STEPCOUNT 7
// Farben definieren TabPage
// nur temporaer !!!
diff --git a/svx/source/dialog/tabarea.src b/svx/source/dialog/tabarea.src
index 4933d950bc8b..0db35b5d6ec1 100644
--- a/svx/source/dialog/tabarea.src
+++ b/svx/source/dialog/tabarea.src
@@ -2,9 +2,9 @@
*
* $RCSfile: tabarea.src,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: fme $ $Date: 2001-06-14 17:58:13 $
+ * last change: $Author: dr $ $Date: 2001-06-15 16:58:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -161,8 +161,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE
MetricField MTR_TRANSPARENT
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 72 , 27 ) ;
- Size = MAP_APPFONT ( 30, 12 ) ;
+ Pos = MAP_APPFONT ( 72 , 26 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -177,8 +177,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 110 , 10 ) ;
- Text = "Verlauf" ;
- Text [ ENGLISH ] = "Gradient" ;
+ Text = "~Verlauf" ;
+ Text [ ENGLISH ] = "~Gradient" ;
Text[ english_us ] = "Transparency ~gradient";
Text[ portuguese ] = "~Gradao da transparncia";
Text[ russian ] = "";
@@ -253,195 +253,195 @@ TabPage RID_SVXPAGE_TRANSPARENCE
< "Quadratisch" ; Default ; > ;
< "Rechteckig" ; Default ; > ;
};
- StringList [ language_user1 ] =
- {
+ StringList [ language_user1 ] =
+ {
< "Linear" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsoid" ; Default ; > ;
- < "Quadratisch" ; Default ; > ;
- < "Rechteckig" ; Default ; > ;
- };
- StringList [ english_us ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Ellipsoid" ; Default ; > ;
+ < "Quadratisch" ; Default ; > ;
+ < "Rechteckig" ; Default ; > ;
+ };
+ StringList [ english_us ] =
+ {
< "Linear" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsoid" ; Default ; > ;
- < "Quadratic" ; Default ; > ;
- < "Square" ; Default ; > ;
- };
- StringList [ portuguese ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Ellipsoid" ; Default ; > ;
+ < "Quadratic" ; Default ; > ;
+ < "Square" ; Default ; > ;
+ };
+ StringList [ portuguese ] =
+ {
< "Linear" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Elipside" ; Default ; > ;
- < "Quadrado" ; Default ; > ;
- < "Rectangular" ; Default ; > ;
- };
- StringList [ russian ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Elipside" ; Default ; > ;
+ < "Quadrado" ; Default ; > ;
+ < "Rectangular" ; Default ; > ;
+ };
+ StringList [ russian ] =
+ {
< "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- };
- StringList [ greek ] =
- {
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ };
+ StringList [ greek ] =
+ {
< "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- };
- StringList [ dutch ] =
- {
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ };
+ StringList [ dutch ] =
+ {
< "Lineair" ; Default ; > ;
- < "Axiaal" ; Default ; > ;
- < "Radiaal" ; Default ; > ;
- < "Ovaal" ; Default ; > ;
- < "Vierkant" ; Default ; > ;
- < "Rechthoekig" ; Default ; > ;
- };
- StringList [ french ] =
- {
+ < "Axiaal" ; Default ; > ;
+ < "Radiaal" ; Default ; > ;
+ < "Ovaal" ; Default ; > ;
+ < "Vierkant" ; Default ; > ;
+ < "Rechthoekig" ; Default ; > ;
+ };
+ StringList [ french ] =
+ {
< "Linaire" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsode" ; Default ; > ;
- < "Carr" ; Default ; > ;
- < "Rectangulaire" ; Default ; > ;
- };
- StringList [ spanish ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Ellipsode" ; Default ; > ;
+ < "Carr" ; Default ; > ;
+ < "Rectangulaire" ; Default ; > ;
+ };
+ StringList [ spanish ] =
+ {
< "Lineal" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Elipsoide" ; Default ; > ;
- < "Cuadrado" ; Default ; > ;
- < "Rectangular" ; Default ; > ;
- };
- StringList [ italian ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Elipsoide" ; Default ; > ;
+ < "Cuadrado" ; Default ; > ;
+ < "Rectangular" ; Default ; > ;
+ };
+ StringList [ italian ] =
+ {
< "Lineare" ; Default ; > ;
- < "Assiale" ; Default ; > ;
- < "Radiale" ; Default ; > ;
- < "Ellissoidale" ; Default ; > ;
- < "Quadrato" ; Default ; > ;
- < "Rettangolare" ; Default ; > ;
- };
- StringList [ danish ] =
- {
+ < "Assiale" ; Default ; > ;
+ < "Radiale" ; Default ; > ;
+ < "Ellissoidale" ; Default ; > ;
+ < "Quadrato" ; Default ; > ;
+ < "Rettangolare" ; Default ; > ;
+ };
+ StringList [ danish ] =
+ {
< "Liner" ; Default ; > ;
- < "Aksial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsoide" ; Default ; > ;
- < "Kvadratisk" ; Default ; > ;
- < "Rektangulr" ; Default ; > ;
- };
- StringList [ swedish ] =
- {
+ < "Aksial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Ellipsoide" ; Default ; > ;
+ < "Kvadratisk" ; Default ; > ;
+ < "Rektangulr" ; Default ; > ;
+ };
+ StringList [ swedish ] =
+ {
< "Liner" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radiell" ; Default ; > ;
- < "Ellipsoid" ; Default ; > ;
- < "Kvadratisk" ; Default ; > ;
- < "Rektangulr" ; Default ; > ;
- };
- StringList [ polish ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radiell" ; Default ; > ;
+ < "Ellipsoid" ; Default ; > ;
+ < "Kvadratisk" ; Default ; > ;
+ < "Rektangulr" ; Default ; > ;
+ };
+ StringList [ polish ] =
+ {
< "Linearny" ; Default ; > ;
- < "Osiowy" ; Default ; > ;
- < "Radialny" ; Default ; > ;
- < "Elipsoida" ; Default ; > ;
- < "Kwadratowy" ; Default ; > ;
- < "Prostoktny" ; Default ; > ;
- };
- StringList [ portuguese_brazilian ] =
- {
+ < "Osiowy" ; Default ; > ;
+ < "Radialny" ; Default ; > ;
+ < "Elipsoida" ; Default ; > ;
+ < "Kwadratowy" ; Default ; > ;
+ < "Prostoktny" ; Default ; > ;
+ };
+ StringList [ portuguese_brazilian ] =
+ {
< "Linear" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsoid" ; Default ; > ;
- < "Quadratisch" ; Default ; > ;
- < "Rechteckig" ; Default ; > ;
- };
- StringList [ japanese ] =
- {
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Ellipsoid" ; Default ; > ;
+ < "Quadratisch" ; Default ; > ;
+ < "Rechteckig" ; Default ; > ;
+ };
+ StringList [ japanese ] =
+ {
< "" ; Default ; > ;
- < "" ; Default ; > ;
- < "ː" ; Default ; > ;
- < "ȉ~" ; Default ; > ;
- < "`" ; Default ; > ;
- < "lp`" ; Default ; > ;
- };
- StringList [ korean ] =
- {
+ < "" ; Default ; > ;
+ < "ː" ; Default ; > ;
+ < "ȉ~" ; Default ; > ;
+ < "`" ; Default ; > ;
+ < "lp`" ; Default ; > ;
+ };
+ StringList [ korean ] =
+ {
< "" ; Default ; > ;
- < "" ; Default ; > ;
- < "缱" ; Default ; > ;
- < "Ÿ" ; Default ; > ;
- < "簢" ; Default ; > ;
- < "簢" ; Default ; > ;
- };
- StringList [ chinese_simplified ] =
- {
+ < "" ; Default ; > ;
+ < "缱" ; Default ; > ;
+ < "Ÿ" ; Default ; > ;
+ < "簢" ; Default ; > ;
+ < "簢" ; Default ; > ;
+ };
+ StringList [ chinese_simplified ] =
+ {
< "ε" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "Բ" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- };
- StringList [ chinese_traditional ] =
- {
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "Բ" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ };
+ StringList [ chinese_traditional ] =
+ {
< "uΪ" ; Default ; > ;
- < "b" ; Default ; > ;
- < "|V" ; Default ; > ;
- < "y" ; Default ; > ;
- < "ߤ" ; Default ; > ;
- < "x" ; Default ; > ;
- };
- StringList [ arabic ] =
- {
+ < "b" ; Default ; > ;
+ < "|V" ; Default ; > ;
+ < "y" ; Default ; > ;
+ < "ߤ" ; Default ; > ;
+ < "x" ; Default ; > ;
+ };
+ StringList [ arabic ] =
+ {
< "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- < "" ; Default ; > ;
- };
- StringList [ turkish ] =
- {
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ < "" ; Default ; > ;
+ };
+ StringList [ turkish ] =
+ {
< "Dorusal" ; Default ; > ;
- < "Eksenel" ; Default ; > ;
- < "Radyal" ; Default ; > ;
- < "Elipsoid" ; Default ; > ;
- < "Karesel" ; Default ; > ;
- < "Dikdrtgen" ; Default ; > ;
- };
- StringList [ finnish ] =
- {
+ < "Eksenel" ; Default ; > ;
+ < "Radyal" ; Default ; > ;
+ < "Elipsoid" ; Default ; > ;
+ < "Karesel" ; Default ; > ;
+ < "Dikdrtgen" ; Default ; > ;
+ };
+ StringList [ finnish ] =
+ {
< "Lineaarinen" ; Default ; > ;
- < "Aksiaalinen" ; Default ; > ;
- < "Steittinen" ; Default ; > ;
- < "Ellipsoidi" ; Default ; > ;
- < "Kuutiomainen" ; Default ; > ;
- < "Neli" ; Default ; > ;
- };
- StringList [ catalan ] =
- {
+ < "Aksiaalinen" ; Default ; > ;
+ < "Steittinen" ; Default ; > ;
+ < "Ellipsoidi" ; Default ; > ;
+ < "Kuutiomainen" ; Default ; > ;
+ < "Neli" ; Default ; > ;
+ };
+ StringList [ catalan ] =
+ {
< "Lineal" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Elipsoide" ; Default ; > ;
- < "Cuadrado" ; Default ; > ;
- < "Rectangular" ; Default ; > ;
- };
+ < "Axial" ; Default ; > ;
+ < "Radial" ; Default ; > ;
+ < "Elipsoide" ; Default ; > ;
+ < "Cuadrado" ; Default ; > ;
+ < "Rectangular" ; Default ; > ;
+ };
};
FixedText FT_TRGR_CENTER_X
{
@@ -475,7 +475,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 70 ) ;
- Size = MAP_APPFONT ( 30, 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -518,7 +518,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 86 ) ;
- Size = MAP_APPFONT ( 30, 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -561,14 +561,14 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 102 ) ;
- Size = MAP_APPFONT ( 42 , 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 359 ;
Unit = FUNIT_CUSTOM ;
CustomUnitText = " Grad" ;
- CustomUnitText [ ENGLISH ] = " degree" ;
+ CustomUnitText [ ENGLISH ] = " degrees" ;
Last = 359 ;
SpinSize = 15 ;
CustomUnitText[ english_us ] = " degrees";
@@ -623,7 +623,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -665,7 +665,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 134 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -707,7 +707,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 150 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -720,17 +720,15 @@ TabPage RID_SVXPAGE_TRANSPARENCE
};
Control CTL_BITMAP_PREVIEW
{
- Border = FALSE ;
- Pos = MAP_APPFONT ( 140 , 14 ) ;
- Size = MAP_APPFONT ( 108 , 42 ) ;
- TabStop = TRUE ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 138 , 14 ) ;
+ Size = MAP_APPFONT ( 110 , 42 ) ;
};
Control CTL_TRANS_PREVIEW
{
- Border = FALSE ;
- Pos = MAP_APPFONT ( 140 , 14 ) ;
- Size = MAP_APPFONT ( 108 , 42 ) ;
- TabStop = TRUE ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 138 , 14 ) ;
+ Size = MAP_APPFONT ( 110 , 42 ) ;
};
Text[ english_us ] = "Transparency";
Text[ portuguese ] = "Transparncia";
@@ -804,10 +802,10 @@ TabPage RID_SVXPAGE_AREA
RadioButton RBT_FILL_OFF
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text = "Keine" ;
- Text [ ENGLISH ] = "No Fill" ;
- Text[ english_us ] = "No Fill";
+ Size = MAP_APPFONT ( 54 , 10 ) ;
+ Text = "~Keine" ;
+ Text [ ENGLISH ] = "~No Fill" ;
+ Text[ english_us ] = "~No Fill";
Text[ portuguese ] = "No Fill";
Text[ russian ] = "";
Text[ greek ] = "No Fill";
@@ -831,10 +829,10 @@ TabPage RID_SVXPAGE_AREA
RadioButton RBT_COLOR
{
Pos = MAP_APPFONT ( 12 , 28 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text = "Farbe" ;
- Text [ ENGLISH ] = "Color" ;
- Text[ english_us ] = "Color";
+ Size = MAP_APPFONT ( 54 , 10 ) ;
+ Text = "~Farbe" ;
+ Text [ ENGLISH ] = "~Color" ;
+ Text[ english_us ] = "~Color";
Text[ portuguese ] = "C~or";
Text[ russian ] = "";
Text[ greek ] = "";
@@ -858,10 +856,10 @@ TabPage RID_SVXPAGE_AREA
RadioButton RBT_GRADIENT
{
Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text = "Farbverlauf" ;
- Text [ ENGLISH ] = "Gradient" ;
- Text[ english_us ] = "Gradient";
+ Size = MAP_APPFONT ( 54 , 10 ) ;
+ Text = "Farb~verlauf" ;
+ Text [ ENGLISH ] = "~Gradient" ;
+ Text[ english_us ] = "~Gradient";
Text[ portuguese ] = "~Gradao";
Text[ russian ] = "";
Text[ greek ] = "~. ";
@@ -884,11 +882,11 @@ TabPage RID_SVXPAGE_AREA
};
RadioButton RBT_HATCH
{
- Pos = MAP_APPFONT ( 66 , 14 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text = "Schraffur" ;
- Text [ ENGLISH ] = "Hatching" ;
- Text[ english_us ] = "Hatching";
+ Pos = MAP_APPFONT ( 72 , 14 ) ;
+ Size = MAP_APPFONT ( 54 , 10 ) ;
+ Text = "Schraff~ur" ;
+ Text [ ENGLISH ] = "Ha~tching" ;
+ Text[ english_us ] = "Ha~tching";
Text[ portuguese ] = "Hatching";
Text[ russian ] = "";
Text[ greek ] = "Hatching";
@@ -911,11 +909,11 @@ TabPage RID_SVXPAGE_AREA
};
RadioButton RBT_BITMAP
{
- Pos = MAP_APPFONT ( 66 , 28 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text = "Bitmap" ;
- Text [ ENGLISH ] = "Bitmap" ;
- Text[ english_us ] = "Bitmap";
+ Pos = MAP_APPFONT ( 72 , 28 ) ;
+ Size = MAP_APPFONT ( 54 , 10 ) ;
+ Text = "~Bitmap" ;
+ Text [ ENGLISH ] = "~Bitmap" ;
+ Text[ english_us ] = "~Bitmap";
Text[ portuguese ] = "~Bitmap";
Text[ russian ] = "Bitmap";
Text[ greek ] = "~Bitmap";
@@ -939,29 +937,29 @@ TabPage RID_SVXPAGE_AREA
ListBox LB_COLOR
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 108 , 95 ) ;
+ Pos = MAP_APPFONT ( 12 , 61 ) ;
+ Size = MAP_APPFONT ( 108 , 118 ) ;
TabStop = TRUE ;
};
ListBox LB_GRADIENT
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 108 , 95 ) ;
+ Pos = MAP_APPFONT ( 12 , 61 ) ;
+ Size = MAP_APPFONT ( 108 , 118 ) ;
TabStop = TRUE ;
};
ListBox LB_HATCHING
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 108 , 95 ) ;
+ Pos = MAP_APPFONT ( 12 , 61 ) ;
+ Size = MAP_APPFONT ( 108 , 118 ) ;
TabStop = TRUE ;
};
ListBox LB_BITMAP
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 109 , 95 ) ;
+ Pos = MAP_APPFONT ( 12 , 61 ) ;
+ Size = MAP_APPFONT ( 108 , 118 ) ;
TabStop = TRUE ;
};
@@ -969,26 +967,24 @@ TabPage RID_SVXPAGE_AREA
Control CTL_COLOR_PREVIEW
{
- Border = FALSE;
- Pos = MAP_APPFONT ( 140 , 14 ) ;
- Size = MAP_APPFONT ( 108 , 42 ) ;
- TabStop = TRUE ;
+ Border = TRUE;
+ Pos = MAP_APPFONT ( 138 , 14 ) ;
+ Size = MAP_APPFONT ( 110 , 42 ) ;
};
Control CTL_BITMAP_PREVIEW
{
- Border = FALSE;
- Pos = MAP_APPFONT ( 140 , 14 ) ;
- Size = MAP_APPFONT ( 108 , 42 ) ;
- TabStop = TRUE ;
+ Border = TRUE;
+ Pos = MAP_APPFONT ( 138 , 14 ) ;
+ Size = MAP_APPFONT ( 110 , 42 ) ;
Hide = TRUE ;
};
// ---------- for gradients ----------
- FixedText FT_STEPCOUNT
+ FixedLine FL_STEPCOUNT
{
- Pos = MAP_APPFONT ( 12 , 158 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
+ Pos = MAP_APPFONT ( 132 , 61 ) ;
+ Size = MAP_APPFONT ( 122 , 8 ) ;
Text = "Schrittweite" ;
Text [ ENGLISH ] = "Step count" ;
Text [ dutch ] = "Stapgrootte" ;
@@ -1015,10 +1011,10 @@ TabPage RID_SVXPAGE_AREA
};
TriStateBox TSB_STEPCOUNT
{
- Pos = MAP_APPFONT ( 12 , 171 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text = "~automatisch" ;
- Text [ ENGLISH ] = "~automatic" ;
+ Pos = MAP_APPFONT ( 138 , 75 ) ;
+ Size = MAP_APPFONT ( 68 , 10 ) ;
+ Text = "~Automatisch" ;
+ Text [ ENGLISH ] = "~Automatic" ;
TabStop = TRUE ;
Text [ english_us ] = "A~utomatic" ;
Text [ italian ] = "~automatico" ;
@@ -1045,8 +1041,8 @@ TabPage RID_SVXPAGE_AREA
NumericField NUM_FLD_STEPCOUNT
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 72 , 169 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Pos = MAP_APPFONT ( 208 , 73 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -1061,11 +1057,11 @@ TabPage RID_SVXPAGE_AREA
CheckBox CB_HATCHBCKGRD
{
- Pos = MAP_APPFONT ( 12 , 160 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
+ Pos = MAP_APPFONT ( 132 , 61 ) ;
+ Size = MAP_APPFONT ( 122 , 10 ) ;
TabStop = TRUE ;
- Text = "Hintergrund~farbe" ;
- Text [ ENGLISH ] = "~Backgroundcolor" ;
+ Text = "H~intergrundfarbe" ;
+ Text [ ENGLISH ] = "B~ackground color" ;
Text [ english_us ] = "~Background color" ;
Text[ portuguese ] = "~Cor de fundo";
Text[ russian ] = " ";
@@ -1091,8 +1087,8 @@ TabPage RID_SVXPAGE_AREA
ListBox LB_HATCHBCKGRDCOLOR
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 72 , 158 ) ;
- Size = MAP_APPFONT ( 49 , 32 ) ;
+ Pos = MAP_APPFONT ( 141 , 74 ) ;
+ Size = MAP_APPFONT ( 70 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -1133,7 +1129,7 @@ TabPage RID_SVXPAGE_AREA
Pos = MAP_APPFONT ( 138 , 73 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text = "~Original" ;
- Text [ ENGLISH ] = "Or~iginal" ;
+ Text [ ENGLISH ] = "~Original" ;
TabStop = TRUE ;
Text [ dutch ] = "~Origineel" ;
Text [ english_us ] = "~Original" ;
@@ -1159,10 +1155,10 @@ TabPage RID_SVXPAGE_AREA
};
TriStateBox TSB_SCALE
{
- Pos = MAP_APPFONT ( 138 , 89 ) ;
+ Pos = MAP_APPFONT ( 138 , 88 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
- Text = "Rel~ativ" ;
- Text [ ENGLISH ] = "Rel~ative" ;
+ Text = "Re~lativ" ;
+ Text [ ENGLISH ] = "Re~lative" ;
TabStop = TRUE ;
Text [ dutch ] = "Rel~atief" ;
Text [ english_us ] = "Re~lative" ;
@@ -1188,7 +1184,7 @@ TabPage RID_SVXPAGE_AREA
};
FixedText FT_X_SIZE
{
- Pos = MAP_APPFONT ( 184 , 74 ) ;
+ Pos = MAP_APPFONT ( 183 , 73 ) ;
Size = MAP_APPFONT ( 24 , 8 ) ;
Text = "B~reite" ;
Text [ ENGLISH ] = "~Width" ;
@@ -1217,7 +1213,7 @@ TabPage RID_SVXPAGE_AREA
MetricField MTR_FLD_X_SIZE
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 209 , 72 ) ;
+ Pos = MAP_APPFONT ( 208 , 71 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -1225,7 +1221,7 @@ TabPage RID_SVXPAGE_AREA
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
@@ -1234,10 +1230,8 @@ TabPage RID_SVXPAGE_AREA
};
FixedText FT_Y_SIZE
{
- Pos = MAP_APPFONT ( 184 , 90 ) ;
+ Pos = MAP_APPFONT ( 183 , 88 ) ;
Size = MAP_APPFONT ( 24 , 8 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? H~he : H~he */
- /* ### ACHTUNG: Neuer Text in Resource? H~he : H~he */
Text = "H~he" ;
Text [ ENGLISH ] = "H~eight" ;
Text [ english_us ] = "H~eight" ;
@@ -1265,7 +1259,7 @@ TabPage RID_SVXPAGE_AREA
MetricField MTR_FLD_Y_SIZE
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 209 , 88 ) ;
+ Pos = MAP_APPFONT ( 208 , 86 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -1273,7 +1267,7 @@ TabPage RID_SVXPAGE_AREA
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
@@ -1283,7 +1277,7 @@ TabPage RID_SVXPAGE_AREA
};
FixedLine FL_POSITION
{
- Pos = MAP_APPFONT ( 132 , 101 ) ;
+ Pos = MAP_APPFONT ( 132 , 104 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text = "Position" ;
Text [ English ] = "Position" ;
@@ -1313,13 +1307,13 @@ TabPage RID_SVXPAGE_AREA
Control CTL_POSITION
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 138 , 112 ) ;
+ Pos = MAP_APPFONT ( 138 , 114 ) ;
Size = MAP_APPFONT ( 37 , 27 ) ;
TabStop = TRUE ;
};
FixedText FT_X_OFFSET
{
- Pos = MAP_APPFONT ( 179 , 114 ) ;
+ Pos = MAP_APPFONT ( 179 , 116 ) ;
Size = MAP_APPFONT ( 29 , 8 ) ;
Text = "~X-Offset" ;
Text [ ENGLISH ] = "~X offset" ;
@@ -1347,7 +1341,7 @@ TabPage RID_SVXPAGE_AREA
};
FixedText FT_Y_OFFSET
{
- Pos = MAP_APPFONT ( 179 , 130 ) ;
+ Pos = MAP_APPFONT ( 179 , 131 ) ;
Size = MAP_APPFONT ( 29 , 8 ) ;
Text = "~Y-Offset" ;
Text [ ENGLISH ] = "~Y offset" ;
@@ -1376,14 +1370,14 @@ TabPage RID_SVXPAGE_AREA
MetricField MTR_FLD_X_OFFSET
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 209 , 112 ) ;
+ Pos = MAP_APPFONT ( 208 , 114 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Maximum = 100 ;
Last = 100 ;
SpinSize = 5 ;
@@ -1391,7 +1385,7 @@ TabPage RID_SVXPAGE_AREA
MetricField MTR_FLD_Y_OFFSET
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 209 , 128 ) ;
+ Pos = MAP_APPFONT ( 208 , 129 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -1399,7 +1393,7 @@ TabPage RID_SVXPAGE_AREA
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1407,10 +1401,10 @@ TabPage RID_SVXPAGE_AREA
{
Pos = MAP_APPFONT ( 138 , 144 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
- Text = "~Kacheln" ;
- Text [ ENGLISH ] = "~Tile" ;
+ Text = "Ka~cheln" ;
+ Text [ ENGLISH ] = "T~ile" ;
TabStop = TRUE ;
- Text [ english_us ] = "~Tile" ;
+ Text [ english_us ] = "T~ile" ;
Text [ italian ] = "Affianca" ;
Text [ spanish ] = "A~zulejar" ;
Text [ french ] = "Ca~rrelage" ;
@@ -1434,10 +1428,10 @@ TabPage RID_SVXPAGE_AREA
};
TriStateBox TSB_STRETCH
{
- Pos = MAP_APPFONT ( 196 , 144 ) ;
+ Pos = MAP_APPFONT ( 194 , 144 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
Text = "A~npassen" ;
- Text [ ENGLISH ] = "~Stretch" ;
+ Text [ ENGLISH ] = "Auto~Fit" ;
TabStop = TRUE ;
Text [ dutch ] = "Aan~passen" ;
Text [ english_us ] = "Auto~Fit" ;
@@ -1463,7 +1457,7 @@ TabPage RID_SVXPAGE_AREA
};
FixedLine FL_OFFSET
{
- Pos = MAP_APPFONT ( 132 , 157 ) ;
+ Pos = MAP_APPFONT ( 132 , 158 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text = "Verschiebung" ;
Text [ English ] = "Offset" ;
@@ -1491,11 +1485,11 @@ TabPage RID_SVXPAGE_AREA
};
RadioButton RBT_ROW
{
- Pos = MAP_APPFONT ( 138 , 168 ) ;
+ Pos = MAP_APPFONT ( 138 , 170 ) ;
Size = MAP_APPFONT ( 32 , 10 ) ;
- Text = "Z~eile" ;
- Text [ English ] = "R~ow" ;
- Text [ english_us ] = "Ro~w" ;
+ Text = "~Zeile" ;
+ Text [ English ] = "~Row" ;
+ Text [ english_us ] = "~Row" ;
Text [ italian ] = "Riga" ;
Text [ spanish ] = "~Fila" ;
Text [ french ] = "~Ligne" ;
@@ -1519,10 +1513,10 @@ TabPage RID_SVXPAGE_AREA
};
RadioButton RBT_COLUMN
{
- Pos = MAP_APPFONT ( 171 , 168 ) ;
+ Pos = MAP_APPFONT ( 171 , 170 ) ;
Size = MAP_APPFONT ( 37 , 10 ) ;
Text = "S~palte" ;
- Text [ English ] = "~Column" ;
+ Text [ English ] = "Colu~mn" ;
Text [ english_us ] = "Colu~mn" ;
Text [ italian ] = "Colonna" ;
Text [ spanish ] = "~Columna" ;
@@ -1548,7 +1542,7 @@ TabPage RID_SVXPAGE_AREA
MetricField MTR_FLD_OFFSET
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 209 , 167 ) ;
+ Pos = MAP_APPFONT ( 208 , 168 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -1556,7 +1550,7 @@ TabPage RID_SVXPAGE_AREA
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
SpinSize = 5 ;
};
@@ -1818,8 +1812,8 @@ TabPage RID_SVXPAGE_SHADOW
Control CTL_COLOR_PREVIEW
{
Border = TRUE;
- Pos = MAP_APPFONT ( 140 , 14 ) ;
- Size = MAP_APPFONT ( 108 , 42 ) ;
+ Pos = MAP_APPFONT ( 138 , 14 ) ;
+ Size = MAP_APPFONT ( 110 , 42 ) ;
TabStop = FALSE ;
};
};
@@ -2202,7 +2196,7 @@ TabPage RID_SVXPAGE_HATCH
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 161 ) ;
- Size = MAP_APPFONT ( 62 , 62 ) ;
+ Size = MAP_APPFONT ( 62 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -2216,17 +2210,14 @@ TabPage RID_SVXPAGE_HATCH
};
Control CTL_PREVIEW
{
- Border = FALSE;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 131 ) ;
Size = MAP_APPFONT ( 88 , 42 ) ;
- TabStop = TRUE ;
};
PushButton BTN_ADD
{
Pos = MAP_APPFONT ( 197 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
Text = "H~inzufgen..." ;
Text [ ENGLISH ] = "~Add..." ;
Text [ norwegian ] = "~Add..." ;
@@ -2257,8 +2248,6 @@ TabPage RID_SVXPAGE_HATCH
{
Pos = MAP_APPFONT ( 197 , 32 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
Text = "~ndern..." ;
Text [ ENGLISH ] = "~Modify..." ;
Text [ norwegian ] = "~Endre..." ;
@@ -2289,8 +2278,6 @@ TabPage RID_SVXPAGE_HATCH
{
Pos = MAP_APPFONT ( 197 , 68 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
Text = "~Lschen..." ;
Text [ ENGLISH ] = "~Delete..." ;
Text [ norwegian ] = "~Delete..." ;
@@ -2532,7 +2519,7 @@ TabPage RID_SVXPAGE_BITMAP
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 115 ) ;
- Size = MAP_APPFONT ( 62 , 62 ) ;
+ Size = MAP_APPFONT ( 62 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -2568,7 +2555,7 @@ TabPage RID_SVXPAGE_BITMAP
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 142 ) ;
- Size = MAP_APPFONT ( 62 , 62 ) ;
+ Size = MAP_APPFONT ( 62 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -2582,17 +2569,14 @@ TabPage RID_SVXPAGE_BITMAP
};
Control CTL_PREVIEW
{
- Border = FALSE;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 131 ) ;
Size = MAP_APPFONT ( 88 , 42 ) ;
- TabStop = TRUE ;
};
PushButton BTN_ADD
{
Pos = MAP_APPFONT ( 197 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
Text = "H~inzufgen..." ;
Text [ ENGLISH ] = "~Add..." ;
Text [ norwegian ] = "~Add..." ;
@@ -2623,8 +2607,6 @@ TabPage RID_SVXPAGE_BITMAP
{
Pos = MAP_APPFONT ( 197 , 32 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
Text = "~ndern..." ;
Text [ ENGLISH ] = "~Modify..." ;
Text [ norwegian ] = "~Endre..." ;
@@ -2685,8 +2667,6 @@ TabPage RID_SVXPAGE_BITMAP
{
Pos = MAP_APPFONT ( 197 , 68 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
Text = "~Lschen..." ;
Text [ ENGLISH ] = "~Delete..." ;
Text [ norwegian ] = "~Delete..." ;
@@ -2822,8 +2802,6 @@ TabPage RID_SVXPAGE_GRADIENT
{
HelpID = HID_AREA_GRADIENT ;
Hide = TRUE ;
- /* ### ACHTUNG: Neuer Text in Resource? Farbverlufe : Farbverlufe */
- /* ### ACHTUNG: Neuer Text in Resource? Farbverlufe : Farbverlufe */
Text = "Farbverlufe" ;
Text [ English ] = "Gradients" ;
Text [ norwegian ] = "+++Gradients" ;
@@ -3151,7 +3129,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 30 ) ;
- Size = MAP_APPFONT ( 42 , 12 ) ;
+ Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3195,7 +3173,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 46 ) ;
- Size = MAP_APPFONT ( 42, 12 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3239,7 +3217,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 62 ) ;
- Size = MAP_APPFONT ( 42, 12 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3305,7 +3283,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 78 ) ;
- Size = MAP_APPFONT ( 42, 12 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3349,7 +3327,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 97 ) ;
- Size = MAP_APPFONT ( 48, 63 ) ;
+ Size = MAP_APPFONT ( 48, 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -3358,7 +3336,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 113 ) ;
- Size = MAP_APPFONT ( 29, 12 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3402,7 +3380,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 131 ) ;
- Size = MAP_APPFONT ( 48, 62 ) ;
+ Size = MAP_APPFONT ( 48, 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -3411,7 +3389,7 @@ TabPage RID_SVXPAGE_GRADIENT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 49 , 147 ) ;
- Size = MAP_APPFONT ( 29, 12 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -3431,17 +3409,14 @@ TabPage RID_SVXPAGE_GRADIENT
};
Control CTL_PREVIEW
{
- Border = FALSE;
+ Border = TRUE;
Pos = MAP_APPFONT ( 103 , 131 ) ;
Size = MAP_APPFONT ( 88 , 42 ) ;
- TabStop = TRUE ;
};
PushButton BTN_ADD
{
Pos = MAP_APPFONT ( 197 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
- /* ### ACHTUNG: Neuer Text in Resource? H~inzufgen... : H~inzufgen... */
Text = "H~inzufgen..." ;
Text [ ENGLISH ] = "~Add..." ;
Text [ norwegian ] = "~Add..." ;
@@ -3472,8 +3447,6 @@ TabPage RID_SVXPAGE_GRADIENT
{
Pos = MAP_APPFONT ( 197 , 32 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
- /* ### ACHTUNG: Neuer Text in Resource? ~ndern... : ~ndern... */
Text = "~ndern..." ;
Text [ ENGLISH ] = "~Modify..." ;
Text [ norwegian ] = "~Endre..." ;
@@ -3504,8 +3477,6 @@ TabPage RID_SVXPAGE_GRADIENT
{
Pos = MAP_APPFONT ( 197 , 68 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
- /* ### ACHTUNG: Neuer Text in Resource? ~Lschen... : ~Lschen... */
Text = "~Lschen..." ;
Text [ ENGLISH ] = "~Delete..." ;
Text [ norwegian ] = "~Delete..." ;
@@ -3752,7 +3723,7 @@ TabPage RID_SVXPAGE_COLOR
{
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 30 ) ;
- Size = MAP_APPFONT ( 76 , 65 ) ;
+ Size = MAP_APPFONT ( 76 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
@@ -3798,17 +3769,15 @@ TabPage RID_SVXPAGE_COLOR
Control CTL_PREVIEW_OLD
{
- Border = FALSE;
+ Border = TRUE;
Pos = MAP_APPFONT ( 157 , 14 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- TabStop = TRUE ;
};
Control CTL_PREVIEW_NEW
{
- Border = FALSE;
+ Border = TRUE;
Pos = MAP_APPFONT ( 157, 39 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- TabStop = TRUE ;
};
ListBox LB_COLORMODEL
{
@@ -3944,7 +3913,7 @@ TabPage RID_SVXPAGE_COLOR
Spin = TRUE ;
Maximum = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
};
FixedText FT_2
@@ -3963,7 +3932,7 @@ TabPage RID_SVXPAGE_COLOR
Spin = TRUE ;
Maximum = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
};
FixedText FT_3
@@ -3982,7 +3951,7 @@ TabPage RID_SVXPAGE_COLOR
Spin = TRUE ;
Maximum = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
};
FixedText FT_4
@@ -4001,7 +3970,7 @@ TabPage RID_SVXPAGE_COLOR
Spin = TRUE ;
Maximum = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
Last = 100 ;
};
PushButton BTN_ADD
diff --git a/svx/source/dialog/tparea.cxx b/svx/source/dialog/tparea.cxx
index d18065b221db..bde43c9990df 100644
--- a/svx/source/dialog/tparea.cxx
+++ b/svx/source/dialog/tparea.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tparea.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: fme $ $Date: 2001-05-15 11:46:06 $
+ * last change: $Author: dr $ $Date: 2001-06-15 16:58:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -664,7 +664,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
aTsbStepCount ( this, ResId( TSB_STEPCOUNT ) ),
aNumFldStepCount ( this, ResId( NUM_FLD_STEPCOUNT ) ),
- aFtStepCount ( this, ResId( FT_STEPCOUNT ) ),
+ aFlStepCount ( this, ResId( FL_STEPCOUNT ) ),
aTsbTile ( this, ResId( TSB_TILE ) ),
aTsbStretch ( this, ResId( TSB_STRETCH ) ),
@@ -697,7 +697,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
aLbBitmap.Hide();
aCtlBitmapPreview.Hide();
- aFtStepCount.Hide();
+ aFlStepCount.Hide();
aTsbStepCount.Hide();
aNumFldStepCount.Hide();
@@ -1788,7 +1788,7 @@ IMPL_LINK( SvxAreaTabPage, ClickInvisibleHdl_Impl, void *, EMPTYARG )
aCtlXRectPreview.Hide();
aCtlBitmapPreview.Hide();
- aFtStepCount.Hide();
+ aFlStepCount.Hide();
aTsbStepCount.Hide();
aNumFldStepCount.Hide();
@@ -1839,7 +1839,7 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG )
aCtlXRectPreview.Show();
aCtlBitmapPreview.Hide();
- aFtStepCount.Hide();
+ aFlStepCount.Hide();
aTsbStepCount.Hide();
aNumFldStepCount.Hide();
@@ -1927,8 +1927,8 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG )
aCtlXRectPreview.Show();
aCtlBitmapPreview.Hide();
- aFtStepCount.Enable();
- aFtStepCount.Show();
+ aFlStepCount.Enable();
+ aFlStepCount.Show();
aTsbStepCount.Enable();
aTsbStepCount.Show();
aNumFldStepCount.Show();
@@ -2002,7 +2002,7 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG )
// aGrpTransparent.Hide();
// aLbTransparent.Hide();
- aFtStepCount.Hide();
+ aFlStepCount.Hide();
aTsbStepCount.Hide();
aNumFldStepCount.Hide();
@@ -2152,7 +2152,7 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
// aGrpPreview.Hide();
// aGrpTransparent.Hide();
// aLbTransparent.Hide();
- aFtStepCount.Hide();
+ aFlStepCount.Hide();
aTsbStepCount.Hide();
aNumFldStepCount.Hide();