options dialog changes

4 files changed, 52 insertions, 125 deletions

diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index 381f0b5411f7..4539c8b846c7 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-03-16 12:37:33 $
+ *  last change: $Author: os $ $Date: 2001-03-22 09:46:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,7 +162,6 @@ public:
 private:
     CheckBox            aCbxUseGridsnap;
     CheckBox            aCbxGridVisible;
-    FixedLine            aGrpOptions; // Neu
 
     FixedText           aFtResolution;
     FixedText           aFtDrawX;
@@ -173,7 +172,7 @@ private:
     MetricField         aMtrFldDivisionX;
     MetricField         aMtrFldDivisionY;
     CheckBox            aCbxSynchronize;
-    FixedLine            aGrpDrawGrid; // Neu
+    FixedLine           aGrpDrawGrid; // Neu
 
     BOOL                bAttrModified;
     BOOL                bEqualGrid; // Neu
diff --git a/svx/source/options/optgrid.cxx b/svx/source/options/optgrid.cxx
index 13c29bb9ae1e..024e7408318c 100644
--- a/svx/source/options/optgrid.cxx
+++ b/svx/source/options/optgrid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-02-08 16:47:32 $
+ *  last change: $Author: os $ $Date: 2001-03-22 09:47:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -223,7 +223,6 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     aCbxUseGridsnap ( this, ResId( CBX_USE_GRIDSNAP ) ),
     aCbxSynchronize ( this, ResId( CBX_SYNCHRONIZE ) ),
     aCbxGridVisible ( this, ResId( CBX_GRID_VISIBLE ) ),
-    aGrpOptions     ( this, ResId( GRP_OPTIONS ) ),
     bAttrModified( FALSE )
 {
     // diese Page braucht ExchangeSupport
diff --git a/svx/source/options/optgrid.hrc b/svx/source/options/optgrid.hrc
index 8c6d9e703c47..1a97f6445032 100644
--- a/svx/source/options/optgrid.hrc
+++ b/svx/source/options/optgrid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:22 $
+ *  last change: $Author: os $ $Date: 2001-03-22 09:47:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,6 @@
 //Grid-Page
 #define MTR_FLD_GRID 1
 #define GRP_DRAWGRID 1
-#define GRP_OPTIONS 3
 #define GRP_SNAPGRID 2
 #define CBX_USE_GRIDSNAP 1
 #define CBX_SYNCHRONIZE 2
diff --git a/svx/source/options/optgrid.src b/svx/source/options/optgrid.src
index 770b00c61fc9..6e75eb467e02 100644
--- a/svx/source/options/optgrid.src
+++ b/svx/source/options/optgrid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: os $ $Date: 2001-03-16 12:45:29 $
+ *  last change: $Author: os $ $Date: 2001-03-22 09:47:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,34 @@ TabPage RID_SVXPAGE_GRID
     SVLook = TRUE ;
     Hide = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
+    FixedLine GRP_DRAWGRID
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Raster" ;
+        Text [ ENGLISH ] = "Drawgrid" ;
+        Text [ NORWEGIAN ] = "Drawgrid" ;
+        Text [ DANISH ] = "Gitter" ;
+        Text [ ENGLISH_US ] = "Grid" ;
+        Text [ SPANISH ] = "Cuadr�cula" ;
+        Text [ FINNISH ] = "Piirtoruudukko" ;
+        Text [ FRENCH ] = "Grille" ;
+        Text [ ITALIAN ] = "Griglia" ;
+        Text [ DUTCH ] = "Raster" ;
+        Text [ PORTUGUESE_BRAZILIAN ] = "Grade de desenho" ;
+        Text [ SWEDISH ] = "Raster" ;
+        Text [ PORTUGUESE ] = "Grelha" ;
+        Text[ chinese_simplified ] = "����";
+        Text[ russian ] = "�����";
+        Text[ polish ] = "Raster";
+        Text[ japanese ] = "��د��";
+        Text[ chinese_traditional ] = "����";
+        Text[ arabic ] = "������";
+        Text[ greek ] = "������";
+        Text[ korean ] = "����";
+        Text[ turkish ] = "K�lavuz �izgiler";
+        Text[ language_user1 ] = " ";
+    };
     CheckBox CBX_USE_GRIDSNAP
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
@@ -102,7 +130,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_GRID_VISIBLE
     {
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
+        Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
         TabStop = TRUE ;
         Text = "Ras~ter sichtbar" ;
@@ -129,37 +157,9 @@ TabPage RID_SVXPAGE_GRID
         Text[ turkish ] = "K�lavuz �izgileri g�ster";
         Text[ language_user1 ] = " ";
     };
-    FixedLine GRP_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text = "Optionen" ;
-        Text [ ENGLISH ] = "Options" ;
-        Text [ NORWEGIAN ] = "Options" ;
-        Text [ DANISH ] = "Indstillinger" ;
-        Text [ ENGLISH_US ] = "Options" ;
-        Text [ SPANISH ] = "Opciones" ;
-        Text [ FINNISH ] = "M��ritykset" ;
-        Text [ FRENCH ] = "Options" ;
-        Text [ ITALIAN ] = "Opzioni" ;
-        Text [ DUTCH ] = "Opties" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "Op��es" ;
-        Text [ SWEDISH ] = "Alternativ" ;
-        Text [ PORTUGUESE ] = "Op��es" ;
-        Text[ chinese_simplified ] = "ѡ��";
-        Text[ russian ] = "���������";
-        Text[ polish ] = "Opcje";
-        Text[ japanese ] = "��߼��";
-        Text[ chinese_traditional ] = "�ﶵ";
-        Text[ arabic ] = "��������";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "�ɼ�";
-        Text[ turkish ] = "Se�enekler";
-        Text[ language_user1 ] = " ";
-    };
     FixedText FT_RESOLUTION
     {
-        Pos = MAP_APPFONT ( 89 , 55 ) ;
+        Pos = MAP_APPFONT ( 89 , 41 ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Center = TRUE;
         Text = "Aufl~�sung" ;
@@ -188,7 +188,7 @@ TabPage RID_SVXPAGE_GRID
     };
     FixedText FT_DIVISION
     {
-        Pos = MAP_APPFONT ( 171 , 55 ) ;
+        Pos = MAP_APPFONT ( 171 , 41 ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Center = TRUE;
         Text = "~Unterteilung" ;
@@ -217,64 +217,22 @@ TabPage RID_SVXPAGE_GRID
     };
     FixedText FT_DRAW_X
     {
-        Pos = MAP_APPFONT ( 12 , 70 ) ;
+        Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
-        Text = "~X-Achse" ;
-        Text [ ENGLISH ] = "~X-Axis" ;
-        Text [ NORWEGIAN ] = "~X-Axis" ;
-        Text [ DANISH ] = "X-akse" ;
-        Text [ ENGLISH_US ] = "~X axis" ;
-        Text [ SPANISH ] = "Eje ~X" ;
-        Text [ FINNISH ] = "~X-akseli" ;
-        Text [ FRENCH ] = "Axe ~X" ;
-        Text [ ITALIAN ] = "Asse ~X" ;
-        Text [ DUTCH ] = "~X-as" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "~Eixo X" ;
-        Text [ SWEDISH ] = "~X-axel" ;
-        Text [ PORTUGUESE ] = "~Eixo X" ;
-        Text[ chinese_simplified ] = "~X ��";
-        Text[ russian ] = "��� X";
-        Text[ polish ] = "O� X";
-        Text[ japanese ] = "~X��";
-        Text[ chinese_traditional ] = "~X-�b";
-        Text[ arabic ] = "������ �";
-        Text[ greek ] = "������ X";
-        Text[ korean ] = "X ��(~X)";
-        Text[ turkish ] = "X ekseni";
-        Text[ language_user1 ] = " ";
+        Text = "H~orizontal" ;
+        Text [ ENGLISH ] = "Horizontal" ;
     };
     FixedText FT_DRAW_Y
     {
-        Pos = MAP_APPFONT ( 12 , 85 ) ;
+        Pos = MAP_APPFONT ( 12 , 71 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
-        Text = "~Y-Achse" ;
-        Text [ ENGLISH ] = "~Y-Axis" ;
-        Text [ NORWEGIAN ] = "~Y-Axis" ;
-        Text [ DANISH ] = "Y-akse" ;
-        Text [ ENGLISH_US ] = "~Y axis" ;
-        Text [ SPANISH ] = "Eje ~Y" ;
-        Text [ FINNISH ] = "~Y-akseli" ;
-        Text [ FRENCH ] = "Axe ~Y" ;
-        Text [ ITALIAN ] = "Asse ~Y" ;
-        Text [ DUTCH ] = "~Y-as" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "~Eixo Y" ;
-        Text [ SWEDISH ] = "~Y-axel" ;
-        Text [ PORTUGUESE ] = "~Eixo Y" ;
-        Text[ chinese_simplified ] = "~Y ��";
-        Text[ russian ] = "��� Y";
-        Text[ polish ] = "O� Y";
-        Text[ japanese ] = "~Y��";
-        Text[ chinese_traditional ] = "~Y-�b";
-        Text[ arabic ] = "������ �";
-        Text[ greek ] = "������ ~�";
-        Text[ korean ] = "Y ��(~Y)";
-        Text[ turkish ] = "Y ekseni";
-        Text[ language_user1 ] = " ";
+        Text = "~Vertikal" ;
+        Text [ ENGLISH ] = "Vertical" ;
     };
     MetricField MTR_FLD_DRAW_X
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 89 , 68 ) ;
+        Pos = MAP_APPFONT ( 89 , 54 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -291,7 +249,7 @@ TabPage RID_SVXPAGE_GRID
     MetricField MTR_FLD_DRAW_Y
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 89 , 83 ) ;
+        Pos = MAP_APPFONT ( 89 , 69 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -308,7 +266,7 @@ TabPage RID_SVXPAGE_GRID
     MetricField MTR_FLD_DIVISION_X
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 171 , 68 ) ;
+        Pos = MAP_APPFONT ( 171 , 54 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -345,7 +303,7 @@ TabPage RID_SVXPAGE_GRID
     MetricField MTR_FLD_DIVISION_Y
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 171 , 83 ) ;
+        Pos = MAP_APPFONT ( 171 , 69 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -381,11 +339,11 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_SYNCHRONIZE
     {
-        Pos = MAP_APPFONT ( 12 , 98 ) ;
+        Pos = MAP_APPFONT ( 89 , 84 ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
         TabStop = TRUE ;
         Text = "Achsen ~synchronisieren" ;
-        Text [ ENGLISH ] = "~Synchronize axis" ;
+        Text [ ENGLISH ] = "~Synchronize axes" ;
         Text [ NORWEGIAN ] = "~Synchronize axis" ;
         Text [ DANISH ] = "Synkroniser akser" ;
         Text [ ENGLISH_US ] = "Sy~nchronize axes" ;
@@ -408,32 +366,4 @@ TabPage RID_SVXPAGE_GRID
         Text[ turkish ] = "Eksenleri e�itle";
         Text[ language_user1 ] = " ";
     };
-    FixedLine GRP_DRAWGRID
-    {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text = "Raster" ;
-        Text [ ENGLISH ] = "Drawgrid" ;
-        Text [ NORWEGIAN ] = "Drawgrid" ;
-        Text [ DANISH ] = "Gitter" ;
-        Text [ ENGLISH_US ] = "Grid" ;
-        Text [ SPANISH ] = "Cuadr�cula" ;
-        Text [ FINNISH ] = "Piirtoruudukko" ;
-        Text [ FRENCH ] = "Grille" ;
-        Text [ ITALIAN ] = "Griglia" ;
-        Text [ DUTCH ] = "Raster" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "Grade de desenho" ;
-        Text [ SWEDISH ] = "Raster" ;
-        Text [ PORTUGUESE ] = "Grelha" ;
-        Text[ chinese_simplified ] = "����";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Raster";
-        Text[ japanese ] = "��د��";
-        Text[ chinese_traditional ] = "����";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "������";
-        Text[ korean ] = "����";
-        Text[ turkish ] = "K�lavuz �izgiler";
-        Text[ language_user1 ] = " ";
-    };
 };