vertical separators inserted

4 files changed, 89 insertions, 100 deletions

diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 58b8208e59c0..f6d8f1d1ce0a 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optdlg.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-04-09 09:46:33 $
+ *  last change: $Author: os $ $Date: 2001-05-04 11:20:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -157,6 +157,8 @@
 #define CB_BLACK_FONT      87
 #define LB_HMETRIC         88
 #define LB_VMETRIC         89
+#define FL_SEP_PRT_LEFT     90
+#define FL_SEP_PRT_RIGHT    91
 
 // Tabpage Grundschriften
 #define FT_STANDARD         90
@@ -211,6 +213,7 @@
 #define LB_KEYWD                    136
 #define FT_UNKNOWN                  137
 #define LB_UNKNOWN                  138
+#define FL_TABLE_SEPARATOR          139
 
 #define GB_SHDWCRSFLAG                 1
 #define CB_SHDWCRSONOFF                2
@@ -225,4 +228,5 @@
 #define LB_SHDWCRSCOLOR               11
 #define CB_ALLOW_IN_PROT              12
 #define GB_CRSR_OPT                   13
+#define FL_SEPARATOR_SHDW               14
 
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index ef404ab76edd..60e36c10a62b 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optdlg.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2001-04-26 20:05:11 $
+ *  last change: $Author: os $ $Date: 2001-05-04 11:21:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1009,6 +1009,11 @@ TabPage TP_OPTPRINT_PAGE
         Text[ turkish ] = "Siyah/beyaz yazd�r";
         Text[ language_user1 ] = " ";
     };
+    FixedLine FL_SEP_PRT_LEFT
+    {
+        Pos = MAP_APPFONT ( 85 , 10 ) ;
+        Size = MAP_APPFONT ( 4 , 82 ) ;
+    };
     FixedLine GRP_2
     {
         Pos = MAP_APPFONT ( 90 , 3 ) ;
@@ -1264,6 +1269,11 @@ TabPage TP_OPTPRINT_PAGE
         Text[ turkish ] = "~Sayfa sonu";
         Text[ language_user1 ] = " ";
     };
+    FixedLine FL_SEP_PRT_RIGHT
+    {
+        Pos = MAP_APPFONT ( 169 , 10 ) ;
+        Size = MAP_APPFONT ( 4 , 82 ) ;
+    };
     FixedLine GRP_3
     {
         Pos = MAP_APPFONT ( 174 , 3 ) ;
@@ -1409,7 +1419,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     String ST_NONE
     {
-        Text = "<Keiner>" ;
+        Text = "<Keins>" ;
         Text[English] = "<None>" ;
         Text[ english_us ] = "<None>";
         Text[ portuguese ] = "<Nenhum(a)>";
@@ -1848,6 +1858,11 @@ TabPage TP_OPTTABLE_PAGE
         Text[ language_user1 ] = " ";
         Text[ turkish ] = "Kenarl�k";
     };
+    FixedLine FL_TABLE_SEPARATOR
+    {
+        Pos = MAP_APPFONT ( 126 , 10 ) ;
+        Size = MAP_APPFONT ( 4 , 56 ) ;
+    };
     FixedLine GB_TABLE_INSERT
     {
         Pos = MAP_APPFONT ( 130 , 3 ) ;
@@ -1984,26 +1999,9 @@ TabPage TP_OPTTABLE_PAGE
     {
         Pos = MAP_APPFONT ( 12 , 80) ;
         Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text = "Umschalt- und Pfeiltaste gedr�ckt" ;
-        Text [ English ] = "Shift and arrow key pressed" ;
+        Text = "Alt- und Pfeiltaste gedr�ckt" ;
+        Text [ English ] = "Alt and arrow key pressed" ;
         Text[ english_us ] = "Alt and arrow key pressed";
-        Text[ portuguese ] = "Shift and arrow key pressed";
-        Text[ russian ] = "������� ������� (Shift) � �� ��������";
-        Text[ greek ] = "�� �������� �� ������� \"Shift\" ��� \"�����\"";
-        Text[ dutch ] = "Shift- en pijltoets ingedrukt";
-        Text[ french ] = "Touches Maj. et Fl�che enfonc�es";
-        Text[ spanish ] = "Teclas May�s y Flecha pulsadas";
-        Text[ italian ] = "Tasto (Ctrl) e (freccia) premuti";
-        Text[ danish ] = "Shift and arrow key pressed";
-        Text[ swedish ] = "Skift- och piltangent nertryckta";
-        Text[ polish ] = "Naci�nij klawisz 'Shift' i klawisz ze strza�k�";
-        Text[ portuguese_brazilian ] = "Shift and arrow key pressed";
-        Text[ japanese ] = "Shift���Ɩ�󷰂�����";
-        Text[ korean ] = "Shift and arrow key pressed";
-        Text[ chinese_simplified ] = "ͬʱ��ס�ϵ����ͼ�ͷ��";
-        Text[ chinese_traditional ] = "�����W����M�b�Y��";
-        Text[ turkish ] = "Shift and arrow key pressed";
-        Text[ arabic ] = "Shift and arrow key pressed";
     };
     FixedText FT_ROWMOVE
     {
@@ -2449,7 +2447,7 @@ TabPage TP_OPTSRCVIEW
     ListBox LB_SGML
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 188 , 14 ) ;
+        Pos = MAP_APPFONT ( 120 , 14 ) ;
         Size = MAP_APPFONT ( 60 , 80 ) ;
         DropDown = TRUE ;
     };
@@ -2482,7 +2480,7 @@ TabPage TP_OPTSRCVIEW
     ListBox LB_COMMENT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 188 , 30 ) ;
+        Pos = MAP_APPFONT ( 120 , 30 ) ;
         Size = MAP_APPFONT ( 60 , 80 ) ;
         DropDown = TRUE ;
     };
@@ -2515,7 +2513,7 @@ TabPage TP_OPTSRCVIEW
     ListBox LB_KEYWD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT (188 , 46 ) ;
+        Pos = MAP_APPFONT (120 , 46 ) ;
         Size = MAP_APPFONT ( 60 , 80 ) ;
         DropDown = TRUE ;
     };
@@ -2548,7 +2546,7 @@ TabPage TP_OPTSRCVIEW
     ListBox LB_UNKNOWN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 188 , 62 ) ;
+        Pos = MAP_APPFONT ( 120 , 62 ) ;
         Size = MAP_APPFONT ( 60 , 80 ) ;
         DropDown = TRUE ;
     };
@@ -2568,31 +2566,10 @@ TabPage TP_OPTSHDWCRSR
     FixedLine GB_NOPRINT
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text = "Nicht druckbare Zeichen" ;
-        Text [ ENGLISH ] = "Unprintable Characters" ;
-        Text [ norwegian ] = "Unprintable Characters" ;
-        Text [ italian ] = "Caratteri non stampabili" ;
-        Text [ portuguese_brazilian ] = "Unprintable Characters" ;
-        Text [ portuguese ] = "Caracteres n�o imprim�veis" ;
-        Text [ finnish ] = "Unprintable Characters" ;
-        Text [ danish ] = "Tegn som ikke kan udskrives" ;
-        Text [ french ] = "Caract�res non imprimables" ;
-        Text [ swedish ] = "Tecken som inte kan skrivas ut" ;
-        Text [ dutch ] = "Niet-afdrukbare tekens" ;
-        Text [ spanish ] = "Caracteres no imprimibles" ;
-        Text [ english_us ] = "Nonprinting characters" ;
+        Size = MAP_APPFONT ( 118 , 8 ) ;
+        Text = "Anzeigen von" ;
+        Text [ ENGLISH ] = "Display of" ;
         Group = TRUE ;
-        Text[ chinese_simplified ] = "�޷���ӡ���ַ�";
-        Text[ russian ] = "������������ �������";
-        Text[ polish ] = "Znaki niedrukowalne";
-        Text[ japanese ] = "�������Ȃ�������L���̕\\���E��\\��";
-        Text[ chinese_traditional ] = "�����";
-        Text[ arabic ] = "���� �� �����";
-        Text[ greek ] = "�� ����������� ����������";
-        Text[ korean ] = "�ܶ���ȣǥ��";
-        Text[ turkish ] = "Yazd�r�lmayan karakterler";
-        Text[ language_user1 ] = " ";
     };
     CheckBox CB_PARA
     {
@@ -2818,6 +2795,11 @@ TabPage TP_OPTSHDWCRSR
         Text[ korean ] = "������ �ܶ�(~A)";
         Text[ turkish ] = "Gizili paragraflar";
     };
+    FixedLine FL_SEPARATOR_SHDW
+    {
+        Pos = MAP_APPFONT ( 125 , 10 ) ;
+        Size = MAP_APPFONT ( 4 , 97 ) ;
+    };
     FixedLine GB_SHDWCRSFLAG
     {
         Pos = MAP_APPFONT ( 130 , 3 ) ;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 3fd042835e5b..c9e7f2d2d39e 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optpage.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: os $ $Date: 2001-04-17 08:04:27 $
+ *  last change: $Author: os $ $Date: 2001-05-04 11:20:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -433,6 +433,8 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aBackgroundCB    (this, SW_RES(CB_BACKGROUND)),
     aBlackFontCB     (this, SW_RES(CB_BLACK_FONT)),
     aGroup1          (this, SW_RES(GRP_1)),
+    aSeparatorLFL    (this, SW_RES(FL_SEP_PRT_LEFT )),
+    aSeparatorRFL    (this, SW_RES(FL_SEP_PRT_RIGHT)),
     aLeftPageCB      (this, SW_RES(CB_LEFTP)),
     aRightPageCB     (this, SW_RES(CB_RIGHTP)),
     aReverseCB       (this, SW_RES(CB_REVERSE)),
@@ -453,7 +455,8 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
 {
     Init();
     FreeResource();
-
+    aSeparatorLFL.SetStyle( aSeparatorLFL.GetStyle() | WB_VERT );
+    aSeparatorRFL.SetStyle( aSeparatorRFL.GetStyle() | WB_VERT );
     Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
     aGrfCB.SetClickHdl( aLk );
     aRightPageCB.SetClickHdl( aLk );
@@ -948,6 +951,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet&
     aNumFormattingCB(this, ResId(CB_NUMFORMATTING   )),
     aNumFmtFormattingCB(this, ResId(CB_NUMFMT_FORMATTING    )),
     aNumAlignmentCB (this, ResId(CB_NUMALIGNMENT    )),
+    aSeparatorFL     (this, ResId(FL_TABLE_SEPARATOR)),
     aTableGB        (this, ResId(GB_TABLE           )),
     aTableInsertGB  (this, ResId(GB_TABLE_INSERT    )),
     aMoveGB(        this, ResId(GB_MOVE     )),
@@ -972,6 +976,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet&
     bHTMLMode(FALSE)
 {
     FreeResource();
+    aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT );
 
     Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
     aNumFormattingCB.SetClickHdl(aLnk);
@@ -1340,30 +1345,30 @@ void SwSourceViewOptionsTabPage::Reset( const SfxItemSet& rSet )
 SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
                                                     const SfxItemSet& rSet )
     : SfxTabPage(pParent, SW_RES(TP_OPTSHDWCRSR), rSet),
-    aFlagGB( this, SW_RES( GB_SHDWCRSFLAG )),
-    aOnOffCB( this, SW_RES( CB_SHDWCRSONOFF )),
-    aFillModeFT( this, SW_RES( FT_SHDWCRSFILLMODE )),
-    aFillMarginRB( this, SW_RES( RB_SHDWCRSFILLMARGIN )),
-    aFillIndentRB( this, SW_RES( RB_SHDWCRSFILLINDENT )),
-    aFillTabRB( this, SW_RES( RB_SHDWCRSFILLTAB )),
-    aFillSpaceRB( this, SW_RES( RB_SHDWCRSFILLSPACE )),
-    aColorFT( this, SW_RES( FT_SHDWCRSCOLOR )),
-    aColorLB( this, SW_RES( LB_SHDWCRSCOLOR )),
-    aCrsrOptGB   ( this, SW_RES( GB_CRSR_OPT)),
-    aCrsrInProtCB( this, SW_RES( CB_ALLOW_IN_PROT )),
-
-    aUnprintBox   ( this,   SW_RES( GB_NOPRINT  ) ),
-    aParaCB       ( this,   SW_RES( CB_PARA      ) ),
-    aSHyphCB      ( this,   SW_RES( CB_SHYPH        ) ),
-    aSpacesCB     ( this,   SW_RES( CB_SPACE    ) ),
-    aHSpacesCB    ( this,   SW_RES( CB_HSPACE   ) ),
-    aTabCB        ( this,   SW_RES( CB_TAB      ) ),
-    aBreakCB      ( this,   SW_RES( CB_BREAK        ) ),
-    aHiddenCB     ( this,   SW_RES( CB_HIDDEN   ) ),
-    aHiddenParaCB ( this,   SW_RES( CB_HIDDEN_PARA ) )
+    aFlagGB( this, ResId( GB_SHDWCRSFLAG )),
+    aOnOffCB( this, ResId( CB_SHDWCRSONOFF )),
+    aFillModeFT( this, ResId( FT_SHDWCRSFILLMODE )),
+    aFillMarginRB( this, ResId( RB_SHDWCRSFILLMARGIN )),
+    aFillIndentRB( this, ResId( RB_SHDWCRSFILLINDENT )),
+    aFillTabRB( this, ResId( RB_SHDWCRSFILLTAB )),
+    aFillSpaceRB( this, ResId( RB_SHDWCRSFILLSPACE )),
+    aColorFT( this, ResId( FT_SHDWCRSCOLOR )),
+    aColorLB( this, ResId( LB_SHDWCRSCOLOR )),
+    aCrsrOptGB   ( this, ResId( GB_CRSR_OPT)),
+    aCrsrInProtCB( this, ResId( CB_ALLOW_IN_PROT )),
+    aSeparatorFL(   this, ResId( FL_SEPARATOR_SHDW)),
+    aUnprintBox   ( this,   ResId( GB_NOPRINT  ) ),
+    aParaCB       ( this,   ResId( CB_PARA      ) ),
+    aSHyphCB      ( this,   ResId( CB_SHYPH        ) ),
+    aSpacesCB     ( this,   ResId( CB_SPACE    ) ),
+    aHSpacesCB    ( this,   ResId( CB_HSPACE   ) ),
+    aTabCB        ( this,   ResId( CB_TAB      ) ),
+    aBreakCB      ( this,   ResId( CB_BREAK        ) ),
+    aHiddenCB     ( this,   ResId( CB_HIDDEN   ) ),
+    aHiddenParaCB ( this,   ResId( CB_HIDDEN_PARA ) )
 {
     FreeResource();
-
+    aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT );
     const SfxPoolItem* pItem = 0;
     SwShadowCursorItem aOpt;
 
@@ -1414,6 +1419,12 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
         aColorLB        .Hide();
         aCrsrOptGB      .Hide();
         aCrsrInProtCB   .Hide();
+        aSeparatorFL.Hide();
+        long nWidth = aFlagGB.GetSizePixel().Width() + aFlagGB.GetPosPixel().X()
+                                                        - aUnprintBox.GetPosPixel().X();
+        Size aSize(aUnprintBox.GetSizePixel());
+        aSize.Width() = nWidth;
+        aUnprintBox.SetSizePixel(aSize);
     }
 }
 
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 267795e2cd3f..8997312de7e3 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optpage.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-04-09 09:46:34 $
+ *  last change: $Author: os $ $Date: 2001-05-04 11:20:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,24 +153,6 @@ public:
 
 };
 
-/*-----------------31.08.96 10.10-------------------
-
---------------------------------------------------*/
-/*
-class SwLayoutOptPage : public SfxTabPage
-{
-                        SwLayoutOptPage( Window* pParent,
-                                           const SfxItemSet& rSet );
-                        ~SwLayoutOptPage();
-public:
-    static SfxTabPage*  Create( Window* pParent,
-                                const SfxItemSet& rAttrSet);
-
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-
-};
-
 /*-------- OS 27.01.95 -----------------------------------
  TabPage Druckereinstellungen Zusaetze
 --------------------------------------------------------- */
@@ -178,18 +160,24 @@ public:
 
 class SwAddPrinterTabPage : public SfxTabPage
 {
+    FixedLine       aGroup1;
     CheckBox        aGrfCB;
     CheckBox        aTabCB;
     CheckBox        aDrawCB;
     CheckBox        aCtrlFldCB;
     CheckBox        aBackgroundCB;
     CheckBox        aBlackFontCB;
-    FixedLine        aGroup1;
+
+    FixedLine       aSeparatorLFL;
+
+    FixedLine       aGroup2;
     CheckBox        aLeftPageCB;
     CheckBox        aRightPageCB;
     CheckBox        aReverseCB;
     CheckBox        aProspectCB;
-    FixedLine        aGroup2;
+
+    FixedLine       aSeparatorRFL;
+
     RadioButton     aNoRB;
     RadioButton     aOnlyRB;
     RadioButton     aEndRB;
@@ -288,11 +276,13 @@ public:
 
 class SwTableOptionsTabPage : public SfxTabPage
 {
+    FixedLine   aTableGB;
     CheckBox    aHeaderCB;
     CheckBox    aRepeatHeaderCB;
     CheckBox    aDontSplitCB;
     CheckBox    aBorderCB;
-    FixedLine   aTableGB;
+
+    FixedLine   aSeparatorFL;
 
     FixedLine   aTableInsertGB;
     CheckBox    aNumFormattingCB;
@@ -388,6 +378,8 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
     CheckBox    aHiddenCB;
     CheckBox    aHiddenParaCB;
 
+    FixedLine   aSeparatorFL;
+
     FixedLine       aFlagGB;
     CheckBox        aOnOffCB;