#86988# dialog redesign

1 files changed, 126 insertions, 176 deletions

diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index 34f6008a4919..9df529ff40e5 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filter.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:00:17 $
+ *  last change: $Author: dr $ $Date: 2001-05-21 08:51:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,8 +84,8 @@ ModelessDialog RID_SCDLG_FILTER
     Closeable = FALSE ;
     FixedText FT_OP
     {
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 44 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
         Text = "Verkn�pfung" ;
         Text [ ENGLISH ] = "Operator" ;
@@ -114,8 +114,8 @@ ModelessDialog RID_SCDLG_FILTER
     };
     FixedText FT_FIELD
     {
-        Pos = MAP_APPFONT ( 60 , 15 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 58 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "Feldname" ;
         Text [ ENGLISH ] = "Fieldname" ;
         Text [ norwegian ] = "Fieldname" ;
@@ -129,7 +129,6 @@ ModelessDialog RID_SCDLG_FILTER
         Text [ dutch ] = "Veldnaam" ;
         Text [ spanish ] = "Nombre del campo" ;
         Text [ english_us ] = "Field name" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "�ֶ�����";
         Text[ russian ] = "��� ����";
         Text[ polish ] = "Nazwa pola";
@@ -144,8 +143,8 @@ ModelessDialog RID_SCDLG_FILTER
     };
     FixedText FT_COND
     {
-        Pos = MAP_APPFONT ( 123 , 15 ) ;
-        Size = MAP_APPFONT ( 35 , 10 ) ;
+        Pos = MAP_APPFONT ( 122 , 14 ) ;
+        Size = MAP_APPFONT ( 47 , 8 ) ;
         Text = "Bedingung" ;
         Text [ ENGLISH ] = "Condition" ;
         Text [ norwegian ] = "Vilk�r" ;
@@ -159,7 +158,6 @@ ModelessDialog RID_SCDLG_FILTER
         Text [ dutch ] = "Voorwaarde" ;
         Text [ spanish ] = "Condici�n" ;
         Text [ english_us ] = "Condition" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "����";
         Text[ russian ] = "�������";
         Text[ polish ] = "Warunek";
@@ -174,8 +172,8 @@ ModelessDialog RID_SCDLG_FILTER
     };
     FixedText FT_VAL
     {
-        Pos = MAP_APPFONT ( 171 , 15 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 173 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "Wert" ;
         Text [ ENGLISH ] = "Value" ;
         Text [ norwegian ] = "Verdi" ;
@@ -189,7 +187,6 @@ ModelessDialog RID_SCDLG_FILTER
         Text [ dutch ] = "Waarde" ;
         Text [ spanish ] = "Valor" ;
         Text [ english_us ] = "Value" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "ֵ";
         Text[ russian ] = "��������";
         Text[ polish ] = "Warto?�";
@@ -205,7 +202,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_OP1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
+        Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -333,7 +330,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_OP2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 58 ) ;
+        Pos = MAP_APPFONT ( 12 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -461,7 +458,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_FIELD1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 28 ) ;
+        Pos = MAP_APPFONT ( 58 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -469,7 +466,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_FIELD2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 43 ) ;
+        Pos = MAP_APPFONT ( 58 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -477,7 +474,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_FIELD3
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 58 ) ;
+        Pos = MAP_APPFONT ( 58 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -485,8 +482,8 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_COND1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 28 ) ;
-        Size = MAP_APPFONT ( 45 , 105 ) ;
+        Pos = MAP_APPFONT ( 122 , 25 ) ;
+        Size = MAP_APPFONT ( 47 , 105 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -794,8 +791,8 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_COND2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 43 ) ;
-        Size = MAP_APPFONT ( 45 , 105 ) ;
+        Pos = MAP_APPFONT ( 122 , 41 ) ;
+        Size = MAP_APPFONT ( 47 , 105 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -1103,8 +1100,8 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_COND3
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 58 ) ;
-        Size = MAP_APPFONT ( 45 , 105 ) ;
+        Pos = MAP_APPFONT ( 122 , 57 ) ;
+        Size = MAP_APPFONT ( 47 , 105 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -1411,58 +1408,36 @@ ModelessDialog RID_SCDLG_FILTER
     };
     ComboBox ED_VAL1
     {
-        Pos = MAP_APPFONT ( 171 , 28 ) ;
+        Pos = MAP_APPFONT ( 173 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     ComboBox ED_VAL2
     {
-        Pos = MAP_APPFONT ( 171 , 43 ) ;
+        Pos = MAP_APPFONT ( 173 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     ComboBox ED_VAL3
     {
-        Pos = MAP_APPFONT ( 171 , 58 ) ;
+        Pos = MAP_APPFONT ( 173 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
-    GroupBox GB_CRITERIA
+    FixedLine FL_CRITERIA
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 231 , 74 ) ;
-        Text = "Kriterien" ;
-        Text [ ENGLISH ] = "Criteria" ;
-        Text [ norwegian ] = "Criteria" ;
-        Text [ italian ] = "Criteri" ;
-        Text [ portuguese_brazilian ] = "Crit?rios" ;
-        Text [ portuguese ] = "Crit�rios" ;
-        Text [ finnish ] = "Lajitteluperusteet" ;
-        Text [ danish ] = "Kriterier" ;
-        Text [ french ] = "Crit�res" ;
-        Text [ swedish ] = "Kriterier" ;
-        Text [ dutch ] = "Criteria" ;
-        Text [ spanish ] = "Criterios" ;
-        Text [ english_us ] = "Sort criteria" ;
-        Text[ chinese_simplified ] = "����";
-        Text[ russian ] = "��������";
-        Text[ polish ] = "Kryteria";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "����";
-        Text[ arabic ] = "��������";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "����";
-        Text[ turkish ] = "�l��tler";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Criterios";
+        Size = MAP_APPFONT ( 230 , 8 ) ;
+        Text = "Filterkriterien" ;
+        Text [ ENGLISH ] = "Filter criteria" ;
     };
     CheckBox BTN_CASE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 94 ) ;
+        Pos = MAP_APPFONT ( 12 , 86 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Gro�-/Kleinschreibung : ~Gro�-/Kleinschreibung */
         Text = "~Gro�-/Kleinschreibung" ;
@@ -1494,8 +1469,8 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_REGEXP
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 94 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 86 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Regul�rer Ausdruck : ~Regul�rer Ausdruck */
         Text = "~Regul�rer Ausdruck" ;
         Text [ ENGLISH ] = "~Regular expression" ;
@@ -1526,7 +1501,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_HEADER
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 107 ) ;
+        Pos = MAP_APPFONT ( 12 , 100 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Bereich enth�lt ~Spaltenk�pfe : Bereich enth�lt ~Spaltenk�pfe */
         Text = "Bereich enth�lt ~Spaltenk�pfe" ;
@@ -1558,8 +1533,8 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_UNIQUE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 107 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 100 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
         Text = "Keine ~Duplikate" ;
         Text [ ENGLISH ] = "~Unique" ;
         Text [ norwegian ] = "~Unique" ;
@@ -1589,7 +1564,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_COPY_RESULT
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 120 ) ;
+        Pos = MAP_APPFONT ( 12 , 114 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text = "Filterergebnis ~ausgeben nach" ;
         Text [ ENGLISH ] = "Write ~result to" ;
@@ -1620,8 +1595,8 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_DEST_PERS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 120 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 114 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
         Text = "~Persistent" ;
         Text [ ENGLISH ] = "~Persistent" ;
         TabStop = TRUE ;
@@ -1651,7 +1626,7 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 23 , 134 ) ;
+        Pos = MAP_APPFONT ( 20 , 126 ) ;
         Size = MAP_APPFONT ( 90 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -1660,15 +1635,15 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 134 ) ;
-        Size = MAP_APPFONT ( 98 , 12 ) ;
+        Pos = MAP_APPFONT ( 116 , 126 ) ;
+        Size = MAP_APPFONT ( 101 , 12 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_COPY_AREA
     {
         QuickHelpText = "Verkleinern" ;
         QuickHelpText [ ENGLISH ] = "Shrink" ;
-        Pos = MAP_APPFONT ( 217 , 134 ) ;
+        Pos = MAP_APPFONT ( 221 , 126 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = FALSE ;
         QuickHelpText [ english_us ] = "Shrink" ;
@@ -1680,7 +1655,7 @@ ModelessDialog RID_SCDLG_FILTER
         QuickHelpText [ french ] = "R�duire" ;
         QuickHelpText [ dutch ] = "Verkleinen" ;
         QuickHelpText [ portuguese ] = "Afastar" ;
-    QuickHelpText[ russian ] = "���������";
+        QuickHelpText[ russian ] = "���������";
         QuickHelpText[ polish ] = "Pomniejsz";
         QuickHelpText[ japanese ] = "�k��!";
         QuickHelpText[ chinese_simplified ] = "��С";
@@ -1694,11 +1669,11 @@ ModelessDialog RID_SCDLG_FILTER
         QuickHelpText[ catalan ] = "Reducir";
         QuickHelpText[ finnish ] = "Pienenn�!";
     };
-    GroupBox GB_OPTIONS
+    FixedLine FL_OPTIONS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 83 ) ;
-        Size = MAP_APPFONT ( 231 , 70 ) ;
+        Pos = MAP_APPFONT ( 6 , 75 ) ;
+        Size = MAP_APPFONT ( 230 , 8 ) ;
         Text = "Optionen" ;
         Text [ ENGLISH ] = "Options" ;
         Text [ norwegian ] = "Options" ;
@@ -1727,8 +1702,8 @@ ModelessDialog RID_SCDLG_FILTER
     FixedText FT_DBAREA
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 159 ) ;
-        Size = MAP_APPFONT ( 159 , 10 ) ;
+        Pos = MAP_APPFONT ( 66 , 144 ) ;
+        Size = MAP_APPFONT ( 167 , 8 ) ;
         Text = "dummy" ;
         Text [ ENGLISH ] = "dummy" ;
         Text [ norwegian ] = "dummy" ;
@@ -1758,8 +1733,8 @@ ModelessDialog RID_SCDLG_FILTER
     FixedText FT_DBAREA_LABEL
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 159 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 144 ) ;
+        Size = MAP_APPFONT ( 58 , 8 ) ;
         Text = "Datenbereich:" ;
         Text [ ENGLISH ] = "Data area:" ;
         Text [ norwegian ] = "Data area:" ;
@@ -1810,7 +1785,7 @@ ModelessDialog RID_SCDLG_FILTER
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         MapUnit = MAP_APPFONT ;
-        Delta = 90 ;
+        Delta = 75 ;
     };
     Text[ chinese_simplified ] = "��׼ɸѡ";
     Text[ russian ] = "����������� ������";
@@ -1849,8 +1824,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     Closeable = FALSE ;
     FixedText FT_CRITERIA_AREA
     {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 210 , 8 ) ;
         Text = "~Filterkriterien befinden sich in" ;
         Text [ ENGLISH ] = "Read ~filter criteria from" ;
         Text [ norwegian ] = "Read ~filter criteria from" ;
@@ -1879,23 +1854,23 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     ListBox LB_CRITERIA_AREA
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 20 ) ;
-        Size = MAP_APPFONT ( 100 , 90 ) ;
+        Pos = MAP_APPFONT ( 6 , 14 ) ;
+        Size = MAP_APPFONT ( 90 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     Edit ED_CRITERIA_AREA
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 113 , 20 ) ;
-        Size = MAP_APPFONT ( 90 , 12 ) ;
+        Pos = MAP_APPFONT ( 102 , 14 ) ;
+        Size = MAP_APPFONT ( 95 , 12 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_CRITERIA_AREA
     {
         QuickHelpText = "Verkleinern" ;
         QuickHelpText [ ENGLISH ] = "Shrink" ;
-        Pos = MAP_APPFONT ( 205 , 20 ) ;
+        Pos = MAP_APPFONT ( 201 , 14 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = FALSE ;
         QuickHelpText [ english_us ] = "Shrink" ;
@@ -1907,7 +1882,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
         QuickHelpText [ french ] = "R�duire" ;
         QuickHelpText [ dutch ] = "Verkleinen" ;
         QuickHelpText [ portuguese ] = "Afastar" ;
-    QuickHelpText[ russian ] = "���������";
+        QuickHelpText[ russian ] = "���������";
         QuickHelpText[ polish ] = "Pomniejsz";
         QuickHelpText[ japanese ] = "�k��!";
         QuickHelpText[ chinese_simplified ] = "��С";
@@ -1924,7 +1899,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_CASE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 51 ) ;
+        Pos = MAP_APPFONT ( 12 , 43 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Gro�-/Kleinschreibung : ~Gro�-/Kleinschreibung */
         Text = "~Gro�-/Kleinschreibung" ;
@@ -1956,8 +1931,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_REGEXP
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 51 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 43 ) ;
+        Size = MAP_APPFONT ( 85 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Regul�rer Ausdruck : ~Regul�rer Ausdruck */
         Text = "~Regul�rer Ausdruck" ;
         Text [ ENGLISH ] = "~Regular expression" ;
@@ -1988,7 +1963,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_HEADER
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 64 ) ;
+        Pos = MAP_APPFONT ( 12 , 57 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Bereich enth�lt ~Spaltenk�pfe : Bereich enth�lt ~Spaltenk�pfe */
         Text = "Bereich enth�lt ~Spaltenk�pfe" ;
@@ -2020,8 +1995,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_UNIQUE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 64 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 57 ) ;
+        Size = MAP_APPFONT ( 85 , 10 ) ;
         Text = "Keine ~Duplikate" ;
         Text [ ENGLISH ] = "~Unique" ;
         Text [ norwegian ] = "~Unique" ;
@@ -2051,7 +2026,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_COPY_RESULT
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 78 ) ;
+        Pos = MAP_APPFONT ( 12 , 71 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text = "Filterergebnis ~ausgeben nach" ;
         Text [ ENGLISH ] = "Write ~result to" ;
@@ -2082,8 +2057,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     CheckBox BTN_DEST_PERS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 78 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 128 , 71 ) ;
+        Size = MAP_APPFONT ( 85 , 10 ) ;
         Text = "~Persistent" ;
         Text [ ENGLISH ] = "~Persistent" ;
         TabStop = TRUE ;
@@ -2113,8 +2088,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 23 , 92 ) ;
-        Size = MAP_APPFONT ( 90 , 90 ) ;
+        Pos = MAP_APPFONT ( 20 , 83 ) ;
+        Size = MAP_APPFONT ( 76 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
@@ -2122,15 +2097,15 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 92 ) ;
-        Size = MAP_APPFONT ( 78 , 12 ) ;
+        Pos = MAP_APPFONT ( 102 , 83 ) ;
+        Size = MAP_APPFONT ( 95 , 12 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_COPY_AREA
     {
         QuickHelpText = "Verkleinern" ;
         QuickHelpText [ ENGLISH ] = "Shrink" ;
-        Pos = MAP_APPFONT ( 197 , 92 ) ;
+        Pos = MAP_APPFONT ( 201 , 83 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = FALSE ;
         QuickHelpText [ english_us ] = "Shrink" ;
@@ -2142,7 +2117,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
         QuickHelpText [ french ] = "R�duire" ;
         QuickHelpText [ dutch ] = "Verkleinen" ;
         QuickHelpText [ portuguese ] = "Afastar" ;
-    QuickHelpText[ russian ] = "���������";
+        QuickHelpText[ russian ] = "���������";
         QuickHelpText[ polish ] = "Pomniejsz";
         QuickHelpText[ japanese ] = "�k��!";
         QuickHelpText[ chinese_simplified ] = "��С";
@@ -2156,11 +2131,11 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
         QuickHelpText[ catalan ] = "Reducir";
         QuickHelpText[ finnish ] = "Pienenn�!";
     };
-    GroupBox GB_OPTIONS
+    FixedLine FL_OPTIONS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 40 ) ;
-        Size = MAP_APPFONT ( 211 , 70 ) ;
+        Pos = MAP_APPFONT ( 6 , 32 ) ;
+        Size = MAP_APPFONT ( 210 , 8 ) ;
         Text = "Optionen" ;
         Text [ ENGLISH ] = "Options" ;
         Text [ norwegian ] = "Options" ;
@@ -2189,8 +2164,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     FixedText FT_DBAREA
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 117 ) ;
-        Size = MAP_APPFONT ( 159 , 10 ) ;
+        Pos = MAP_APPFONT ( 58 , 101 ) ;
+        Size = MAP_APPFONT ( 155 , 8 ) ;
         Text = "dummy" ;
         Text [ ENGLISH ] = "dummy" ;
         Text [ norwegian ] = "dummy" ;
@@ -2220,8 +2195,8 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
     FixedText FT_DBAREA_LABEL
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 117 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 101 ) ;
+        Size = MAP_APPFONT ( 50 , 8 ) ;
         Text = "Datenbereich:" ;
         Text [ ENGLISH ] = "Data area:" ;
         Text [ norwegian ] = "Data area:" ;
@@ -2272,7 +2247,7 @@ ModelessDialog RID_SCDLG_SPEC_FILTER
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         MapUnit = MAP_APPFONT ;
-        Delta = 50 ;
+        Delta = 32 ;
     };
     Text[ chinese_simplified ] = "����ɸѡ";
     Text[ russian ] = "����������� ������";
@@ -2293,7 +2268,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     HelpId = HID_SC_PIVOTFILTER ;
     Hide = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 278 , 83 ) ;
+    Size = MAP_APPFONT ( 298 , 83 ) ;
     Text = "Filter" ;
     Text [ ENGLISH ] = "Filter" ;
     Text [ norwegian ] = "Filter" ;
@@ -2311,8 +2286,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     Closeable = FALSE ;
     FixedText FT_OP
     {
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
         Text = "Verkn�pfung" ;
         Text [ ENGLISH ] = "Operator" ;
@@ -2341,8 +2316,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     };
     FixedText FT_FIELD
     {
-        Pos = MAP_APPFONT ( 70 , 15 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 58 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "Feldname" ;
         Text [ ENGLISH ] = "Fieldname" ;
         Text [ norwegian ] = "Fieldname" ;
@@ -2356,7 +2331,6 @@ ModalDialog RID_SCDLG_PIVOTFILTER
         Text [ dutch ] = "Veldnaam" ;
         Text [ spanish ] = "Nombre del campo" ;
         Text [ english_us ] = "Field name" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "�ֶ�����";
         Text[ russian ] = "��� ����";
         Text[ polish ] = "Nazwa pola";
@@ -2371,8 +2345,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     };
     FixedText FT_COND
     {
-        Pos = MAP_APPFONT ( 116 , 15 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 122 , 14 ) ;
+        Size = MAP_APPFONT ( 47 , 8 ) ;
         Text = "Bedingung" ;
         Text [ ENGLISH ] = "Condition" ;
         Text [ norwegian ] = "Vilk�r" ;
@@ -2386,7 +2360,6 @@ ModalDialog RID_SCDLG_PIVOTFILTER
         Text [ dutch ] = "Voorwaarde" ;
         Text [ spanish ] = "Condici�n" ;
         Text [ english_us ] = "Condition" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "����";
         Text[ russian ] = "�������";
         Text[ polish ] = "Warunek";
@@ -2401,8 +2374,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     };
     FixedText FT_VAL
     {
-        Pos = MAP_APPFONT ( 156 , 15 ) ;
-        Size = MAP_APPFONT ( 35 , 10 ) ;
+        Pos = MAP_APPFONT ( 173 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "Wert" ;
         Text [ ENGLISH ] = "Value" ;
         Text [ norwegian ] = "Verdi" ;
@@ -2416,7 +2389,6 @@ ModalDialog RID_SCDLG_PIVOTFILTER
         Text [ dutch ] = "Waarde" ;
         Text [ spanish ] = "Valor" ;
         Text [ english_us ] = "Value" ;
-        Center = TRUE ;
         Text[ chinese_simplified ] = "��ֵ";
         Text[ russian ] = "��������";
         Text[ polish ] = "Warto?�";
@@ -2432,7 +2404,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_OP1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
+        Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -2560,7 +2532,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_OP2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 58 ) ;
+        Pos = MAP_APPFONT ( 12 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -2688,7 +2660,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_FIELD1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 28 ) ;
+        Pos = MAP_APPFONT ( 58 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -2696,7 +2668,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_FIELD2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 43 ) ;
+        Pos = MAP_APPFONT ( 58 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -2704,7 +2676,7 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_FIELD3
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 58 ) ;
+        Pos = MAP_APPFONT ( 58 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -2712,8 +2684,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_COND1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 28 ) ;
-        Size = MAP_APPFONT ( 25 , 65 ) ;
+        Pos = MAP_APPFONT ( 122 , 25 ) ;
+        Size = MAP_APPFONT ( 47 , 65 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -2936,8 +2908,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_COND2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 43 ) ;
-        Size = MAP_APPFONT ( 25 , 65 ) ;
+        Pos = MAP_APPFONT ( 122 , 41 ) ;
+        Size = MAP_APPFONT ( 47 , 65 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -3160,8 +3132,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     ListBox LB_COND3
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 123 , 58 ) ;
-        Size = MAP_APPFONT ( 25 , 65 ) ;
+        Pos = MAP_APPFONT ( 122 , 57 ) ;
+        Size = MAP_APPFONT ( 47 , 65 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -3383,59 +3355,37 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     };
     ComboBox ED_VAL1
     {
-        Pos = MAP_APPFONT ( 151 , 28 ) ;
+        Pos = MAP_APPFONT ( 173 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     ComboBox ED_VAL2
     {
-        Pos = MAP_APPFONT ( 151 , 43 ) ;
+        Pos = MAP_APPFONT ( 173 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     ComboBox ED_VAL3
     {
-        Pos = MAP_APPFONT ( 151 , 58 ) ;
+        Pos = MAP_APPFONT ( 173 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
-    GroupBox GB_CRITERIA
+    FixedLine FL_CRITERIA
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 211 , 74 ) ;
-        Text = "Kriterien" ;
-        Text [ ENGLISH ] = "Criteria" ;
-        Text [ norwegian ] = "Criteria" ;
-        Text [ italian ] = "Criteri" ;
-        Text [ portuguese_brazilian ] = "Crit?rios" ;
-        Text [ portuguese ] = "Crit�rios" ;
-        Text [ finnish ] = "Hakukriteerit" ;
-        Text [ danish ] = "Kriterier" ;
-        Text [ french ] = "Crit�res" ;
-        Text [ swedish ] = "Kriterier" ;
-        Text [ dutch ] = "Criteria" ;
-        Text [ spanish ] = "Criterios" ;
-        Text [ english_us ] = "Search criteria" ;
-        Text[ chinese_simplified ] = "��Ѱ����";
-        Text[ russian ] = "������� ������";
-        Text[ polish ] = "Kryteria";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "�j�M����";
-        Text[ arabic ] = "��������";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "����";
-        Text[ turkish ] = "�l��tler";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Criterios";
+        Size = MAP_APPFONT ( 230 , 8 ) ;
+        Text = "Filterkriterien" ;
+        Text [ ENGLISH ] = "Filter criteria" ;
     };
     CheckBox BTN_CASE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 94 ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 86 ) ;
+        Size = MAP_APPFONT ( 221 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Gro�-/Kleinschreibung : ~Gro�-/Kleinschreibung */
         Text = "~Gro�-/Kleinschreibung" ;
         Text [ ENGLISH ] = "~Case sensitive" ;
@@ -3466,8 +3416,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     CheckBox BTN_REGEXP
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 94 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 100 ) ;
+        Size = MAP_APPFONT ( 221 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Regul�rer Ausdruck : ~Regul�rer Ausdruck */
         Text = "~Regul�rer Ausdruck" ;
         Text [ ENGLISH ] = "~Regular expression" ;
@@ -3498,8 +3448,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     CheckBox BTN_UNIQUE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 107 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 114 ) ;
+        Size = MAP_APPFONT ( 221 , 10 ) ;
         Text = "Keine ~Duplikate" ;
         Text [ ENGLISH ] = "~Unique" ;
         Text [ norwegian ] = "~Unique" ;
@@ -3526,11 +3476,11 @@ ModalDialog RID_SCDLG_PIVOTFILTER
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Sin duplicados";
     };
-    GroupBox GB_OPTIONS
+    FixedLine FL_OPTIONS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 83 ) ;
-        Size = MAP_APPFONT ( 211 , 40 ) ;
+        Pos = MAP_APPFONT ( 6 , 75 ) ;
+        Size = MAP_APPFONT ( 230 , 8 ) ;
         Text = "Optionen" ;
         Text [ ENGLISH ] = "Options" ;
         Text [ norwegian ] = "Options" ;
@@ -3559,8 +3509,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     FixedText FT_DBAREA
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 129 ) ;
-        Size = MAP_APPFONT ( 159 , 10 ) ;
+        Pos = MAP_APPFONT ( 70 , 130 ) ;
+        Size = MAP_APPFONT ( 166 , 8 ) ;
         Text = "dummy" ;
         Text [ ENGLISH ] = "dummy" ;
         Text [ norwegian ] = "dummy" ;
@@ -3590,8 +3540,8 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     FixedText FT_DBAREA_LABEL
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 129 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 130 ) ;
+        Size = MAP_APPFONT ( 58 , 8 ) ;
         Text = "Datenbereich:" ;
         Text [ ENGLISH ] = "Data area:" ;
         Text [ norwegian ] = "Data area:" ;
@@ -3619,30 +3569,30 @@ ModalDialog RID_SCDLG_PIVOTFILTER
     };
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 222 , 6 ) ;
+        Pos = MAP_APPFONT ( 242 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 222 , 23 ) ;
+        Pos = MAP_APPFONT ( 242 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 222 , 43 ) ;
+        Pos = MAP_APPFONT ( 242 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     MoreButton BTN_MORE
     {
-        Pos = MAP_APPFONT ( 223 , 63 ) ;
+        Pos = MAP_APPFONT ( 243 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         MapUnit = MAP_APPFONT ;
-        Delta = 60 ;
+        Delta = 61 ;
     };
     Text[ chinese_simplified ] = "ɸѡ";
     Text[ russian ] = "������";