#97044# accessibility design change

4 files changed, 235 insertions, 220 deletions

diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index 156923e5f5de..225eac9aa8d3 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: er $ $Date: 2001-05-13 03:27:40 $
+ *  last change: $Author: os $ $Date: 2002-02-01 11:13:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -163,14 +163,21 @@ private:
     CheckBox            aCbxUseGridsnap;
     CheckBox            aCbxGridVisible;
 
-    FixedText           aFtResolution;
+    FixedLine           aFlResolution;
     FixedText           aFtDrawX;
     MetricField         aMtrFldDrawX;
     FixedText           aFtDrawY;
     MetricField         aMtrFldDrawY;
-    FixedText           aFtDivision;
-    MetricField         aMtrFldDivisionX;
-    MetricField         aMtrFldDivisionY;
+
+    FixedLine           aFlDivision;
+    FixedText           aFtDivisionX;
+    NumericField        aNumFldDivisionX;
+    FixedText           aDivisionPointX;
+
+    FixedText           aFtDivisionY;
+    NumericField        aNumFldDivisionY;
+    FixedText           aDivisionPointY;
+
     CheckBox            aCbxSynchronize;
     FixedLine           aGrpDrawGrid; // Neu
 
@@ -200,17 +207,10 @@ private:
 
 #ifdef _SVX_OPTGRID_CXX
     DECL_LINK( ClickRotateHdl_Impl, void * );
-    DECL_LINK( ChangeDrawXHdl_Impl, void * );
-    DECL_LINK( ChangeDrawYHdl_Impl, void * );
-    DECL_LINK( ChangeSnapXHdl_Impl, void * );
-    DECL_LINK( ChangeSnapYHdl_Impl, void * );
+    DECL_LINK( ChangeDrawHdl_Impl, MetricField * );
     DECL_LINK( ChangeGridsnapHdl_Impl, void * );
-    DECL_LINK( ChangeDivisionXHdl_Impl, void * );
-    DECL_LINK( ChangeDivisionYHdl_Impl, void * );
+    DECL_LINK( ChangeDivisionHdl_Impl, NumericField * );
 
-    //void      Init();
-    //void      AutoClickHdl(CheckBox* pBox);
-    //void      ModifyHdl(Edit* );
 #endif
 };
 
diff --git a/svx/source/options/optgrid.cxx b/svx/source/options/optgrid.cxx
index 4a3f9a934e4c..15dca73d0532 100644
--- a/svx/source/options/optgrid.cxx
+++ b/svx/source/options/optgrid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fme $ $Date: 2001-06-03 14:21:57 $
+ *  last change: $Author: os $ $Date: 2002-02-01 11:14:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -211,14 +211,24 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
 
     SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRID ), rCoreSet ),
 
-    aFtResolution   ( this, ResId( FT_RESOLUTION ) ),
+    aFlResolution   ( this, ResId( FL_RESOLUTION ) ),
+
     aFtDrawX        ( this, ResId( FT_DRAW_X ) ),
     aMtrFldDrawX    ( this, ResId( MTR_FLD_DRAW_X ) ),
-    aFtDivision     ( this, ResId( FT_DIVISION ) ),
-    aMtrFldDivisionX( this, ResId( MTR_FLD_DIVISION_X ) ),
+
     aFtDrawY        ( this, ResId( FT_DRAW_Y ) ),
     aMtrFldDrawY    ( this, ResId( MTR_FLD_DRAW_Y ) ),
-    aMtrFldDivisionY( this, ResId( MTR_FLD_DIVISION_Y ) ),
+
+    aFlDivision     ( this, ResId( FL_DIVISION ) ),
+
+    aFtDivisionX(     this, ResId( FT_DIVISION_X) ),
+    aNumFldDivisionX( this, ResId( NUM_FLD_DIVISION_X ) ),
+    aDivisionPointX(  this, ResId( FT_HORZ_POINTS) ),
+
+    aFtDivisionY(     this, ResId( FT_DIVISION_Y) ),
+    aNumFldDivisionY( this, ResId( NUM_FLD_DIVISION_Y ) ),
+    aDivisionPointY(  this, ResId( FT_VERT_POINTS) ),
+
     aGrpDrawGrid    ( this, ResId( GRP_DRAWGRID ) ),
     aCbxUseGridsnap ( this, ResId( CBX_USE_GRIDSNAP ) ),
     aCbxSynchronize ( this, ResId( CBX_SYNCHRONIZE ) ),
@@ -245,6 +255,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
 
     FreeResource();
 
+    aDivisionPointY.SetText(aDivisionPointX.GetText());
     // Metrik einstellen
     FieldUnit eFUnit = GetModuleFieldUnit( &rCoreSet );
     long nFirst, nLast, nMin, nMax;
@@ -264,13 +275,13 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     aCbxSynchronize.SetClickHdl( aLink );
     aCbxGridVisible.SetClickHdl( aLink );
     aMtrFldDrawX.SetModifyHdl(
-        LINK( this, SvxGridTabPage, ChangeDrawXHdl_Impl ) );
+        LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
     aMtrFldDrawY.SetModifyHdl(
-        LINK( this, SvxGridTabPage, ChangeDrawYHdl_Impl ) );
-    aMtrFldDivisionX.SetModifyHdl(
-        LINK( this, SvxGridTabPage, ChangeDivisionXHdl_Impl ) );
-    aMtrFldDivisionY.SetModifyHdl(
-        LINK( this, SvxGridTabPage, ChangeDivisionYHdl_Impl ) );
+        LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
+    aNumFldDivisionX.SetModifyHdl(
+        LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
+    aNumFldDivisionY.SetModifyHdl(
+        LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
 }
 
 //------------------------------------------------------------------------
@@ -299,8 +310,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
 
         aGridItem.nFldDrawX    = (UINT32) nX;
         aGridItem.nFldDrawY    = (UINT32) nY;
-        aGridItem.nFldDivisionX = aMtrFldDivisionX.GetValue();
-        aGridItem.nFldDivisionY = aMtrFldDivisionY.GetValue();
+        aGridItem.nFldDivisionX = aNumFldDivisionX.GetValue();
+        aGridItem.nFldDivisionY = aNumFldDivisionY.GetValue();
 
         rCoreSet.Put( aGridItem );
     }
@@ -328,10 +339,10 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 
 //      UINT32 nFineX = pGridAttr->nFldDivisionX;
 //      UINT32 nFineY = pGridAttr->nFldDivisionY;
-//      aMtrFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 );
-//      aMtrFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 );
-        aMtrFldDivisionX.SetValue( pGridAttr->nFldDivisionX );
-        aMtrFldDivisionY.SetValue( pGridAttr->nFldDivisionY );
+//      aNumFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 );
+//      aNumFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 );
+        aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX );
+        aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY );
     }
 
     ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
@@ -386,22 +397,22 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
 }
 
 // -----------------------------------------------------------------------
-
 int SvxGridTabPage::DeactivatePage( SfxItemSet* pSet )
 {
     if ( pSet )
         FillItemSet( *pSet );
     return( LEAVE_PAGE );
 }
-
 //------------------------------------------------------------------------
-
-IMPL_LINK( SvxGridTabPage, ChangeDrawXHdl_Impl, void *, EMPTYARG )
+IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
 {
     bAttrModified = TRUE;
     if( aCbxSynchronize.IsChecked() )
     {
-        aMtrFldDrawY.SetValue( aMtrFldDrawX.GetValue() );
+        if(pField == &aMtrFldDrawX)
+            aMtrFldDrawY.SetValue( aMtrFldDrawX.GetValue() );
+        else
+            aMtrFldDrawX.SetValue( aMtrFldDrawY.GetValue() );
     }
     return 0;
 }
@@ -419,56 +430,18 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, p )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SvxGridTabPage, ChangeDrawYHdl_Impl, void *, EMPTYARG )
-{
-    bAttrModified = TRUE;
-    if( aCbxSynchronize.IsChecked() )
-    {
-        aMtrFldDrawX.SetValue( aMtrFldDrawY.GetValue() );
-    }
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SvxGridTabPage, ChangeDivisionXHdl_Impl, void *, EMPTYARG )
-{
-    bAttrModified = TRUE;
-    if( aCbxSynchronize.IsChecked() )
-    {
-        aMtrFldDivisionY.SetValue( aMtrFldDivisionX.GetValue() );
-    }
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SvxGridTabPage, ChangeDivisionYHdl_Impl, void *, EMPTYARG )
+IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 {
     bAttrModified = TRUE;
     if( aCbxSynchronize.IsChecked() )
     {
-        aMtrFldDivisionX.SetValue( aMtrFldDivisionY.GetValue() );
+        if(&aNumFldDivisionX == pField)
+            aNumFldDivisionY.SetValue( aNumFldDivisionX.GetValue() );
+        else
+            aNumFldDivisionX.SetValue( aNumFldDivisionY.GetValue() );
     }
     return 0;
 }
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SvxGridTabPage, ChangeSnapXHdl_Impl, void *, EMPTYARG )
-{
-    bAttrModified = TRUE;
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SvxGridTabPage, ChangeSnapYHdl_Impl, void *, EMPTYARG )
-{
-    bAttrModified = TRUE;
-    return 0;
-}
-
 //------------------------------------------------------------------------
 
 IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, p )
diff --git a/svx/source/options/optgrid.hrc b/svx/source/options/optgrid.hrc
index 38e97cb393a0..6b2501527877 100644
--- a/svx/source/options/optgrid.hrc
+++ b/svx/source/options/optgrid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-05-04 07:15:48 $
+ *  last change: $Author: os $ $Date: 2002-02-01 11:14:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,41 +62,44 @@
 #define _SVX_OPTGRID_HRC
 
 //Grid-Page
-#define MTR_FLD_GRID 1
-#define GRP_DRAWGRID 1
-#define GRP_SNAPGRID 2
-#define CBX_USE_GRIDSNAP 1
-#define CBX_SYNCHRONIZE 2
-#define CBX_EQUAL_GRID 3
-#define CBX_SNAPGRID 4
-#define CBX_GRID_VISIBLE 6
-#define MTR_FLD_DRAW_Y 1
-#define MTR_FLD_SNAP_X 2
-#define MTR_FLD_SNAP_Y 3
-#define MTR_FLD_DRAW_X 8
-#define MTR_FLD_DIVISION_X 6
-#define MTR_FLD_DIVISION_Y 7
-#define FT_SNAP_X 1
-#define FT_SNAP_Y 2
-#define FT_DRAW_X 5
-#define FT_DRAW_Y 8
-#define FT_RESOLUTION 6
-#define FT_DIVISION 7
-
-#define CBX_SNAP_HELPLINES      10
-#define CBX_SNAP_BORDER         11
-#define CBX_SNAP_FRAME          12
-#define CBX_SNAP_POINTS         13
-#define FT_SNAP_AREA            14
-#define MTR_FLD_SNAP_AREA       15
-#define GRP_SNAP                16
-#define CBX_ORTHO               17
-#define CBX_BIGORTHO            18
-#define CBX_ROTATE              19
-#define MTR_FLD_ANGLE           20
-#define FT_BEZ_ANGLE            21
-#define MTR_FLD_BEZ_ANGLE       22
-#define GRP_ORTHO               23
-#define FL_SEPARATOR            24
+#define MTR_FLD_GRID             1
+#define GRP_DRAWGRID             2
+#define GRP_SNAPGRID             3
+#define CBX_USE_GRIDSNAP         4
+#define CBX_SYNCHRONIZE          5
+#define CBX_EQUAL_GRID           6
+#define CBX_SNAPGRID             7
+#define CBX_GRID_VISIBLE         8
+#define MTR_FLD_DRAW_Y           9
+#define MTR_FLD_SNAP_X          10
+#define MTR_FLD_SNAP_Y          11
+#define MTR_FLD_DRAW_X          12
+#define NUM_FLD_DIVISION_X      13
+#define NUM_FLD_DIVISION_Y      14
+#define FT_SNAP_X               15
+#define FT_SNAP_Y               16
+#define FT_DRAW_X               17
+#define FT_DRAW_Y               18
+#define FL_RESOLUTION           19
+#define FL_DIVISION             20
+#define FT_VERT_POINTS          21
+#define FT_HORZ_POINTS          22
+#define FT_DIVISION_Y           23
+#define FT_DIVISION_X           24
+#define CBX_SNAP_HELPLINES      25
+#define CBX_SNAP_BORDER         26
+#define CBX_SNAP_FRAME          27
+#define CBX_SNAP_POINTS         28
+#define FT_SNAP_AREA            29
+#define MTR_FLD_SNAP_AREA       30
+#define GRP_SNAP                31
+#define CBX_ORTHO               32
+#define CBX_BIGORTHO            33
+#define CBX_ROTATE              34
+#define MTR_FLD_ANGLE           35
+#define FT_BEZ_ANGLE            36
+#define MTR_FLD_BEZ_ANGLE       37
+#define GRP_ORTHO               38
+#define FL_SEPARATOR            39
 
 #endif
diff --git a/svx/source/options/optgrid.src b/svx/source/options/optgrid.src
index 2ad61183ae63..cac0e1750761 100644
--- a/svx/source/options/optgrid.src
+++ b/svx/source/options/optgrid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.src,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: pb $ $Date: 2001-12-18 11:39:41 $
+ *  last change: $Author: os $ $Date: 2002-02-01 11:14:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,7 +109,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ ENGLISH ] = "Snap to ~Grid" ;
         Text [ NORWEGIAN ] = "Snap to ~Grid" ;
         Text [ DANISH ] = "Fastg�r til gitter" ;
-        Text [ ENGLISH_US ] = "Sn~ap to grid" ;
+        Text [ ENGLISH_US ] = "Snap to ~grid" ;
         Text [ SPANISH ] = "~Usar cuadr�cula de captura" ;
         Text [ FINNISH ] = "~Kohdista ruudukkoon" ;
         Text [ FRENCH ] = "Utiliser la ~grille de capture" ;
@@ -160,16 +160,15 @@ TabPage RID_SVXPAGE_GRID
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cuadr�cula visible";
     };
-    FixedText FT_RESOLUTION
+    FixedLine FL_RESOLUTION
     {
-        Pos = MAP_APPFONT ( 89 , 41 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Center = TRUE;
-        Text = "Aufl~�sung" ;
-        Text [ ENGLISH ] = "~Resolution" ;
+        Pos = MAP_APPFONT ( 6 , 45 ) ;
+        Size = MAP_APPFONT ( 120 , 8 ) ;
+        Text = "Aufl�sung" ;
+        Text [ ENGLISH ] = "Resolution" ;
         Text [ NORWEGIAN ] = "~Resolution" ;
         Text [ DANISH ] = "Opl�sning" ;
-        Text [ ENGLISH_US ] = "~Resolution" ;
+        Text [ ENGLISH_US ] = "Resolution" ;
         Text [ SPANISH ] = "R~esoluci�n" ;
         Text [ FINNISH ] = "~Tarkkuus" ;
         Text [ FRENCH ] = "~R�solution" ;
@@ -190,40 +189,10 @@ TabPage RID_SVXPAGE_GRID
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "R~esoluci�n";
     };
-    FixedText FT_DIVISION
-    {
-        Pos = MAP_APPFONT ( 171 , 41 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Center = TRUE;
-        Text = "~Unterteilung" ;
-        Text [ ENGLISH ] = "~Division" ;
-        Text [ NORWEGIAN ] = "~Division" ;
-        Text [ DANISH ] = "Inddeling" ;
-        Text [ ENGLISH_US ] = "S~ubdivision" ;
-        Text [ SPANISH ] = "S~ubdivisi�n" ;
-        Text [ FINNISH ] = "~Alaosasto" ;
-        Text [ FRENCH ] = "~Finesse" ;
-        Text [ ITALIAN ] = "Suddivisione" ;
-        Text [ DUTCH ] = "~Onderverdeling" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "~Divis?o" ;
-        Text [ SWEDISH ] = "Indelning" ;
-        Text [ PORTUGUESE ] = "~Subdivis�o" ;
-        Text[ chinese_simplified ] = "线点间隔(~U)";
-        Text[ russian ] = "����������";
-        Text[ polish ] = "Podzia�";
-        Text[ japanese ] = "点の間隔(~U)";
-        Text[ chinese_traditional ] = "線點間隔(~U)";
-        Text[ arabic ] = "������� ������";
-        Text[ greek ] = "~�����������";
-        Text[ korean ] = "세분화(~U)";
-        Text[ turkish ] = "B�l�mleme";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "S~ubdivisi�n";
-    };
     FixedText FT_DRAW_X
     {
         Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 49 , 10 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "H~orizontal" ;
         Text [ ENGLISH ] = "Horizontal" ;
         Text[ english_us ] = "H~orizontal";
@@ -251,7 +220,7 @@ TabPage RID_SVXPAGE_GRID
     FixedText FT_DRAW_Y
     {
         Pos = MAP_APPFONT ( 12 , 71 ) ;
-        Size = MAP_APPFONT ( 49 , 10 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~Vertikal" ;
         Text [ ENGLISH ] = "Vertical" ;
         Text[ english_us ] = "~Vertical";
@@ -279,7 +248,7 @@ TabPage RID_SVXPAGE_GRID
     MetricField MTR_FLD_DRAW_X
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 89 , 54 ) ;
+        Pos = MAP_APPFONT ( 75 , 54 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -296,7 +265,7 @@ TabPage RID_SVXPAGE_GRID
     MetricField MTR_FLD_DRAW_Y
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 89 , 69 ) ;
+        Pos = MAP_APPFONT ( 75 , 69 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -310,85 +279,155 @@ TabPage RID_SVXPAGE_GRID
         Unit = FUNIT_MM ;
         SpinSize = 50 ;
     };
-    MetricField MTR_FLD_DIVISION_X
+    FixedLine FL_DIVISION
+    {
+        Pos = MAP_APPFONT ( 130 , 45 ) ;
+        Size = MAP_APPFONT ( 124 , 8 ) ;
+        Text = "Unterteilung" ;
+        Text [ ENGLISH ] = "Division" ;
+        Text [ NORWEGIAN ] = "~Division" ;
+        Text [ DANISH ] = "Inddeling" ;
+        Text [ ENGLISH_US ] = "Subdivision" ;
+        Text [ SPANISH ] = "S~ubdivisi�n" ;
+        Text [ FINNISH ] = "~Alaosasto" ;
+        Text [ FRENCH ] = "~Finesse" ;
+        Text [ ITALIAN ] = "Suddivisione" ;
+        Text [ DUTCH ] = "~Onderverdeling" ;
+        Text [ PORTUGUESE_BRAZILIAN ] = "~Divis?o" ;
+        Text [ SWEDISH ] = "Indelning" ;
+        Text [ PORTUGUESE ] = "~Subdivis�o" ;
+        Text[ chinese_simplified ] = "线点间隔(~U)";
+        Text[ russian ] = "����������";
+        Text[ polish ] = "Podzia�";
+        Text[ japanese ] = "点の間隔(~U)";
+        Text[ chinese_traditional ] = "線點間隔(~U)";
+        Text[ arabic ] = "������� ������";
+        Text[ greek ] = "~�����������";
+        Text[ korean ] = "세분화(~U)";
+        Text[ turkish ] = "B�l�mleme";
+        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "S~ubdivisi�n";
+    };
+    FixedText FT_DIVISION_X
+    {
+        Pos = MAP_APPFONT ( 136 , 56 ) ;
+        Size = MAP_APPFONT ( 50 , 8 ) ;
+        Text = "Ho~rizontal" ;
+        Text [ ENGLISH ] = "Horizontal" ;
+        Text[ english_us ] = "Horizont~al";
+        Text[ portuguese ] = "~Horizontal";
+        Text[ russian ] = "�������������";
+        Text[ greek ] = "���������";
+        Text[ dutch ] = "H~orizontaal";
+        Text[ french ] = "H~orizontal";
+        Text[ spanish ] = "~Horizontal";
+        Text[ italian ] = "~Orizzontale";
+        Text[ danish ] = "X-akse";
+        Text[ swedish ] = "H~orisontellt";
+        Text[ polish ] = "Poziomo";
+        Text[ portuguese_brazilian ] = "~Eixo X";
+        Text[ japanese ] = "横に(~O)";
+        Text[ korean ] = "수평(~O)";
+        Text[ chinese_simplified ] = "水平方向(~O)";
+        Text[ chinese_traditional ] = "水平方向(~O)";
+        Text[ turkish ] = "X ekseni";
+        Text[ arabic ] = "����";
+        Text[ finnish ] = "~Vaakataso";
+        Text[ catalan ] = "Eje ~X";
+        Text[ language_user1 ] = " ";
+    };
+    FixedText FT_DIVISION_Y
+    {
+        Pos = MAP_APPFONT ( 136 , 71 ) ;
+        Size = MAP_APPFONT ( 50 , 8 ) ;
+        Text = "V~ertikal" ;
+        Text [ ENGLISH ] = "Vertical" ;
+        Text[ english_us ] = "V~ertical";
+        Text[ portuguese ] = "~Vertical";
+        Text[ russian ] = "�����������";
+        Text[ greek ] = "�������~���";
+        Text[ dutch ] = "~Verticaal";
+        Text[ french ] = "~Vertical";
+        Text[ spanish ] = "~Vertical";
+        Text[ italian ] = "~Verticale";
+        Text[ danish ] = "Y-akse";
+        Text[ swedish ] = "~Vertikalt";
+        Text[ polish ] = "~Pionowo";
+        Text[ portuguese_brazilian ] = "~Eixo Y";
+        Text[ japanese ] = "縦に(~V)";
+        Text[ korean ] = "수직(~V)";
+        Text[ chinese_simplified ] = "垂直方向(~V)";
+        Text[ chinese_traditional ] = "垂直方向(~V)";
+        Text[ turkish ] = "Y ekseni";
+        Text[ arabic ] = "~����";
+        Text[ finnish ] = "~Pystytaso";
+        Text[ catalan ] = "Eje ~Y";
+        Text[ language_user1 ] = " ";
+    };
+    NumericField NUM_FLD_DIVISION_X
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 171 , 54 ) ;
-        Size = MAP_APPFONT ( 45 , 12 ) ;
+        Pos = MAP_APPFONT ( 199 , 54 ) ;
+        Size = MAP_APPFONT ( 25 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " Punkte" ;
-        CustomUnitText [ ENGLISH ] = " Points" ;
-        CustomUnitText [ NORWEGIAN ] = " Punkter" ;
-        CustomUnitText [ DANISH ] = "punkter" ;
-        CustomUnitText [ ENGLISH_US ] = " points" ;
-        CustomUnitText [ SPANISH ] = "Puntos" ;
-        CustomUnitText [ FINNISH ] = " pisteet" ;
-        CustomUnitText [ FRENCH ] = " Points" ;
-        CustomUnitText [ ITALIAN ] = "Punti" ;
-        CustomUnitText [ DUTCH ] = "Punten" ;
-        CustomUnitText [ PORTUGUESE_BRAZILIAN ] = "Pontos" ;
-        CustomUnitText [ SWEDISH ] = " punkter" ;
-        CustomUnitText [ PORTUGUESE ] = "Pontos" ;
         SpinSize = 1 ;
-        CustomUnitText[ chinese_simplified ] = " 接点";
-        CustomUnitText[ russian ] = "������";
-        CustomUnitText[ polish ] = "Punkty";
-        CustomUnitText[ japanese ] = "ポイント";
-        CustomUnitText[ chinese_traditional ] = " 接點";
-        CustomUnitText[ arabic ] = "����/����";
-        CustomUnitText[ greek ] = "������";
-        CustomUnitText[ korean ] = "점";
-        CustomUnitText[ turkish ] = "Nokta";
-        CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "Puntos";
     };
-    MetricField MTR_FLD_DIVISION_Y
+    FixedText FT_HORZ_POINTS
+    {
+        Pos = MAP_APPFONT ( 227 , 56 ) ;
+        Size = MAP_APPFONT ( 20 , 8 ) ;
+        Text = "Punkte" ;
+        Text [ ENGLISH ] = "Points" ;
+        Text [ NORWEGIAN ] = "Punkter" ;
+        Text [ DANISH ] = "punkter" ;
+        Text [ ENGLISH_US ] = "points" ;
+        Text [ SPANISH ] = "Puntos" ;
+        Text [ FINNISH ] = "pisteet" ;
+        Text [ FRENCH ] = "Points" ;
+        Text [ ITALIAN ] = "Punti" ;
+        Text [ DUTCH ] = "Punten" ;
+        Text [ PORTUGUESE_BRAZILIAN ] = "Pontos" ;
+        Text [ SWEDISH ] = "punkter" ;
+        Text [ PORTUGUESE ] = "Pontos" ;
+        Text[ chinese_simplified ] = " 接点";
+        Text[ russian ] = "������";
+        Text[ polish ] = "Punkty";
+        Text[ japanese ] = "ポイント";
+        Text[ chinese_traditional ] = " 接點";
+        Text[ arabic ] = "����/����";
+        Text[ greek ] = "������";
+        Text[ korean ] = "점";
+        Text[ turkish ] = "Nokta";
+        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Puntos";
+    };
+    NumericField NUM_FLD_DIVISION_Y
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 171 , 69 ) ;
-        Size = MAP_APPFONT ( 45 , 12 ) ;
+        Pos = MAP_APPFONT ( 199 , 69 ) ;
+        Size = MAP_APPFONT ( 25 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = " Punkte" ;
-        CustomUnitText [ ENGLISH ] = " Points" ;
-        CustomUnitText [ NORWEGIAN ] = " Punkter" ;
-        CustomUnitText [ DANISH ] = "punkter" ;
-        CustomUnitText [ ENGLISH_US ] = " points" ;
-        CustomUnitText [ SPANISH ] = "Puntos" ;
-        CustomUnitText [ FINNISH ] = " pisteet" ;
-        CustomUnitText [ FRENCH ] = " Points" ;
-        CustomUnitText [ ITALIAN ] = "Punti" ;
-        CustomUnitText [ DUTCH ] = "Punten" ;
-        CustomUnitText [ PORTUGUESE_BRAZILIAN ] = "Pontos" ;
-        CustomUnitText [ SWEDISH ] = " punkter" ;
-        CustomUnitText [ PORTUGUESE ] = "Pontos" ;
         SpinSize = 1 ;
-        CustomUnitText[ chinese_simplified ] = " 接点";
-        CustomUnitText[ russian ] = "������";
-        CustomUnitText[ polish ] = "Punkty";
-        CustomUnitText[ japanese ] = "ポイント";
-        CustomUnitText[ chinese_traditional ] = " 接點";
-        CustomUnitText[ arabic ] = "����/����";
-        CustomUnitText[ greek ] = "������";
-        CustomUnitText[ korean ] = "점";
-        CustomUnitText[ turkish ] = "Nokta";
-        CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "Puntos";
+    };
+    FixedText FT_VERT_POINTS
+    {
+        Pos = MAP_APPFONT ( 227 , 71 ) ;
+        Size = MAP_APPFONT ( 20 , 8 ) ;
+
     };
     CheckBox CBX_SYNCHRONIZE
     {
-        Pos = MAP_APPFONT ( 89 , 84 ) ;
+        Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 127 , 10 ) ;
         TabStop = TRUE ;
         Text = "Achsen ~synchronisieren" ;