diff options
| author | Frank Meies <fme@openoffice.org> | 2001-06-14 17:08:42 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-06-14 17:08:42 +0000 |
| commit | 922f2683e31fd58ed6eefe6785f02bbab0b9c343 (patch) | |
| tree | c3673c37326e3255550cdf5152ca517dbb0ec914 /svx | |
| parent | 1e4a627ce49ef599ebb677f0aaa6b4434b0af190 (diff) | |
Fix: #86988#: Redesign of dialogs
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/float3d.hrc | 35 | ||||
| -rw-r--r-- | svx/source/dialog/page.src | 30 | ||||
| -rw-r--r-- | svx/source/dialog/tabarea.src | 54 | ||||
| -rw-r--r-- | svx/source/engine3d/float3d.cxx | 199 | ||||
| -rw-r--r-- | svx/source/engine3d/float3d.src | 369 | ||||
| -rw-r--r-- | svx/source/form/fmsearch.src | 119 | ||||
| -rw-r--r-- | svx/source/gallery2/gallery.src | 28 |
7 files changed, 301 insertions, 533 deletions
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index 117cd0e22d6b..faa7b43529dd 100644 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -2,9 +2,9 @@ * * $RCSfile: float3d.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:00:56 $ + * last change: $Author: fme $ $Date: 2001-06-14 18:05:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,11 +77,10 @@ #define BTN_LATHE_OBJ 11 #define CTL_PREVIEW 12 #define CTL_LIGHT_PREVIEW 13 -#define GRP_PREVIEW 14 // Favoriten #define CTL_FAVORITES 20 -#define GRP_FAVORITES 21 +#define FL_FAVORITES 21 #define BTN_ONLY_3D 22 #define BTN_ALL_ATTRIBUTES 23 @@ -90,7 +89,7 @@ #define NUM_HORIZONTAL 25 #define FT_VERTICAL 26 #define NUM_VERTICAL 27 -#define GRP_SEGMENTS 28 +#define FL_SEGMENTS 28 #define FT_PERCENT_DIAGONAL 29 #define MTR_PERCENT_DIAGONAL 30 #define FT_BACKSCALE 31 @@ -99,14 +98,14 @@ #define MTR_END_ANGLE 34 #define FT_DEPTH 35 #define MTR_DEPTH 36 -#define GRP_GEOMETRIE 37 +#define FL_GEOMETRIE 37 #define BTN_NORMALS_OBJ 38 #define BTN_NORMALS_FLAT 39 #define BTN_NORMALS_SPHERE 40 #define BTN_TWO_SIDED_LIGHTING 41 #define BTN_NORMALS_INVERT 42 -#define GRP_NORMALS 43 +#define FL_NORMALS 43 #define BTN_DOUBLE_SIDED 44 @@ -116,13 +115,13 @@ #define BTN_SHADOW_3D 47 #define FT_SLANT 48 #define MTR_SLANT 49 -#define GRP_SHADOW 50 +#define FL_SHADOW 50 #define FT_DISTANCE 51 #define MTR_DISTANCE 52 #define FT_FOCAL_LENGTH 53 #define MTR_FOCAL_LENGTH 54 -#define GRP_CAMERA 55 -#define GRP_REPRESENTATION 56 +#define FL_CAMERA 55 +#define FL_REPRESENTATION 56 // Beleuchtung #define BTN_LIGHT_1 60 @@ -142,15 +141,11 @@ #define LB_LIGHT_7 74 #define LB_LIGHT_8 75 #define BTN_LIGHT_COLOR 76 -#define GRP_LIGHTSOURCE 77 +#define FT_LIGHTSOURCE 77 #define LB_AMBIENTLIGHT 78 #define BTN_AMBIENT_COLOR 79 -#define GRP_AMBIENTLIGHT 80 -#define GRP_LIGHT 81 -#define FT_LIGHT_X 82 -#define FT_LIGHT_Y 83 -#define FT_LIGHT_Z 84 -#define GRP_LIGHT_INFO 85 +#define FT_AMBIENTLIGHT 80 +#define FL_LIGHT 81 // Texturen #define FT_TEX_KIND 90 @@ -170,11 +165,11 @@ #define BTN_TEX_OBJECT_Y 104 #define FT_TEX_FILTER 105 #define BTN_TEX_FILTER 106 -#define GRP_TEXTURE 107 +#define FL_TEXTURE 107 // Material //#define CTL_MATERIAL 110 -#define GRP_MATERIAL 111 +#define FL_MATERIAL 111 #define FT_MAT_COLOR 112 #define LB_MAT_COLOR 113 @@ -187,7 +182,7 @@ #define BTN_SPECULAR_COLOR 120 #define FT_MAT_SPECULAR_INTENSITY 121 #define MTR_MAT_SPECULAR_INTENSITY 122 -#define GRP_MAT_SPECULAR 123 +#define FL_MAT_SPECULAR 123 #define FT_MAT_FAVORITES 124 #define LB_MAT_FAVORITES 125 diff --git a/svx/source/dialog/page.src b/svx/source/dialog/page.src index f2448fbaf6f4..497a5feb2327 100644 --- a/svx/source/dialog/page.src +++ b/svx/source/dialog/page.src @@ -2,9 +2,9 @@ * * $RCSfile: page.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2001-06-13 23:55:57 $ + * last change: $Author: fme $ $Date: 2001-06-14 17:58:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_PAPER_WIDTH { Border = TRUE ; - Pos = MAP_APPFONT ( 60, 30 ) ; + Pos = MAP_APPFONT ( 50, 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -213,7 +213,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_PAPER_HEIGHT { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 46 ) ; + Pos = MAP_APPFONT ( 50 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -253,7 +253,7 @@ TabPage RID_SVXPAGE_PAGE }; RadioButton RB_PORTRAIT { - Pos = MAP_APPFONT ( 48 , 62 ) ; + Pos = MAP_APPFONT ( 50 , 62 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; Check = TRUE ; Text = "Ho~chformat" ; @@ -283,7 +283,7 @@ TabPage RID_SVXPAGE_PAGE }; RadioButton RB_LANDSCAPE { - Pos = MAP_APPFONT ( 48 , 74 ) ; + Pos = MAP_APPFONT ( 50 , 74 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; Text = "~Querformat" ; Text [ ENGLISH ] = "Lan~dscape" ; @@ -408,7 +408,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_LEFT_MARGIN { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 101 ) ; + Pos = MAP_APPFONT ( 50 , 101 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -452,7 +452,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_RIGHT_MARGIN { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 117 ) ; + Pos = MAP_APPFONT ( 50 , 117 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -496,7 +496,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_TOP_MARGIN { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 133 ) ; + Pos = MAP_APPFONT ( 50 , 133 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -540,7 +540,7 @@ TabPage RID_SVXPAGE_PAGE MetricField ED_BOTTOM_MARGIN { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 149 ) ; + Pos = MAP_APPFONT ( 50 , 149 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -561,7 +561,7 @@ TabPage RID_SVXPAGE_PAGE { Pos = MAP_APPFONT ( 107, 90 ) ; Size = MAP_APPFONT ( 147 , 8 ) ; - Text = "Layout-Einstellungen" ; + Text = "Layouteinstellungen" ; Text [ ENGLISH ] = "Layout settings" ; Text[ english_us ] = "Layout settings"; Text[ portuguese ] = "Layout settings"; @@ -1130,7 +1130,7 @@ TabPage RID_SVXPAGE_PAGE { Hide = TRUE ; Pos = MAP_APPFONT ( 113 , 133 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Size = MAP_APPFONT ( 120 , 10 ) ; Text = "Objekt ~an Seitenformat anpassen" ; Text [ ENGLISH ] = "~Fit objects to page format" ; Text[ english_us ] = "~Fit object to page format"; @@ -1186,7 +1186,7 @@ TabPage RID_SVXPAGE_PAGE }; FixedText FT_REGISTER { - Pos = MAP_APPFONT ( 119 , 147 ) ; + Pos = MAP_APPFONT ( 122 , 147 ) ; Size = MAP_APPFONT ( 66 , 8 ) ; Text = "Referenzabsa~tzvorlage" ; Text [ ENGLISH ] = "Reference style sheet" ; @@ -1215,8 +1215,8 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_REGISTER { - Pos = MAP_APPFONT ( 119 , 157 ) ; - Size = MAP_APPFONT ( 135, 50 ) ; + Pos = MAP_APPFONT ( 122 , 157 ) ; + Size = MAP_APPFONT ( 132, 50 ) ; DropDown = TRUE ; Hide = TRUE ; Sort = TRUE ; diff --git a/svx/source/dialog/tabarea.src b/svx/source/dialog/tabarea.src index b0bcbc60841b..4933d950bc8b 100644 --- a/svx/source/dialog/tabarea.src +++ b/svx/source/dialog/tabarea.src @@ -2,9 +2,9 @@ * * $RCSfile: tabarea.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: dr $ $Date: 2001-06-14 16:14:56 $ + * last change: $Author: fme $ $Date: 2001-06-14 17:58:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE RadioButton RBT_TRANS_LINEAR { Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 52 , 10 ) ; + Size = MAP_APPFONT ( 60 , 10 ) ; Text = "~Transparenz" ; Text [ ENGLISH ] = "~Transparency" ; Text[ english_us ] = "~Transparency"; @@ -161,7 +161,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRANSPARENT { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 27 ) ; + Pos = MAP_APPFONT ( 72 , 27 ) ; Size = MAP_APPFONT ( 30, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -202,8 +202,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_TYPE { - Pos = MAP_APPFONT ( 22 , 56 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 56 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "Ty~p" ; Text [ ENGLISH ] = "Ty~pe" ; Text[ english_us ] = "Ty~pe"; @@ -231,8 +231,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE ListBox LB_TRGR_GRADIENT_TYPES { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 54 ) ; - Size = MAP_APPFONT ( 59 , 63 ) ; + Pos = MAP_APPFONT ( 72 , 54 ) ; + Size = MAP_APPFONT ( 53 , 63 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -445,8 +445,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_CENTER_X { - Pos = MAP_APPFONT ( 22 , 72 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 72 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "Zentrum ~X" ; Text [ ENGLISH ] = "Center ~X" ; Text[ english_us ] = "Center ~X"; @@ -474,7 +474,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_CENTER_X { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 70 ) ; + Pos = MAP_APPFONT ( 72 , 70 ) ; Size = MAP_APPFONT ( 30, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -488,8 +488,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_CENTER_Y { - Pos = MAP_APPFONT ( 22 , 88 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 88 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "Zentrum ~Y" ; Text [ ENGLISH ] = "Center ~Y" ; Text[ english_us ] = "Center ~Y"; @@ -517,7 +517,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_CENTER_Y { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 86 ) ; + Pos = MAP_APPFONT ( 72 , 86 ) ; Size = MAP_APPFONT ( 30, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -531,8 +531,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_ANGLE { - Pos = MAP_APPFONT ( 22 , 104 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 104 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "~Winkel" ; Text [ ENGLISH ] = "~Angle" ; Text[ english_us ] = "~Angle"; @@ -560,7 +560,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_ANGLE { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 102 ) ; + Pos = MAP_APPFONT ( 72 , 102 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -594,8 +594,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_BORDER { - Pos = MAP_APPFONT ( 16 + TRANS_GRAD_OFFSET_X, 56 + TRANS_GRAD_OFFSET_Y) ; - Size = MAP_APPFONT ( 42, 8 ) ; + Pos = MAP_APPFONT ( 15 + TRANS_GRAD_OFFSET_X, 56 + TRANS_GRAD_OFFSET_Y) ; + Size = MAP_APPFONT ( 41, 8 ) ; Text = "~Rand" ; Text [ ENGLISH ] = "~Border" ; Text[ english_us ] = "~Border"; @@ -622,8 +622,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_BORDER { Border = TRUE ; - Pos = MAP_APPFONT ( 60 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ; - Size = MAP_APPFONT ( 42 , 12 ) ; + Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ; + Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -636,8 +636,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_START_VALUE { - Pos = MAP_APPFONT ( 22 , 136 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 136 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "~Startwert" ; Text [ ENGLISH ] = "~From value" ; Text[ english_us ] = "~Start value"; @@ -664,7 +664,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_START_VALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 134 ) ; + Pos = MAP_APPFONT ( 72 , 134 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -678,8 +678,8 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; FixedText FT_TRGR_END_VALUE { - Pos = MAP_APPFONT ( 22 , 152 ) ; - Size = MAP_APPFONT ( 42 , 8 ) ; + Pos = MAP_APPFONT ( 21 , 152 ) ; + Size = MAP_APPFONT ( 41 , 8 ) ; Text = "~Endwert" ; Text [ ENGLISH ] = "~To value" ; Text[ english_us ] = "~End value"; @@ -706,7 +706,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE MetricField MTR_TRGR_END_VALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 150 ) ; + Pos = MAP_APPFONT ( 72 , 150 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 41918926fb36..53d9e438b8db 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: float3d.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: aw $ $Date: 2001-02-16 10:28:44 $ + * last change: $Author: fme $ $Date: 2001-06-14 18:08:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, // Favoriten aCtlFavorites ( this, SVX_RES( CTL_FAVORITES ) ), - aGrpFavorites ( this, SVX_RES( GRP_FAVORITES ) ), + aFLFavorites ( this, SVX_RES( FL_FAVORITES ) ), aBtnOnly3D ( this, SVX_RES( BTN_ONLY_3D ) ), aBtnAllAttributes ( this, SVX_RES( BTN_ALL_ATTRIBUTES ) ), @@ -178,7 +178,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aNumHorizontal ( this, SVX_RES( NUM_HORIZONTAL ) ), aFtVertical ( this, SVX_RES( FT_VERTICAL ) ), aNumVertical ( this, SVX_RES( NUM_VERTICAL ) ), - aGrpSegments ( this, SVX_RES( GRP_SEGMENTS ) ), + aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ), aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ), aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ), aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ), @@ -187,14 +187,14 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aMtrEndAngle ( this, SVX_RES( MTR_END_ANGLE ) ), aFtDepth ( this, SVX_RES( FT_DEPTH ) ), aMtrDepth ( this, SVX_RES( MTR_DEPTH ) ), - aGrpGeometrie ( this, SVX_RES( GRP_GEOMETRIE ) ), + aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), aBtnNormalsObj ( this, SVX_RES( BTN_NORMALS_OBJ ) ), aBtnNormalsFlat ( this, SVX_RES( BTN_NORMALS_FLAT ) ), aBtnNormalsSphere ( this, SVX_RES( BTN_NORMALS_SPHERE ) ), aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ), aBtnNormalsInvert ( this, SVX_RES( BTN_NORMALS_INVERT ) ), - aGrpNormals ( this, SVX_RES( GRP_NORMALS ) ), + aFLNormals ( this, SVX_RES( FL_NORMALS ) ), aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ), @@ -204,13 +204,13 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnShadow3d ( this, SVX_RES( BTN_SHADOW_3D ) ), aFtSlant ( this, SVX_RES( FT_SLANT ) ), aMtrSlant ( this, SVX_RES( MTR_SLANT ) ), - aGrpShadow ( this, SVX_RES( GRP_SHADOW ) ), + aFLShadow ( this, SVX_RES( FL_SHADOW ) ), aFtDistance ( this, SVX_RES( FT_DISTANCE ) ), aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ), aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ), aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ), - aGrpCamera ( this, SVX_RES( GRP_CAMERA ) ), - aGrpRepresentation ( this, SVX_RES( GRP_REPRESENTATION ) ), + aFLCamera ( this, SVX_RES( FL_CAMERA ) ), + aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), // Beleuchtung aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ), @@ -230,15 +230,11 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aLbLight7 ( this, SVX_RES( LB_LIGHT_7 ) ), aLbLight8 ( this, SVX_RES( LB_LIGHT_8 ) ), aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ), - aGrpLightsource ( this, SVX_RES( GRP_LIGHTSOURCE ) ), + aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ), aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), - aGrpAmbientlight ( this, SVX_RES( GRP_AMBIENTLIGHT ) ), - aGrpLight ( this, SVX_RES( GRP_LIGHT ) ), - aFtLightX ( this, SVX_RES( FT_LIGHT_X ) ), - aFtLightY ( this, SVX_RES( FT_LIGHT_Y ) ), - aFtLightZ ( this, SVX_RES( FT_LIGHT_Z ) ), - aGrpLightInfo ( this, SVX_RES( GRP_LIGHT_INFO ) ), + aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), + aFLLight ( this, SVX_RES( FL_LIGHT ) ), // Texturen aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ), @@ -258,7 +254,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnTexObjectY ( this, SVX_RES( BTN_TEX_OBJECT_Y ) ), aFtTexFilter ( this, SVX_RES( FT_TEX_FILTER ) ), aBtnTexFilter ( this, SVX_RES( BTN_TEX_FILTER ) ), - aGrpTexture ( this, SVX_RES( GRP_TEXTURE ) ), + aFLTexture ( this, SVX_RES( FL_TEXTURE ) ), // Material aFtMatFavorites ( this, SVX_RES( FT_MAT_FAVORITES ) ), @@ -274,8 +270,8 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnSpecularColor ( this, SVX_RES( BTN_SPECULAR_COLOR ) ), aFtMatSpecularIntensity( this, SVX_RES( FT_MAT_SPECULAR_INTENSITY ) ), aMtrMatSpecularIntensity( this, SVX_RES( MTR_MAT_SPECULAR_INTENSITY ) ), - aGrpMatSpecular ( this, SVX_RES( GRP_MAT_SPECULAR ) ), - aGrpMaterial ( this, SVX_RES( GRP_MATERIAL ) ), + aFLMatSpecular ( this, SVX_RES( FL_MAT_SPECULAR ) ), + aFLMaterial ( this, SVX_RES( FL_MATERIAL ) ), // Unterer Bereich aBtnPerspective ( this, SVX_RES( BTN_PERSPECTIVE ) ), @@ -283,7 +279,6 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnLatheObject ( this, SVX_RES( BTN_LATHE_OBJ ) ), aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), - aGrpPreview ( this, SVX_RES( GRP_PREVIEW ) ), aImgLightOn ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ), aImgLightOff ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ), @@ -413,6 +408,9 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); aCtlLightPreview.SetUserSelectionChangeCallback( aLink ); + aCtlPreview.SetBorderStyle( WINDOW_BORDER_MONO ); + aCtlLightPreview.SetBorderStyle( WINDOW_BORDER_MONO ); + aSize = GetOutputSizePixel(); SetMinOutputSizePixel( aSize ); @@ -591,7 +589,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aNumHorizontal.Enable( !bCube ); aFtVertical.Enable( !bCube ); aNumVertical.Enable( !bCube ); - aGrpSegments.Enable( !bCube ); + aFLSegments.Enable( !bCube ); aFtPercentDiagonal.Enable( !bCube && !bSphere ); aMtrPercentDiagonal.Enable( !bCube && !bSphere ); @@ -626,7 +624,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aFtVertical.Enable( FALSE ); aNumVertical.Enable( FALSE ); aNumVertical.SetEmptyFieldValue(); - aGrpSegments.Enable( FALSE ); + aFLSegments.Enable( FALSE ); aFtEndAngle.Enable( FALSE ); aMtrEndAngle.Enable( FALSE ); aMtrEndAngle.SetEmptyFieldValue(); @@ -638,7 +636,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnShadow3d.Enable( FALSE ); aFtSlant.Enable( FALSE ); aMtrSlant.Enable( FALSE ); - aGrpShadow.Enable( FALSE ); + aFLShadow.Enable( FALSE ); aFtDistance.Enable( FALSE ); aMtrDistance.Enable( FALSE ); @@ -646,7 +644,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aFtFocalLeng.Enable( FALSE ); aMtrFocalLength.Enable( FALSE ); aMtrFocalLength.SetEmptyFieldValue(); - aGrpCamera.Enable( FALSE ); + aFLCamera.Enable( FALSE ); // Unterer Bereich aBtnConvertTo3D.Enable( FALSE ); @@ -679,7 +677,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexObjectY.Enable( bBitmap ); aFtTexFilter.Enable( bBitmap ); aBtnTexFilter.Enable( bBitmap ); - aGrpTexture.Enable( bBitmap ); + aFLTexture.Enable( bBitmap ); // Geometrie @@ -2403,14 +2401,13 @@ void __EXPORT Svx3DWin::Resize() aCtlPreview.Hide(); aCtlLightPreview.Hide(); - aGrpPreview.Hide(); - aGrpFavorites.Hide(); - aGrpGeometrie.Hide(); - aGrpRepresentation.Hide(); - aGrpLight.Hide(); - aGrpTexture.Hide(); - aGrpMaterial.Hide(); + aFLFavorites.Hide(); + aFLGeometrie.Hide(); + aFLRepresentation.Hide(); + aFLLight.Hide(); + aFLTexture.Hide(); + aFLMaterial.Hide(); // Verschieben / Resizen aBtnUpdate.SetPosPixel( aBtnUpdate.GetPosPixel() + aXPt ); @@ -2423,21 +2420,18 @@ void __EXPORT Svx3DWin::Resize() aCtlPreview.SetOutputSizePixel( aObjSize ); aCtlLightPreview.SetOutputSizePixel( aObjSize ); - // Preview-Group - aObjSize = aGrpPreview.GetOutputSizePixel(); - aObjSize.Width() += aDiffSize.Width(); - aObjSize.Height() += aDiffSize.Height(); - aGrpPreview.SetOutputSizePixel( aObjSize ); - - // Groups - aObjSize = aGrpFavorites.GetOutputSizePixel(); + // Groups + aObjSize = aFLFavorites.GetOutputSizePixel(); aObjSize.Width() += aDiffSize.Width(); - aGrpFavorites.SetOutputSizePixel( aObjSize ); - aGrpGeometrie.SetOutputSizePixel( aObjSize ); - aGrpRepresentation.SetOutputSizePixel( aObjSize ); - aGrpLight.SetOutputSizePixel( aObjSize ); - aGrpTexture.SetOutputSizePixel( aObjSize ); - aGrpMaterial.SetOutputSizePixel( aObjSize ); + aFLFavorites.SetOutputSizePixel( aObjSize ); + aFLGeometrie.SetOutputSizePixel( aObjSize ); + aFLSegments.SetOutputSizePixel( aObjSize ); + aFLShadow.SetOutputSizePixel( aObjSize ); + aFLCamera.SetOutputSizePixel( aObjSize ); + aFLRepresentation.SetOutputSizePixel( aObjSize ); + aFLLight.SetOutputSizePixel( aObjSize ); + aFLTexture.SetOutputSizePixel( aObjSize ); + aFLMaterial.SetOutputSizePixel( aObjSize ); // Y-Position der unteren Buttons aBtnConvertTo3D.SetPosPixel( aBtnConvertTo3D.GetPosPixel() + aYPt ); @@ -2452,8 +2446,6 @@ void __EXPORT Svx3DWin::Resize() aBtnLatheObject.Show(); aBtnPerspective.Show(); - aGrpPreview.Show(); - if( aBtnFavorites.IsChecked() ) ClickViewTypeHdl( &aBtnFavorites ); if( aBtnGeo.IsChecked() ) @@ -2543,14 +2535,14 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( eViewType == VIEWTYPE_FAVORITES ) { aCtlFavorites.Show(); - aGrpFavorites.Show(); + aFLFavorites.Show(); aBtnOnly3D.Show(); aBtnAllAttributes.Show(); } else { aCtlFavorites.Hide(); - aGrpFavorites.Hide(); + aFLFavorites.Hide(); aBtnOnly3D.Hide(); aBtnAllAttributes.Hide(); } @@ -2562,7 +2554,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aNumHorizontal.Show(); aFtVertical.Show(); aNumVertical.Show(); - aGrpSegments.Show(); + aFLSegments.Show(); aFtPercentDiagonal.Show(); aMtrPercentDiagonal.Show(); aFtBackscale.Show(); @@ -2571,14 +2563,14 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aMtrEndAngle.Show(); aFtDepth.Show(); aMtrDepth.Show(); - aGrpGeometrie.Show(); + aFLGeometrie.Show(); aBtnNormalsObj.Show(); aBtnNormalsFlat.Show(); aBtnNormalsSphere.Show(); aBtnTwoSidedLighting.Show(); aBtnNormalsInvert.Show(); - aGrpNormals.Show(); + aFLNormals.Show(); aBtnDoubleSided.Show(); } else @@ -2587,7 +2579,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aNumHorizontal.Hide(); aFtVertical.Hide(); aNumVertical.Hide(); - aGrpSegments.Hide(); + aFLSegments.Hide(); aFtPercentDiagonal.Hide(); aMtrPercentDiagonal.Hide(); aFtBackscale.Hide(); @@ -2596,14 +2588,14 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aMtrEndAngle.Hide(); aFtDepth.Hide(); aMtrDepth.Hide(); - aGrpGeometrie.Hide(); + aFLGeometrie.Hide(); aBtnNormalsObj.Hide(); aBtnNormalsFlat.Hide(); aBtnNormalsSphere.Hide(); aBtnTwoSidedLighting.Hide(); aBtnNormalsInvert.Hide(); - aGrpNormals.Hide(); + aFLNormals.Hide(); aBtnDoubleSided.Hide(); } @@ -2615,13 +2607,13 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnShadow3d.Show(); aFtSlant.Show(); aMtrSlant.Show(); - aGrpShadow.Show(); + aFLShadow.Show(); aFtDistance.Show(); aMtrDistance.Show(); aFtFocalLeng.Show(); aMtrFocalLength.Show(); - aGrpCamera.Show(); - aGrpRepresentation.Show(); + aFLCamera.Show(); + aFLRepresentation.Show(); } else { @@ -2630,13 +2622,13 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnShadow3d.Hide(); aFtSlant.Hide(); aMtrSlant.Hide(); - aGrpShadow.Hide(); + aFLShadow.Hide(); aFtDistance.Hide(); aMtrDistance.Hide(); aFtFocalLeng.Hide(); aMtrFocalLength.Hide(); - aGrpCamera.Hide(); - aGrpRepresentation.Hide(); + aFLCamera.Hide(); + aFLRepresentation.Hide(); } // Beleuchtung @@ -2652,11 +2644,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnLight8.Show(); //aLbLight1.Show(); aBtnLightColor.Show(); - aGrpLightsource.Show(); + aFTLightsource.Show(); aLbAmbientlight.Show(); aBtnAmbientColor.Show(); - aGrpAmbientlight.Show(); - aGrpLight.Show(); + aFTAmbientlight.Show(); + aFLLight.Show(); //aFtLightX.Show(); //aFtLightY.Show(); //aFtLightZ.Show(); @@ -2688,15 +2680,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aLbLight7.Hide(); aLbLight8.Hide(); aBtnLightColor.Hide(); - aGrpLightsource.Hide(); + aFTLightsource.Hide(); aLbAmbientlight.Hide(); aBtnAmbientColor.Hide(); - aGrpAmbientlight.Hide(); - aGrpLight.Hide(); - aFtLightX.Hide(); - aFtLightY.Hide(); - aFtLightZ.Hide(); - aGrpLightInfo.Hide(); + aFTAmbientlight.Hide(); + aFLLight.Hide(); if( !aCtlPreview.IsVisible() ) { @@ -2725,7 +2713,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnTexObjectY.Show(); aFtTexFilter.Show(); aBtnTexFilter.Show(); - aGrpTexture.Show(); + aFLTexture.Show(); } else { @@ -2746,7 +2734,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnTexObjectY.Hide(); aFtTexFilter.Hide(); aBtnTexFilter.Hide(); - aGrpTexture.Hide(); + aFLTexture.Hide(); } // Material @@ -2765,8 +2753,8 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnSpecularColor.Show(); aFtMatSpecularIntensity.Show(); aMtrMatSpecularIntensity.Show(); - aGrpMatSpecular.Show(); - aGrpMaterial.Show(); + aFLMatSpecular.Show(); + aFLMaterial.Show(); } else { @@ -2783,8 +2771,8 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) aBtnSpecularColor.Hide(); aFtMatSpecularIntensity.Hide(); aMtrMatSpecularIntensity.Hide(); - aGrpMatSpecular.Hide(); - aGrpMaterial.Hide(); + aFLMatSpecular.Hide(); + aFLMaterial.Hide(); } if( bUpdatePreview && !aBtnLight.IsChecked() ) UpdatePreview(); @@ -3183,14 +3171,6 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) USHORT nLightSource = GetLightSource( pBtn ); ColorLB* pLb = GetLbByButton( pBtn ); Color aColor( pLb->GetSelectEntryColor() ); - if( nLightSource == 7 && - aColor.GetRed()==9&&aColor.GetGreen()==4&&aColor.GetBlue()==67) - { - aFtLightX.Show(); - aFtLightY.Show(); - aFtLightZ.Show(); - aGrpLightInfo.Show(); - } *pLightGroup = *aCtlLightPreview.GetPreviewControl().GetLightGroup(); pLightGroup->SetIntensity( aColor, @@ -3331,30 +3311,6 @@ IMPL_LINK( Svx3DWin, ChangeLightCallbackHdl, void*, p ) *pLightGroup = *aCtlLightPreview.GetPreviewControl().GetLightGroup(); //aCtlPreview.SetLightGroup( pLightGroup ); - // Setzen der Vector Informationen - Base3DLightNumber eLight = aCtlLightPreview.GetPreviewControl().GetSelectedLight(); - if( eLight != Base3DLightNone && aFtLightX.IsVisible() ) - { - Vector3D aVector = pLightGroup->GetDirection( eLight ); - aVector.Normalize(); - - String aStr; - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_X)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.X()*1000.0)); - aFtLightX.SetText( aStr ); - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_Y)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.Y()*1000.0)); - aFtLightY.SetText( aStr ); - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_Z)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.Z()*1000.0)); - aFtLightZ.SetText( aStr ); - } return( 0L ); } @@ -3427,29 +3383,6 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, p ) aBtnLightColor.Enable( FALSE ); } - if( eLight != Base3DLightNone && aFtLightX.IsVisible() ) - { - Vector3D aVector = pLightGroup->GetDirection( eLight ); - aVector.Normalize(); - - String aStr; - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_X)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.X()*1000.0)); - aFtLightX.SetText( aStr ); - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_Y)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.Y()*1000.0)); - aFtLightY.SetText( aStr ); - - aStr = String(SVX_RES(RID_SVXFLOAT3D_FIX_Z)); - aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((INT32)(aVector.Z()*1000.0)); - aFtLightZ.SetText( aStr ); - } - return( 0L ); } diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 1d3490acf982..b0f90f5f8105 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -2,9 +2,9 @@ * * $RCSfile: float3d.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2001-06-13 22:04:57 $ + * last change: $Author: fme $ $Date: 2001-06-14 18:01:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -307,6 +307,7 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText[ catalan ] = "Material"; QuickHelpText[ finnish ] = "Material!"; }; + ImageButton BTN_UPDATE { Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ; @@ -380,7 +381,7 @@ DockingWindow RID_SVXFLOAT_3D // Unterer Teil ImageButton BTN_CHANGE_TO_3D { - Pos = MAP_APPFONT ( BORDER , HEIGHT - BUTTON_HEIGHT - BORDER ) ; + Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Umwandeln in 3D" ; QuickHelpText [ ENGLISH ] = "Convert to 3D" ; @@ -416,7 +417,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LATHE_OBJ { - Pos = MAP_APPFONT ( BORDER + BUTTON_WIDTH + 1 , HEIGHT - BUTTON_HEIGHT - BORDER ) ; + Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Umwandeln in Rotationskrper" ; QuickHelpText [ ENGLISH ] = "Convert to lathe object" ; @@ -452,7 +453,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_PERSPECTIVE { - Pos = MAP_APPFONT ( BORDER + ( BUTTON_WIDTH + 1 ) * 2 , HEIGHT - BUTTON_HEIGHT - BORDER ) ; + Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Perspektive ein-/ausschalten" ; QuickHelpText [ ENGLISH ] = "Perspective" ; @@ -489,60 +490,31 @@ DockingWindow RID_SVXFLOAT_3D Control CTL_PREVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( GROUP_PREV_X + 6 , GROUP_PREV_Y + 9 ) ; - Size = MAP_APPFONT ( GROUP_PREV_WIDTH - 12 , GROUP_PREV_HEIGHT - 15 ) ; + Pos = MAP_APPFONT ( 66 , 124 ) ; + Size = MAP_APPFONT ( 83 , 76 ) ; TabStop = TRUE ; }; Control CTL_LIGHT_PREVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( GROUP_PREV_X + 6 , GROUP_PREV_Y + 9 ) ; - Size = MAP_APPFONT ( GROUP_PREV_WIDTH - 12 , GROUP_PREV_HEIGHT - 15 ) ; + Pos = MAP_APPFONT ( 66 , 124 ) ; + Size = MAP_APPFONT ( 83 , 76 ) ; TabStop = TRUE ; }; - GroupBox GRP_PREVIEW - { - Pos = MAP_APPFONT ( GROUP_PREV_X , GROUP_PREV_Y ) ; - Size = MAP_APPFONT ( GROUP_PREV_WIDTH , GROUP_PREV_HEIGHT ) ; - Text = "Vorschau" ; - Text [ ENGLISH ] = "Preview" ; - Text [ english_us ] = "Preview" ; - Text [ portuguese_brazilian ] = "Vorschau" ; - Text [ swedish ] = "Frhandsvisning" ; - Text [ danish ] = "Eksempel" ; - Text [ italian ] = "Anteprima" ; - Text [ spanish ] = "Previsualizacin " ; - Text [ french ] = "Aperu" ; - Text [ dutch ] = "Voorbeeld" ; - Text [ portuguese ] = "Previsualizar" ; - Text[ chinese_simplified ] = "Ԥ"; - Text[ russian ] = ""; - Text[ polish ] = "Podgld"; - Text[ japanese ] = "ޭ"; - Text[ chinese_traditional ] = "w"; - Text[ arabic ] = ""; - Text[ dutch ] = "Voorbeeld"; - Text[ chinese_simplified ] = "Ԥ"; - Text[ greek ] = ""; - Text[ korean ] = "̸ "; - Text[ turkish ] = "nizleme"; - Text[ catalan ] = "Previsualizacin "; - Text[ finnish ] = "Esikatselu"; - }; // Favoriten Control CTL_FAVORITES { //HelpId = HID_SD_CTL_FAVORITES ; Border = TRUE ; - Pos = MAP_APPFONT ( BORDER + 6 , GROUP_Y + 9 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 12 , GROUP_HEIGHT - 15 ) ; + Pos = MAP_APPFONT ( 9 , 28 ) ; + Size = MAP_APPFONT ( 140 , 89 ) ; TabStop = TRUE ; Hide = TRUE ; }; - GroupBox GRP_FAVORITES + FixedLine FL_FAVORITES { - Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( GROUP_WIDTH , GROUP_HEIGHT ) ; + Pos = MAP_APPFONT ( BORDER , 19 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Favoriten" ; Text [ ENGLISH ] = "Preview" ; Text [ english_us ] = "Favorites" ; @@ -570,7 +542,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_ONLY_3D { - Pos = MAP_APPFONT ( BORDER , GROUP_PREV_Y+1 ) ; + Pos = MAP_APPFONT ( 9 , 124 ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Nur 3D-Attribute zuweisen" ; QuickHelpText [ ENGLISH ] = "Assign only 3D attributes" ; @@ -605,7 +577,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_ALL_ATTRIBUTES { - Pos = MAP_APPFONT ( BORDER + BUTTON_WIDTH , GROUP_PREV_Y+1 ) ; + Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH , 124 ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Alle Attribute zuweisen" ; QuickHelpText [ ENGLISH ] = "Assign all attributes" ; @@ -641,8 +613,8 @@ DockingWindow RID_SVXFLOAT_3D // Geometrie FixedText FT_HORIZONTAL { - Pos = MAP_APPFONT ( 13 , 37 ) ; - Size = MAP_APPFONT ( 43 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 100 ) ; + Size = MAP_APPFONT ( 43 , 8 ) ; Text = "Horizontal" ; Text [ ENGLISH ] = "Horizontal" ; Text [ english_us ] = "Horizontal" ; @@ -671,7 +643,7 @@ DockingWindow RID_SVXFLOAT_3D NumericField NUM_HORIZONTAL { Border = TRUE ; - Pos = MAP_APPFONT ( 59 , 35 ) ; + Pos = MAP_APPFONT ( 59 , 98 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -683,8 +655,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_VERTICAL { - Size = MAP_APPFONT ( 36 , 10 ) ; - Pos = MAP_APPFONT ( 85 , 37 ) ; + Pos = MAP_APPFONT ( 85 , 100 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Vertikal" ; Text [ ENGLISH ] = "Vertical" ; Text [ english_us ] = "Vertical" ; @@ -713,7 +685,7 @@ DockingWindow RID_SVXFLOAT_3D NumericField NUM_VERTICAL { Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 35 ) ; + Pos = MAP_APPFONT ( 127 , 98 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -723,10 +695,10 @@ DockingWindow RID_SVXFLOAT_3D Maximum = 256 ; Last = 256 ; }; - GroupBox GRP_SEGMENTS + FixedLine FL_SEGMENTS { - Pos = MAP_APPFONT ( BORDER + 6 , GROUP_Y + 8 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 24 ) ; + Pos = MAP_APPFONT ( BORDER , 87 ) ; + Size = MAP_APPFONT ( 152, 8 ) ; Text = "Segmente" ; Text [ ENGLISH ] = "Segments" ; Text [ english_us ] = "Segments" ; @@ -754,8 +726,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_PERCENT_DIAGONAL { - Pos = MAP_APPFONT ( 9 , 56 ) ; - Size = MAP_APPFONT ( 72 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 32 ) ; + Size = MAP_APPFONT ( 72 , 8 ) ; Text = "Kantenrundung" ; Text [ ENGLISH ] = "Percent diagonal" ; Text [ english_us ] = "Rounded edges" ; @@ -784,7 +756,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_PERCENT_DIAGONAL { Border = TRUE ; - Pos = MAP_APPFONT ( 99 , 54 ) ; + Pos = MAP_APPFONT ( 99 , 30 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -797,8 +769,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_BACKSCALE { - Pos = MAP_APPFONT ( 9 , 70 ) ; - Size = MAP_APPFONT ( 72 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 46 ) ; + Size = MAP_APPFONT ( 72 , 8 ) ; Text = "Tiefenskalierung" ; Text [ ENGLISH ] = "Backscale" ; Text [ portuguese ] = "Escala de profundidade" ; @@ -827,7 +799,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_BACKSCALE { Border = TRUE ; - Pos = MAP_APPFONT ( 99 , 68 ) ; + Pos = MAP_APPFONT ( 99 , 44 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -840,8 +812,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_END_ANGLE { - Pos = MAP_APPFONT ( 9 , 84 ) ; - Size = MAP_APPFONT ( 72 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 60 ) ; + Size = MAP_APPFONT ( 72 , 8 ) ; Text = "Endwinkel" ; Text [ ENGLISH ] = "End angle" ; Text [ english_us ] = "Rotation angle" ; @@ -870,7 +842,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_END_ANGLE { Border = TRUE ; - Pos = MAP_APPFONT ( 99 , 82 ) ; + Pos = MAP_APPFONT ( 99 , 58 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -884,8 +856,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_DEPTH { - Pos = MAP_APPFONT ( 9 , 98 ) ; - Size = MAP_APPFONT ( 72 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 74 ) ; + Size = MAP_APPFONT ( 72 , 8 ) ; Text = "Tiefe" ; Text [ ENGLISH ] = "Depth" ; Text [ english_us ] = "Depth" ; @@ -914,7 +886,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_DEPTH { Border = TRUE ; - Pos = MAP_APPFONT ( 99 , 96 ) ; + Pos = MAP_APPFONT ( 99 , 72 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -928,10 +900,10 @@ DockingWindow RID_SVXFLOAT_3D DecimalDigits = 2 ; SpinSize = 100 ; }; - GroupBox GRP_GEOMETRIE + FixedLine FL_GEOMETRIE { - Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( WIDTH - 2 * BORDER , GROUP_HEIGHT ) ; + Pos = MAP_APPFONT ( BORDER , 19 ) ; + Size = MAP_APPFONT ( 152, 8 ) ; Text = "Geometrie" ; Text [ ENGLISH ] = "Geometry" ; Text [ english_us ] = "Geometry" ; @@ -1132,10 +1104,10 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText[ catalan ] = "Iluminacin en dos lados"; QuickHelpText[ finnish ] = "Kaksipuolinen valaistus!"; }; - GroupBox GRP_NORMALS + FixedLine FL_NORMALS { - Pos = MAP_APPFONT ( BORDER , GROUP_PREV_Y ) ; - Size = MAP_APPFONT ( WIDTH - ( WIDTH - GROUP_PREV_X ) - BORDER - 3 , 44 ) ; + Pos = MAP_APPFONT ( 3 , 115 ) ; + Size = MAP_APPFONT ( 54 , 8 ) ; Text = "Normalen" ; Text [ ENGLISH ] = "Normals" ; Text [ english_us ] = "Normals" ; @@ -1163,7 +1135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_DOUBLE_SIDED { - Pos = MAP_APPFONT ( BORDER , HEIGHT - BUTTON_HEIGHT * 2 - BORDER - 3 ) ; + Pos = MAP_APPFONT ( 9 , 171 ) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; QuickHelpText = "Doppelseitig" ; QuickHelpText [ ENGLISH ] = "Double sided" ; @@ -1200,7 +1172,7 @@ DockingWindow RID_SVXFLOAT_3D FixedText FT_SHADEMODE { Pos = MAP_APPFONT ( 11 , 32 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Modus" ; Text [ ENGLISH ] = "Mode" ; Text [ english_us ] = "Mode" ; @@ -1229,8 +1201,8 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_SHADEMODE { Border = TRUE ; - Pos = MAP_APPFONT ( 74 , 30 ) ; - Size = MAP_APPFONT ( 75 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 30 ) ; + Size = MAP_APPFONT ( 83 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -1380,7 +1352,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SHADOW_3D { - Pos = MAP_APPFONT ( 14 , 52 ) ; + Pos = MAP_APPFONT ( 14 , 54 ) ; Size = BUTTON_SIZE QuickHelpText = "3D-Schatten ein/-ausschalten" ; QuickHelpText [ ENGLISH ] = "3D shadow" ; @@ -1416,8 +1388,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_SLANT { - Pos = MAP_APPFONT ( 31 , 54 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 31 , 56 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Papierneigung : Neigung */ /* ### ACHTUNG: Neuer Text in Resource? Papierneigung : Neigung */ Text = "Papierneigung" ; @@ -1448,7 +1420,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_SLANT { Border = TRUE ; - Pos = MAP_APPFONT ( 96 , 52 ) ; + Pos = MAP_APPFONT ( 66 , 54 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -1459,10 +1431,10 @@ DockingWindow RID_SVXFLOAT_3D CustomUnitText = " " ; Last = 90 ; }; - GroupBox GRP_SHADOW + FixedLine FL_SHADOW { - Pos = MAP_APPFONT ( BORDER + 6 , 43 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 25 ) ; + Pos = MAP_APPFONT ( BORDER , 43 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Schatten" ; Text [ ENGLISH ] = "Shadow" ; Text [ english_us ] = "Shadow" ; @@ -1491,7 +1463,7 @@ DockingWindow RID_SVXFLOAT_3D FixedText FT_DISTANCE { Pos = MAP_APPFONT ( 13 , 81 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Entfernung" ; Text [ ENGLISH ] = "Distance" ; Text [ english_us ] = "Distance" ; @@ -1520,7 +1492,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_DISTANCE { Border = TRUE ; - Pos = MAP_APPFONT ( 96 , 79 ) ; + Pos = MAP_APPFONT ( 66 , 79 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -1536,8 +1508,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_FOCAL_LENGTH { - Pos = MAP_APPFONT ( 13 , 95 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 13 , 97 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Brennweite" ; Text [ ENGLISH ] = "Focal length" ; Text [ english_us ] = "Focal length" ; @@ -1566,7 +1538,7 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_FOCAL_LENGTH { Border = TRUE ; - Pos = MAP_APPFONT ( 96 , 93 ) ; + Pos = MAP_APPFONT ( 66 , 95 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; @@ -1580,10 +1552,10 @@ DockingWindow RID_SVXFLOAT_3D DecimalDigits = 2 ; SpinSize = 100 ; }; - GroupBox GRP_CAMERA + FixedLine FL_CAMERA { - Pos = MAP_APPFONT ( BORDER + 6 , 70 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 39 ) ; + Pos = MAP_APPFONT ( 3 , 70 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Kamera" ; Text [ ENGLISH ] = "Camera" ; Text [ english_us ] = "Camera" ; @@ -1609,10 +1581,10 @@ DockingWindow RID_SVXFLOAT_3D Text[ catalan ] = "Cmara"; Text[ finnish ] = "Kamera"; }; - GroupBox GRP_REPRESENTATION + FixedLine FL_REPRESENTATION { - Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( WIDTH - 2 * BORDER , GROUP_HEIGHT ) ; + Pos = MAP_APPFONT ( 3 , 19 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Darstellung" ; Text [ ENGLISH ] = "Representation" ; Text [ english_us ] = "Shading" ; @@ -1641,8 +1613,8 @@ DockingWindow RID_SVXFLOAT_3D // Beleuchtung ImageButton BTN_LIGHT_1 { - Pos = MAP_APPFONT ( 13 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 9 , 38 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 1" ; QuickHelpText [ ENGLISH ] = "Light source 1" ; ButtonImage = Image @@ -1676,8 +1648,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_2 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH + 1 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 22 , 38 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 2" ; QuickHelpText [ ENGLISH ] = "Light source 2" ; ButtonImage = Image @@ -1711,8 +1683,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_3 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 2 + 2 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 35 , 38 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 3" ; QuickHelpText [ ENGLISH ] = "Light source 3" ; ButtonImage = Image @@ -1746,8 +1718,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_4 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 3 + 3 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 48 , 38 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 4" ; QuickHelpText [ ENGLISH ] = "Light source 4" ; ButtonImage = Image @@ -1781,8 +1753,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_5 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 4 + 4 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 9 , 51 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 5" ; QuickHelpText [ ENGLISH ] = "Light source 5" ; ButtonImage = Image @@ -1816,8 +1788,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_6 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 5 + 5 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 22 , 51 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 6" ; QuickHelpText [ ENGLISH ] = "Light source 6" ; ButtonImage = Image @@ -1851,8 +1823,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_7 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 6 + 6 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 35, 51 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 7" ; QuickHelpText [ ENGLISH ] = "Light source 7" ; ButtonImage = Image @@ -1886,8 +1858,8 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_8 { - Pos = MAP_APPFONT ( 13 + BUTTON_WIDTH * 7 + 7 , 38 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 48 , 51 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Lichtquelle 8" ; QuickHelpText [ ENGLISH ] = "Light source 8" ; ButtonImage = Image @@ -1922,71 +1894,71 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_LIGHT_1 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_2 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_3 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_4 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_5 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_6 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_7 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_LIGHT_8 { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 54 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 38 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_LIGHT_COLOR { - Pos = MAP_APPFONT ( 32 + BUTTON_WIDTH * 7 + 7 , 54 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 137 , 38 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Farbe ber Farbdialog whlen" ; QuickHelpText [ ENGLISH ] = "Chose color with color dialog" ; ButtonImage = Image @@ -2018,10 +1990,10 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText[ catalan ] = "Seleccionar colores en dilogo de colores"; QuickHelpText[ finnish ] = "Vrit-valintaikkuna!"; }; - GroupBox GRP_LIGHTSOURCE + FixedText FT_LIGHTSOURCE { - Pos = MAP_APPFONT ( BORDER + 6 , 27 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 46 ) ; + Pos = MAP_APPFONT ( 9 , 27 ) ; + Size = MAP_APPFONT ( 70 , 8 ) ; Text = "Lichtquelle" ; Text [ ENGLISH ] = "Lichtquelle" ; Text [ portuguese ] = "Fonte de luz" ; @@ -2050,15 +2022,15 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_AMBIENTLIGHT { Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 85 ) ; - Size = MAP_APPFONT ( 19 + 97 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 70 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_AMBIENT_COLOR { - Pos = MAP_APPFONT ( 32 + BUTTON_WIDTH * 7 + 7 , 85 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 137 , 70 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; QuickHelpText = "Farbe ber Farbdialog whlen" ; QuickHelpText [ ENGLISH ] = "Chose color with color dialog" ; ButtonImage = Image @@ -2090,10 +2062,10 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText[ catalan ] = "Seleccionar color en dilogo de colores"; QuickHelpText[ finnish ] = "Vrit-valintaikkuna!"; }; - GroupBox GRP_AMBIENTLIGHT + FixedText FT_AMBIENTLIGHT { - Pos = MAP_APPFONT ( BORDER + 6 , 74 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 30 ) ; + Pos = MAP_APPFONT ( 9, 72 ) ; + Size = MAP_APPFONT ( 56 , 8 ) ; Text = "Umgebungslicht" ; Text [ ENGLISH ] = "Ambient light" ; Text [ english_us ] = "Ambient light" ; @@ -2119,10 +2091,10 @@ DockingWindow RID_SVXFLOAT_3D Text[ catalan ] = "Luz ambiental"; Text[ finnish ] = "Ympriv valaistus"; }; - GroupBox GRP_LIGHT + FixedLine FL_LIGHT { - Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( WIDTH - 2 * BORDER , GROUP_HEIGHT ) ; + Pos = MAP_APPFONT ( BORDER , 19 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Beleuchtung" ; Text [ ENGLISH ] = "Lighting" ; Text [ english_us ] = "Illumination" ; @@ -2148,53 +2120,6 @@ DockingWindow RID_SVXFLOAT_3D Text[ catalan ] = "Iluminacin"; Text[ finnish ] = "Valaistus"; }; - FixedText FT_LIGHT_X - { - Pos = MAP_APPFONT ( BORDER + 5 , GROUP_PREV_Y + 10 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "X" ; - }; - FixedText FT_LIGHT_Y - { - Pos = MAP_APPFONT ( BORDER + 5 , GROUP_PREV_Y + 22 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "Y" ; - }; - FixedText FT_LIGHT_Z - { - Pos = MAP_APPFONT ( BORDER + 5 , GROUP_PREV_Y + 34 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "Z" ; - }; - GroupBox GRP_LIGHT_INFO - { - Pos = MAP_APPFONT ( BORDER , GROUP_PREV_Y ) ; - Size = MAP_APPFONT ( WIDTH - ( WIDTH - GROUP_PREV_X ) - BORDER - 3 , 46 ) ; - Text = "Lichtrichtung" ; - Text [ ENGLISH ] = "Light direction" ; - Text [ english_us ] = "Direction" ; - Text [ portuguese_brazilian ] = "Lichtrichtung" ; - Text [ swedish ] = "Ljusriktning" ; - Text [ danish ] = "Lysretning" ; - Text [ italian ] = "Direzione illuminazione" ; - Text [ spanish ] = "Direccin de la luz" ; - Text [ french ] = "Direction" ; - Text [ dutch ] = "Lichtrichting" ; - Text [ portuguese ] = "Direco da luz" ; - Text[ chinese_simplified ] = "Դ"; - Text[ russian ] = " "; - Text[ polish ] = "Kierunek wiata"; - Text[ japanese ] = "̕"; - Text[ chinese_traditional ] = "V"; - Text[ arabic ] = " "; - Text[ dutch ] = "Lichtrichting"; - Text[ chinese_simplified ] = "Դ"; - Text[ greek ] = " "; - Text[ korean ] = " "; - Text[ turkish ] = "Ik yn"; - Text[ catalan ] = "Direccin de la luz"; - Text[ finnish ] = "Suunta"; - }; // Texturen FixedText FT_TEX_KIND { @@ -2761,10 +2686,10 @@ DockingWindow RID_SVXFLOAT_3D QuickHelpText[ catalan ] = "Activar/desactivar filtracin"; QuickHelpText[ finnish ] = "Suodatus On/Off!"; }; - GroupBox GRP_TEXTURE + FixedLine FL_TEXTURE { Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( WIDTH - 2 * BORDER , GROUP_HEIGHT ) ; + Size = MAP_APPFONT ( WIDTH - 2 * BORDER , 8 ) ; Text = "Texturen" ; Text [ ENGLISH ] = "Textures" ; Text [ english_us ] = "Textures" ; @@ -2804,8 +2729,8 @@ DockingWindow RID_SVXFLOAT_3D // Materialeditor FixedText FT_MAT_FAVORITES { - Pos = MAP_APPFONT ( 6 , 30 ) ; - Size = MAP_APPFONT ( 54 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 32 ) ; + Size = MAP_APPFONT ( 54 , 8 ) ; Text = "Favoriten" ; Text [ ENGLISH ] = "Favorites" ; Text [ english_us ] = "Favorites" ; @@ -2834,8 +2759,8 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_MAT_FAVORITES { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 28 ) ; - Size = MAP_APPFONT ( 66 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 30 ) ; + Size = MAP_APPFONT ( 83 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -3066,8 +2991,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_MAT_COLOR { - Pos = MAP_APPFONT ( 6 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 48 ) ; + Size = MAP_APPFONT ( 56 , 8 ) ; Text = "Objektfarbe" ; Text [ ENGLISH ] = "Object color" ; Text [ english_us ] = "Object color" ; @@ -3096,15 +3021,15 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_MAT_COLOR { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 43 ) ; - Size = MAP_APPFONT ( 52 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 46 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_MAT_COLOR { - Pos = MAP_APPFONT ( 35 + BUTTON_WIDTH * 7 + 7 , 43 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 137 , 46 ) ; + Size = MAP_APPFONT ( 12, 12 ) ; QuickHelpText = "Farbe ber Farbdialog whlen" ; QuickHelpText [ ENGLISH ] = "Chose color with color dialog" ; ButtonImage = Image @@ -3138,8 +3063,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_MAT_EMISSION { - Pos = MAP_APPFONT ( 6, 59 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 9, 64 ) ; + Size = MAP_APPFONT ( 56 , 8 ) ; Text = "Leuchtfarbe" ; Text [ ENGLISH ] = "Emission" ; Text [ english_us ] = "Illumination color" ; @@ -3168,15 +3093,15 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_MAT_EMISSION { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 57 ) ; - Size = MAP_APPFONT ( 52 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 62 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_EMISSION_COLOR { - Pos = MAP_APPFONT ( 35 + BUTTON_WIDTH * 7 + 7 , 57 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 137 , 62 ) ; + Size = MAP_APPFONT ( 12, 12 ) ; QuickHelpText = "Farbe ber Farbdialog whlen" ; QuickHelpText [ ENGLISH ] = "Chose color with color dialog" ; ButtonImage = Image @@ -3210,8 +3135,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_MAT_SPECULAR { - Pos = MAP_APPFONT ( 14 , 82 ) ; - Size = MAP_APPFONT ( 44 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 90 ) ; + Size = MAP_APPFONT ( 44 , 8 ) ; Text = "Farbe" ; Text [ ENGLISH ] = "Color" ; Text [ english_us ] = "Color" ; @@ -3240,15 +3165,15 @@ DockingWindow RID_SVXFLOAT_3D ListBox LB_MAT_SPECULAR { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 80 ) ; - Size = MAP_APPFONT ( 52 , 100 ) ; + Pos = MAP_APPFONT ( 66 , 88 ) ; + Size = MAP_APPFONT ( 68 , 100 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_SPECULAR_COLOR { - Pos = MAP_APPFONT ( 35 + BUTTON_WIDTH * 7 + 7 , 80 ) ; - Size = BUTTON_SIZE + Pos = MAP_APPFONT ( 137 , 88 ) ; + Size = MAP_APPFONT ( 12, 12 ) ; QuickHelpText = "Farbe ber Farbdialog whlen" ; QuickHelpText [ ENGLISH ] = "Chose color with color dialog" ; ButtonImage = Image @@ -3282,8 +3207,8 @@ DockingWindow RID_SVXFLOAT_3D }; FixedText FT_MAT_SPECULAR_INTENSITY { - Pos = MAP_APPFONT ( 14 , 96 ) ; - Size = MAP_APPFONT ( 44 , 10 ) ; + Pos = MAP_APPFONT ( 9 , 106 ) ; + Size = MAP_APPFONT ( 44 , 8 ) ; Text = "Intensitt" ; Text [ ENGLISH ] = "Intensity" ; Text [ english_us ] = "Intensity" ; @@ -3312,8 +3237,8 @@ DockingWindow RID_SVXFLOAT_3D MetricField MTR_MAT_SPECULAR_INTENSITY { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 94 ) ; - Size = MAP_APPFONT ( 52 , 12 ) ; + Pos = MAP_APPFONT ( 66 , 104 ) ; + Size = MAP_APPFONT ( 68 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -3325,10 +3250,10 @@ DockingWindow RID_SVXFLOAT_3D Last = 100 ; SpinSize = 1 ; }; - GroupBox GRP_MAT_SPECULAR + FixedLine FL_MAT_SPECULAR { - Pos = MAP_APPFONT ( BORDER + 6 , 72 ) ; - Size = MAP_APPFONT ( GROUP_WIDTH - 2 * 6 , 39 ) ; + Pos = MAP_APPFONT ( 3 , 77 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Glanzpunkt" ; Text [ ENGLISH ] = "Specular" ; Text [ english_us ] = "Specular" ; @@ -3380,10 +3305,10 @@ DockingWindow RID_SVXFLOAT_3D TabStop = TRUE; }; */ - GroupBox GRP_MATERIAL + FixedLine FL_MATERIAL { - Pos = MAP_APPFONT ( BORDER , GROUP_Y ) ; - Size = MAP_APPFONT ( GROUP_WIDTH , GROUP_HEIGHT ) ; + Pos = MAP_APPFONT ( BORDER , 19 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; Text = "Material" ; Text [ ENGLISH ] = "Material" ; Text [ portuguese ] = "Material" ; diff --git a/svx/source/form/fmsearch.src b/svx/source/form/fmsearch.src index 5137f3b92579..e716670bb373 100644 --- a/svx/source/form/fmsearch.src +++ b/svx/source/form/fmsearch.src @@ -2,9 +2,9 @@ * * $RCSfile: fmsearch.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:09:20 $ + * last change: $Author: fme $ $Date: 2001-06-14 18:03:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,10 +75,10 @@ ModalDialog RID_SVXDLG_SEARCHFORM Closeable = TRUE; HelpId = HID_FM_DLG_SEARCH; - GroupBox GB_SEARCHFOR + FixedLine FL_SEARCHFOR { Pos = MAP_APPFONT( 6, 8 ); - Size = MAP_APPFONT( 219, 54 ); + Size = MAP_APPFONT( 232, 8 ); Text = "Suchen nach"; Text [ ENGLISH ] = "Search for"; Text[ english_us ] = "Search for"; @@ -107,28 +107,8 @@ ModalDialog RID_SVXDLG_SEARCHFORM Pos = MAP_APPFONT( 12, 23 ); Size = MAP_APPFONT( 50, 10 ); Group = TRUE; - Text = "~Text :"; - Text [ ENGLISH ] = "~Text :"; - Text[ italian ] = "~Testo :"; - Text[ portuguese_brazilian ] = "~Text :"; - Text[ portuguese ] = "~Texto :"; - Text[ danish ] = "Tekst :"; - Text[ french ] = "~Texte :"; - Text[ swedish ] = "~Text :"; - Text[ dutch ] = "~Tekst :"; - Text[ spanish ] = "~Texto :"; + Text = "~Text"; Text[ english_us ] = "~Text :"; - Text[ chinese_simplified ] = "(~T)"; - Text[ russian ] = " :"; - Text[ polish ] = "Tekst:"; - Text[ japanese ] = "(~T)"; - Text[ chinese_traditional ] = "r(~T)"; - Text[ arabic ] = " :"; - Text[ greek ] = " :"; - Text[ korean ] = "ؽƮ(~T):"; - Text[ turkish ] = "Metin:"; - Text[ catalan ] = "~Texto :"; - Text[ finnish ] = "~Teksti:"; }; RadioButton RB_SEARCHFORNULL { @@ -195,10 +175,10 @@ ModalDialog RID_SVXDLG_SEARCHFORM HelpId = HID_SEARCH_TEXT; }; - GroupBox GB_WHERE + FixedLine FL_WHERE { Pos = MAP_APPFONT( 6, 65 ); - Size = MAP_APPFONT( 219, 58 ); + Size = MAP_APPFONT( 232, 8 ); Text = "Bereich"; Text [ ENGLISH ] = "Bereich"; Text[ italian ] = "Area"; @@ -227,29 +207,8 @@ ModalDialog RID_SVXDLG_SEARCHFORM { Pos = MAP_APPFONT( 12, 77 ); Size = MAP_APPFONT( 87, 10 ); - Text = "~Formular :"; - Text [ ENGLISH ] = "~Formular :"; + Text = "~Formular"; Text[ english_us ] = "Form:"; - Text[ portuguese ] = "~Formulrio:"; - Text[ russian ] = " :"; - Text[ dutch ] = "~Formulier :"; - Text[ french ] = "~Formulaire :"; - Text[ spanish ] = "~Formulario :"; - Text[ italian ] = "Formulario :"; - Text[ danish ] = "~Formular :"; - Text[ swedish ] = "~Formulr :"; - Text[ polish ] = "Formularz :"; - Text[ portuguese_brazilian ] = "~Formular :"; - Text[ japanese ] = "̫:"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "G"; - Text[ arabic ] = ":"; - Text[ greek ] = ":"; - Text[ korean ] = ":"; - Text[ turkish ] = "Form:"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "~Formulario :"; - Text[ finnish ] = "Lomake:"; }; ListBox LB_FORM { @@ -293,31 +252,8 @@ ModalDialog RID_SVXDLG_SEARCHFORM { Pos = MAP_APPFONT( 24, 106 ); Size = MAP_APPFONT( 75, 10 ); - Text = "Ein~zelnes Feld :"; - Text [ ENGLISH ] = "Ein~zelnes Feld :"; - TabStop = TRUE; - HelpId = HID_SEARCH_SINGLEFIELD; - Text[ italian ] = "Campo singolo:"; - Text[ portuguese_brazilian ] = "ein~zelnes Feld :"; - Text[ portuguese ] = "Campo ~nico:"; - Text[ danish ] = "Enkelt felt :"; - Text[ french ] = "Champ individuel :"; - Text[ swedish ] = "Enstaka flt:"; - Text[ dutch ] = "~Een enkel veld :"; - Text[ spanish ] = "~Campo individual :"; - Text[ english_us ] = "Single field:"; - Text[ chinese_simplified ] = "ֶΣ"; - Text[ russian ] = " :"; - Text[ polish ] = "Pojedyncze pole :"; - Text[ japanese ] = "X̨:"; - Text[ chinese_traditional ] = "G"; - Text[ arabic ] = " :"; - Text[ greek ] = " :"; - Text[ korean ] = " ʵ:"; - Text[ turkish ] = "Tek alan:"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "~Campo individual :"; - Text[ finnish ] = "Yksittinen kentt:"; + Text = "Ein~zelnes Feld"; + Text[ english_us ] = "Single field"; }; ListBox LB_FIELD { @@ -328,10 +264,10 @@ ModalDialog RID_SVXDLG_SEARCHFORM DropDown = TRUE; HelpId = HID_SEARCH_FIELDSELECTION; }; - GroupBox GB_OPTIONS + FixedLine FL_OPTIONS { Pos = MAP_APPFONT( 6, 126 ); - Size = MAP_APPFONT( 288, 93 ); + Size = MAP_APPFONT( 288, 8 ); Text = "Einstellungen"; Text [ ENGLISH ] = "Einstellungen"; Text[ italian ] = "Impostazioni"; @@ -359,30 +295,9 @@ ModalDialog RID_SVXDLG_SEARCHFORM FixedText FT_POSITION { Pos = MAP_APPFONT( 12, 138 ); - Size = MAP_APPFONT( 40, 10 ); - Text = "~Position :"; - Text [ ENGLISH ] = "~Position :"; - Text[ italian ] = "~Posizione :"; - Text[ portuguese_brazilian ] = "~Position :"; - Text[ portuguese ] = "~Posio:"; - Text[ danish ] = "Placering :"; - Text[ french ] = "~Position :"; - Text[ swedish ] = "~Position:"; - Text[ dutch ] = "~Positie :"; - Text[ spanish ] = "~Posicin :"; - Text[ english_us ] = "Position :"; - Text[ chinese_simplified ] = "λã"; - Text[ russian ] = " :"; - Text[ polish ] = "Pozycja :"; - Text[ japanese ] = "ʒu:"; - Text[ chinese_traditional ] = "mG"; - Text[ arabic ] = ":"; - Text[ greek ] = " :"; - Text[ korean ] = "ġ:"; - Text[ turkish ] = "Konum:"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posicin :"; - Text[ finnish ] = "Sijainti:"; + Size = MAP_APPFONT( 40, 8 ); + Text = "~Position"; + Text[ english_us ] = "Position"; }; ListBox LB_POSITION { @@ -717,10 +632,10 @@ ModalDialog RID_SVXDLG_SEARCHFORM Text[ catalan ] = "..."; Text[ finnish ] = "..."; }; - GroupBox GB_STATE + FixedLine FL_STATE { Pos = MAP_APPFONT( 6, 222 ); - Size = MAP_APPFONT( 288, 25 ); + Size = MAP_APPFONT( 288, 8 ); Text = "Status" ; Text [ ENGLISH ] = "State" ; Text[ italian ] = "Stato"; diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 93961cfc7201..42ae7233114d 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -2,9 +2,9 @@ * * $RCSfile: gallery.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2001-06-13 22:09:32 $ + * last change: $Author: fme $ $Date: 2001-06-14 18:04:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -792,10 +792,10 @@ ModalDialog RID_SVXDLG_GALLERY_TITLE TabStop = TRUE ; }; - GroupBox GRP_TITLE + FixedLine FL_TITLE { Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 100 , 30 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "Titel" ; Text [ ENGLISH ] = "Title" ; Text [ english_us ] = "Title" ; @@ -858,10 +858,10 @@ ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS Text = "Suchen" ; Text [ ENGLISH ] = "Searching" ; Moveable = TRUE ; - GroupBox GRP_SEARCH_DIR + FixedLine FL_SEARCH_DIR { Pos = MAP_APPFONT ( 6 , 33 ) ; - Size = MAP_APPFONT ( 112 , 27 ) ; + Size = MAP_APPFONT ( 112 , 8 ) ; Text = "Verzeichnis" ; Text [ ENGLISH ] = "Directory" ; Text [ dutch ] = "Map" ; @@ -899,10 +899,10 @@ ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GRP_SEARCH_TYPE + FixedLine FL_SEARCH_TYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 112 , 27 ) ; + Size = MAP_APPFONT ( 112 , 8 ) ; Text = "Dateityp" ; Text [ ENGLISH ] = "Type of file" ; Text [ english_us ] = "File type" ; @@ -973,10 +973,10 @@ ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS Text = "bernehmen" ; Text [ ENGLISH ] = "Apply" ; Moveable = TRUE ; - GroupBox GRP_TAKE_PROGRESS + FixedLine FL_TAKE_PROGRESS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 112 , 27 ) ; + Size = MAP_APPFONT ( 112 , 8 ) ; Text = "Datei" ; Text [ ENGLISH ] = "File" ; Text [ dutch ] = "Bestand" ; @@ -1052,10 +1052,10 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS Text [ ENGLISH ] = "Actualize" ; Text [ english_us ] = "Update" ; Moveable = TRUE ; - GroupBox GRP_ACTUALIZE_PROGRESS + FixedLine FL_ACTUALIZE_PROGRESS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 112 , 27 ) ; + Size = MAP_APPFONT ( 112 , 8 ) ; Text = "Datei" ; Text [ ENGLISH ] = "File" ; Text [ dutch ] = "Bestand" ; @@ -1140,10 +1140,10 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GRP_ID + FixedLine FL_ID { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 112 , 54 ) ; + Size = MAP_APPFONT ( 112 , 8 ) ; Text = "ID" ; Text[ ENGLISH ] = "ID"; Text[ english_us ] = "ID"; |