Fix #86988#: Redesign of dialogs

3 files changed, 35 insertions, 38 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index d8458e5a156e..f1f8224a9a7a 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialog.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: tl $ $Date: 2001-05-02 16:58:48 $
+ *  last change: $Author: fme $ $Date: 2001-06-15 06:41:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,9 +76,6 @@
 #ifndef _SFXTABDLG_HXX //autogen
 #include <sfx2/tabdlg.hxx>
 #endif
-#ifndef _SV_GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
 #ifndef _SV_COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
 #endif
@@ -150,16 +147,16 @@ public:
 
 class SmPrintOptionsTabPage : public SfxTabPage
 {
-    FixedLine       aGroupBox1;
+    FixedLine       aFixedLine1;
     CheckBox        aTitle;
     CheckBox        aText;
     CheckBox        aFrame;
-    FixedLine       aGroupBox2;
+    FixedLine       aFixedLine2;
     RadioButton     aSizeNormal;
     RadioButton     aSizeScaled;
     RadioButton     aSizeZoomed;
     MetricField     aZoom;
-    FixedLine       aGroupBox3;
+    FixedLine       aFixedLine3;
     CheckBox        aNoRightSpaces;
 
     DECL_LINK(SizeButtonClickHdl, Button *);
@@ -197,8 +194,7 @@ class SmFontDialog : public ModalDialog
     OKButton        aOKButton1;
     CancelButton    aCancelButton1;
     SmShowFont      aShowFont;
-    GroupBox        aGroupBox1;
-    GroupBox        aGroupBox2;
+    FixedText       aFixedText2;
 
     Font    Face;
 
@@ -229,7 +225,7 @@ class SmFontSizeDialog : public ModalDialog
     MetricField     aOperatorSize;
     FixedText       aFixedText8;
     MetricField     aBorderSize;
-    GroupBox        aGroupBox1;
+    FixedLine       aFixedLine1;
     OKButton        aOKButton1;
     CancelButton    aCancelButton1;
     PushButton      aDefaultButton;
@@ -261,8 +257,8 @@ class SmFontTypeDialog : public ModalDialog
     SmFontPickListBox   aSansFont;
     FixedText           aFixedText7;
     SmFontPickListBox   aFixedFont;
-    GroupBox            aGroupBox1;
-    GroupBox            aGroupBox2;
+    FixedLine           aFixedLine1;
+    FixedLine           aFixedLine2;
     OKButton            aOKButton1;
     CancelButton        aCancelButton1;
     MenuButton          aMenuButton;
@@ -321,7 +317,7 @@ class SmDistanceDialog : public ModalDialog
     MenuButton      aMenuButton;
     PushButton      aDefaultButton;
     FixedBitmap     aBitmap;
-    GroupBox        aGroupBox;
+    FixedLine       aFixedLine;
 
     SmCategoryDesc *Categories[NOCATEGORIES];
     USHORT          nActiveCategory;
@@ -352,7 +348,7 @@ class SmAlignDialog : public ModalDialog
     RadioButton  aLeft;
     RadioButton  aCenter;
     RadioButton  aRight;
-    GroupBox     aGroupBox1;
+    FixedLine    aFixedLine1;
     OKButton     aOKButton1;
     CancelButton aCancelButton1;
     PushButton   aDefaultButton;
@@ -423,12 +419,11 @@ class SmSymbolDialog : public ModalDialog
     FixedText       aSymbolSetText;
     ListBox         aSymbolSets;
     SmShowSymbolSet aSymbolSetDisplay;
-    GroupBox        aGrpBox;
     FixedText       aSymbolName;
     SmShowSymbol    aSymbolDisplay;
+    PushButton      aGetBtn;
     PushButton      aCloseBtn;
     PushButton      aEditBtn;
-    PushButton      aGetBtn;
 
     SmSymSetManager    &rSymSetMgr;
     const SmSymSet     *pSymSet;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b5e38e52f476..ab2291fd145b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialog.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mtg $ $Date: 2001-05-16 11:54:28 $
+ *  last change: $Author: fme $ $Date: 2001-06-15 06:42:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -224,16 +224,16 @@ IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButt
 
 SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions)
     : SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions),
-    aGroupBox1      (this, ResId( GB_PRINTOPTIONS )),
+    aFixedLine1     (this, ResId( FL_PRINTOPTIONS )),
     aTitle          (this, ResId( CB_TITLEROW )),
     aText           (this, ResId( CB_EQUATION_TEXT )),
     aFrame          (this, ResId( CB_FRAME )),
-    aGroupBox2      (this, ResId( GB_PRINT_FORMAT )),
+    aFixedLine2     (this, ResId( FL_PRINT_FORMAT )),
     aSizeNormal     (this, ResId( RB_ORIGINAL_SIZE )),
     aSizeScaled     (this, ResId( RB_FIT_TO_PAGE )),
     aSizeZoomed     (this, ResId( RB_ZOOM )),
     aZoom           (this, ResId( MF_ZOOM )),
-    aGroupBox3      (this, ResId( GB_MISC_OPTIONS )),
+    aFixedLine3      (this, ResId( FL_MISC_OPTIONS )),
     aNoRightSpaces  (this, ResId( CB_IGNORE_SPACING ))
 {
     FreeResource();
@@ -374,8 +374,7 @@ SmFontDialog::SmFontDialog(Window * pParent, BOOL bFreeRes)
     aOKButton1      (this, ResId(1)),
     aCancelButton1  (this, ResId(1)),
     aShowFont       (this, ResId(1)),
-    aGroupBox1      (this, ResId(1)),
-    aGroupBox2      (this, ResId(2))
+    aFixedText2     (this, ResId(2))
 {
     if (bFreeRes)
         FreeResource();
@@ -404,8 +403,9 @@ SmFontDialog::SmFontDialog(Window * pParent, BOOL bFreeRes)
         Face.SetCharSet(RTL_TEXTENCODING_DONTKNOW);
         Face.SetTransparent(TRUE);
 
-        aShowFont.SetFillColor( Color(COL_LIGHTGRAY) );
-
+        Wallpaper aWhiteWall( (Color) Color(COL_WHITE) );
+        aShowFont.SetBackground( aWhiteWall );
+        aShowFont.SetBorderStyle( WINDOW_BORDER_MONO );
         //Application::LeaveWait();
     }
 
@@ -449,7 +449,7 @@ SmFontSizeDialog::SmFontSizeDialog(Window * pParent, BOOL bFreeRes)
     aOperatorSize(this, ResId(7)),
     aFixedText8(this, ResId(8)),
     aBorderSize(this, ResId(8)),
-    aGroupBox1(this, ResId(1)),
+    aFixedLine1(this, ResId(1)),
     aOKButton1(this, ResId(1)),
     aCancelButton1(this, ResId(1)),
     aDefaultButton(this, ResId(1))
@@ -558,8 +558,8 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, BOOL bFreeRes)
     aSansFont      (this, ResId(6)),
     aFixedText7    (this, ResId(7)),
     aFixedFont     (this, ResId(7)),
-    aGroupBox1     (this, ResId(1)),
-    aGroupBox2     (this, ResId(2)),
+    aFixedLine1    (this, ResId(1)),
+    aFixedLine2    (this, ResId(2)),
     aOKButton1     (this, ResId(1)),
     aCancelButton1 (this, ResId(1)),
     aMenuButton    (this, ResId(1)),
@@ -892,7 +892,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
     }
 
     aMenuButton.GetPopupMenu()->CheckItem(nCategory + 1, TRUE);
-    aGroupBox.SetText(Categories[nCategory]->GetName());
+    aFixedLine.SetText(Categories[nCategory]->GetName());
 
     nActiveCategory = nCategory;
 
@@ -918,7 +918,7 @@ SmDistanceDialog::SmDistanceDialog(Window *pParent, BOOL bFreeRes)
     aDefaultButton (this, ResId(1)),
     aCheckBox1     (this, ResId(1)),
     aBitmap        (this, ResId(1)),
-    aGroupBox      (this, ResId(1))
+    aFixedLine     (this, ResId(1))
 {
     for (int i = 0; i < NOCATEGORIES; i++)
         Categories[i] = new SmCategoryDesc(SmResId(i + 1), i);
@@ -928,6 +928,8 @@ SmDistanceDialog::SmDistanceDialog(Window *pParent, BOOL bFreeRes)
     if (bFreeRes)
         FreeResource();
 
+    aBitmap.SetBorderStyle( WINDOW_BORDER_MONO );
+
     aMetricField1.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
     aMetricField2.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
     aMetricField3.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
@@ -1045,7 +1047,7 @@ SmAlignDialog::SmAlignDialog(Window * pParent, BOOL bFreeRes)
     aLeft          (this, ResId(1)),
     aCenter        (this, ResId(2)),
     aRight         (this, ResId(3)),
-    aGroupBox1     (this, ResId(1)),
+    aFixedLine1    (this, ResId(1)),
     aOKButton1     (this, ResId(1)),
     aCancelButton1 (this, ResId(1)),
     aDefaultButton (this, ResId(1))
@@ -1429,7 +1431,6 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, SmSymSetManager &rMgr, BOOL bFre
     aSymbolSetText      (this, ResId(1)),
     aSymbolSets         (this, ResId(1)),
     aSymbolSetDisplay   (this, ResId(1)),
-    aGrpBox             (this, ResId(1)),
     aSymbolName         (this, ResId(2)),
     aSymbolDisplay      (this, ResId(2)),
     aCloseBtn           (this, ResId(3)),
@@ -1448,6 +1449,7 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, SmSymSetManager &rMgr, BOOL bFre
     // set background color to white
     Wallpaper aWhiteWall( (Color) Color(COL_WHITE) );
     aSymbolDisplay   .SetBackground( aWhiteWall );
+    aSymbolDisplay   .SetBorderStyle( WINDOW_BORDER_MONO );
     aSymbolSetDisplay.SetBackground( aWhiteWall );
 
     aSymbolSets      .SetSelectHdl  (LINK(this, SmSymbolDialog, SymbolSetChangeHdl));
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
index 8a4d781d981b..a27b0ba8771e 100644
--- a/starmath/source/dialog.hrc
+++ b/starmath/source/dialog.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialog.hrc,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tl $ $Date: 2001-02-07 12:44:52 $
+ *  last change: $Author: fme $ $Date: 2001-06-15 06:42:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,17 +59,17 @@
  *
  ************************************************************************/
 
-#define GB_PRINTOPTIONS     10
+#define FL_PRINTOPTIONS         10
 #define CB_TITLEROW         11
 #define CB_EQUATION_TEXT    12
 #define CB_FRAME            13
 
-#define GB_PRINT_FORMAT     20
+#define FL_PRINT_FORMAT         20
 #define RB_ORIGINAL_SIZE    21
 #define RB_FIT_TO_PAGE      22
 #define RB_ZOOM             23
 #define MF_ZOOM             24
 
-#define GB_MISC_OPTIONS     30
+#define FL_MISC_OPTIONS         30
 #define CB_IGNORE_SPACING   31