#86988# dialog redesign

3 files changed, 40 insertions, 45 deletions

diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index eafe13a5f7de..d30d3c00415a 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: scendlg.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:00 $
+ *  last change: $Author: dr $ $Date: 2001-05-22 13:16:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,10 +87,6 @@
 #include <svtools/ctrlbox.hxx>
 #endif
 
-#ifndef _SV_GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 //===================================================================
 
 class ScNewScenarioDlg : public ModalDialog
@@ -106,11 +102,11 @@ public:
                             Color& rColor, USHORT& rFlags ) const;
 
 private:
-    GroupBox            aGbName;
+    FixedLine           aFlName;
     Edit                aEdName;
-    GroupBox            aGbComment;
+    FixedLine           aFlComment;
     MultiLineEdit       aEdComment;
-    GroupBox            aGbOptions;
+    FixedLine           aFlOptions;
     CheckBox            aCbShowFrame;
     ColorListBox        aLbColor;
     //CheckBox          aCbPrintFrame;
@@ -125,6 +121,7 @@ private:
     BOOL                bIsEdit;
 
     DECL_LINK( OkHdl, OKButton * );
+    DECL_LINK( EnableHdl, CheckBox * );
 };
 
 
diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc
index 03a76730b9f1..e3a893bfc566 100644
--- a/sc/source/ui/inc/validate.hrc
+++ b/sc/source/ui/inc/validate.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: validate.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:02 $
+ *  last change: $Author: dr $ $Date: 2001-05-22 13:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,29 +58,32 @@
  *
  *
  ************************************************************************/
-#define TP_VALIDATION_VALUES 696
+#define TP_VALIDATION_VALUES    696
 #define TP_VALIDATION_INPUTHELP 697
-#define TP_VALIDATION_ERROR 698
-#define TAB_DLG_VALIDATION 699
-#define FT_ALLOW 1
-#define LB_ALLOW 1
-#define TSB_ALLOW_BLANKS 1
-#define FT_VALUE 2
-#define LB_VALUE 2
-#define FT_MIN 3
-#define EDT_MIN 1
-#define FT_MAX 4
-#define EDT_MAX 2
-#define GRP_VALUES 1
-#define TSB_HELP 1
-#define FT_TITLE 1
-#define FT_INPUTHELP 2
-#define EDT_TITLE 1
-#define EDT_INPUTHELP 2
-#define TSB_SHOW 1
-#define FT_ACTION 3
-#define FT_ERROR 4
-#define LB_ACTION 2
-#define EDT_ERROR 1
-#define BTN_SEARCH 1
-#define GRP_CONTENT 1
+#define TP_VALIDATION_ERROR     698
+#define TAB_DLG_VALIDATION      699
+
+#define FT_ALLOW                1
+#define LB_ALLOW                2
+#define TSB_ALLOW_BLANKS        3
+#define FT_VALUE                4
+#define LB_VALUE                5
+#define FT_MIN                  6
+#define EDT_MIN                 7
+#define FT_MAX                  8
+#define EDT_MAX                 9
+
+#define FL_CONTENT              10
+
+#define TSB_HELP                11
+#define FT_TITLE                12
+#define EDT_TITLE               13
+#define FT_INPUTHELP            14
+#define EDT_INPUTHELP           15
+
+#define TSB_SHOW                21
+#define FT_ACTION               22
+#define FT_ERROR                23
+#define LB_ACTION               24
+#define EDT_ERROR               25
+#define BTN_SEARCH              26
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 75a0b8765f1b..7a4863cb06b0 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: validate.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:02 $
+ *  last change: $Author: dr $ $Date: 2001-05-22 13:16:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,10 +75,6 @@
 #include <vcl/fixed.hxx>
 #endif
 
-#ifndef _SV_GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 #ifndef _SV_LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
@@ -112,7 +108,6 @@ private:
     Edit        aEdtMin;
     FixedText   aFtMax;
     Edit        aEdtMax;
-    GroupBox    aGrpValues;
 
     String      aStrMin;
     String      aStrMax;
@@ -144,11 +139,11 @@ class ScTPValidationHelp : public SfxTabPage
 {
 private:
     TriStateBox     aTsbHelp;
+    FixedLine       aFlContent;
     FixedText       aFtTitle;
     Edit            aEdtTitle;
     FixedText       aFtInputHelp;
     MultiLineEdit   aEdInputHelp;
-    GroupBox        aGrpContent;
 
     const SfxItemSet& rSet;
 
@@ -175,6 +170,7 @@ class ScTPValidationError : public SfxTabPage
 {
 private:
     TriStateBox     aTsbShow;
+    FixedLine       aFlContent;
     FixedText       aFtAction;
     ListBox         aLbAction;
     PushButton      aBtnSearch;
@@ -182,7 +178,6 @@ private:
     Edit            aEdtTitle;
     FixedText       aFtError;
     MultiLineEdit   aEdError;
-    GroupBox        aGrpContent;
 
     const SfxItemSet& rSet;