Fix #86988#: Redesign of dialogs

6 files changed, 88 insertions, 59 deletions

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4e943cb0e3b1..3f78ce28a608 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cnttab.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -405,7 +405,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog
     HelpButton          aHelpPB;
 
     SwEntryBrowseBox    aEntriesBB;
-    GroupBox            aEntriesGB;
+    FixedLine           aEntriesFL;
 
     String              sAutoMarkURL;
     const String        sAutoMarkType;
@@ -1321,10 +1321,10 @@ class SwAddStylesDlg_Impl : public SfxModalDialog
     CancelButton    aCancel;
     HelpButton      aHelp;
 
-    GroupBox        aStylesGB;
+    FixedLine       aStylesFL;
     SwHeaderTree    aHeaderTree;
-    PushButton      aLeftPB;
-    PushButton      aRightPB;
+    ImageButton     aLeftPB;
+    ImageButton      aRightPB;
 
     String          sHBFirst;
     String*         pStyleArr;
@@ -1345,7 +1345,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
     SfxModalDialog(pParent, SW_RES(DLG_ADD_IDX_STYLES)),
     pStyleArr(rStringArr),
     aHeaderTree(this, ResId(TR_HEADER   )),
-    aStylesGB(  this, ResId(GB_STYLES   )),
+    aStylesFL(  this, ResId(FL_STYLES   )),
     aOk(        this, ResId(PB_OK       )),
     aCancel(    this, ResId(PB_CANCEL   )),
     aHelp(      this, ResId(PB_HELP     )),
@@ -2542,7 +2542,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     aLastTOXType.eType = (TOXTypes)USHRT_MAX;
     aLastTOXType.nIndex = 0;
     //aLevelGBSize = aLevelGB.GetSizePixel();
-    aLevelGBSize = aLevelFT.GetSizePixel();
+    aLevelFLSize = aLevelFT.GetSizePixel();
 
     SetExchangeSupport();
     aEntryNoPB.SetClickHdl(LINK(this, SwTOXEntryTabPage, InsertTokenHdl));
@@ -2779,17 +2779,17 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& rSet)
             aLevelFT.SetText(sLevelStr);
 
         long nDiff = 0;
-        if( bToxIsAuthorities ? aLevelFT.GetSizePixel() == aLevelGBSize
-                              : aLevelFT.GetSizePixel() != aLevelGBSize )
+        if( bToxIsAuthorities ? aLevelFT.GetSizePixel() == aLevelFLSize
+                              : aLevelFT.GetSizePixel() != aLevelFLSize )
         {
-            nDiff = aLevelGBSize.Width();
+            nDiff = aLevelFLSize.Width();
             if( !bToxIsAuthorities )
                 nDiff *= -1;
         }
 
         if(nDiff)
         {
-//          lcl_ChgWidth(aLevelGB, nDiff);
+//          lcl_ChgWidth(aLevelFL, nDiff);
             lcl_ChgWidth(aLevelFT, nDiff);
             lcl_ChgWidth(aLevelLB, nDiff);
             lcl_ChgXPos(aCharStyleFT, nDiff);
@@ -4733,7 +4733,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkU
     aCancelPB(  this, ResId(PB_CANCEL   )),
     aHelpPB(    this, ResId(PB_HELP     )),
     aEntriesBB( this, ResId(BB_ENTRIES  )),
-    aEntriesGB( this, ResId(GB_ENTRIES  )),
+    aEntriesFL( this, ResId(FL_ENTRIES  )),
     sAutoMarkURL(rAutoMarkURL),
     sAutoMarkType(rAutoMarkType),
     bCreateMode(bCreate)
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index 75fc69d6d5ad..db7aba21a2af 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cnttab.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,11 +62,11 @@
 #define CB_OUTLN        5
 #define FT_LEVEL        6
 #define ED_LEVEL        7
-#define GB_CREATE       8
+#define FL_CREATE       8
 #define ED_BSP         11
-#define GB_BSP         12
+#define FL_BSP         12
 #define BT_OUTLN       13
-#define GB_TITLE       14
+#define FL_TITLE       14
 #define ED_TITLE       15
 #define BT_HELP        16
 #define ST_AUTHTYPE    17
@@ -99,14 +99,14 @@
 #define CB_CASE             43
 #define CB_SEC              44
 #define CB_ALPHA            45
-#define GB_OPT              46
+#define FL_OPT                  46
 #define CB_MAKRS            47
 #define DLB_TOD             48
 #define CB_TEMPL            49
 #define DLB_LAYOUT          50
 #define CB_OBJECT           51
 #define DLB_OBJECT          52
-#define GB_SOURCE           53
+#define FL_SOURCE           53
 #define CB_USER_MARKS       54
 #define BT_ALL_LEVEL        55
 #define FT_MAIN_ENTRY_STYLE 56
@@ -149,7 +149,7 @@
 
 #define CB_USE_DASH         33
 
-#define GB_LEVEL                34
+#define FL_LEVEL                                34
 #define WIN_TOKEN               35
 #define PB_ENTRYNO              36
 #define PB_ENTRY                37
@@ -170,12 +170,12 @@
 #define MF_TABPOS               52
 #define CB_AUTORIGHT            53
 #define CB_RELTOSTYLE           54
-//#define GB_ENTRY              55
+//#define FL_ENTRY                              55
 #define CB_RECALCTAB            56
 #define CB_NUMSTYLEFROMPDESC    57
 #define CB_ALPHADELIM           58
 #define CB_COMMASEPARATED       59
-//#define GB_FORMAT             60
+//#define FL_FORMAT                             60
 
 #define STR_NO_CHAR_STYLE       61
 #define CLB_FROMOBJ             62
@@ -214,7 +214,7 @@
 
 #define STR_CHARSTYLE               (STR_TOKEN_HELP_AUTHORITY + 1)
 #define TLB_STYLES              100
-#define GB_STYLES               101
+#define FL_STYLES                   101
 #define PB_OK                   102
 #define PB_CANCEL               103
 #define PB_HELP                 104
@@ -289,7 +289,7 @@
 
 // AutoMark dialog
 #define BB_ENTRIES          1
-#define GB_ENTRIES          2
+#define FL_ENTRIES          2
 
 #define ST_SEARCH           10
 #define ST_ALTERNATIVE      11
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index ee78ac3d122e..2620832d5404 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cnttab.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -4127,37 +4127,63 @@ ModalDialog DLG_ADD_IDX_STYLES
     Control TR_HEADER
     {
         Pos = MAP_APPFONT ( 12 , 15 ) ;
-        Size = MAP_APPFONT ( 276 , 164 ) ;
+        Size = MAP_APPFONT ( 273 , 164 ) ;
         Border = TRUE;
         TabStop = TRUE;
         Window HB_STYLES
         {
             Pos = MAP_APPFONT ( 0 , 0 ) ;
-            Size = MAP_APPFONT ( 276 , 20 ) ;
+            Size = MAP_APPFONT ( 273 , 20 ) ;
         };
         Control TLB_STYLES
         {
             Pos = MAP_APPFONT ( 0 , 20 ) ;
-            Size = MAP_APPFONT ( 276 , 132 ) ;
+            Size = MAP_APPFONT ( 273 , 132 ) ;
             Border = TRUE;
         };
     };
-    PushButton PB_LEFT
+    ImageButton PB_LEFT
     {
         Pos = MAP_APPFONT ( 12 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
-        Text = "~<<";
+        TabStop = TRUE ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "all_left.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
     };
-    PushButton PB_RIGHT
+    ImageButton PB_RIGHT
     {
         Pos = MAP_APPFONT ( 65 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
-        Text = "~>>";
+        TabStop = TRUE ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "all_right.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
     };
-    GroupBox GB_STYLES
+    FixedLine FL_STYLES
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 288 , 194 ) ;
+        Size = MAP_APPFONT ( 285 , 8 ) ;
         Text = "~Vorlagen";
         Text [English] = "Styles";
         Text[ english_us ] = "Styl~es";
@@ -4512,10 +4538,10 @@ ModalDialog DLG_CREATE_AUTOMARK
             Text[ finnish ] = "Ei";
         };
     };
-    GroupBox        GB_ENTRIES
+    FixedLine        FL_ENTRIES
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 288, 194 ) ;
+        Size = MAP_APPFONT ( 288, 8 ) ;
         Text = "Eintr�ge" ;
         Text [ ENGLISH ] = "Entries" ;
         Text[ english_us ] = "Entries";
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index f6fdc4d8fbd3..735af11cbf24 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1005,7 +1005,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog
     CancelButton    aCancelBT;
     HelpButton      aHelpBT;
 
-    GroupBox        aEntriesGB;
+    FixedLine       aEntriesFL;
 
     FixedText*      pFixedTexts[AUTH_FIELD_END];
     ListBox*        pTypeListBox;
@@ -1523,7 +1523,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     aOKBT(this,         ResId(PB_OK         )),
     aCancelBT(this,     ResId(PB_CANCEL     )),
     aHelpBT(this,       ResId(PB_HELP       )),
-    aEntriesGB(this,    ResId(GB_ENTRIES    )),
+    aEntriesFL(this,    ResId(FL_ENTRIES    )),
     pIdentifierBox(0),
     pTypeListBox(0),
     rWrtSh(rSh),
@@ -1531,10 +1531,10 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     m_bNameAllowed(sal_True)
 {
     FreeResource();
-    Point aGBPos(aEntriesGB.GetPosPixel());
-    Point aTL1(aGBPos);
-    Size aGBSz(aEntriesGB.GetSizePixel());
-    long nControlSpace = aGBSz.Width() / 4;
+    Point aFLPos(aEntriesFL.GetPosPixel());
+    Point aTL1(aFLPos);
+    Size aFLSz(aEntriesFL.GetSizePixel().Width(), GetSizePixel().Height());
+    long nControlSpace = aFLSz.Width() / 4;
     long nControlWidth = nControlSpace - 2 * aTL1.X();
     aTL1.X() *= 2;
     aTL1.Y() *= 5;
@@ -1544,12 +1544,12 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     aTL2.X() += nControlSpace;
     Point aTR2(aTL2);
     aTR2.X() += nControlSpace;
-    Size aFixedTextSize(aGBSz);
+    Size aFixedTextSize(aFLSz);
     Size aTmpSz(8,10);
     aTmpSz = LogicToPixel(aTmpSz, MAP_APPFONT);
     aFixedTextSize.Height() = aTmpSz.Width();
     Size aEditSize(aFixedTextSize);
-    aFixedTextSize.Width() = nControlWidth + aGBPos.X();
+    aFixedTextSize.Width() = nControlWidth + aFLPos.X();
     aEditSize.Height() = aTmpSz.Height();
     aEditSize.Width() = nControlWidth;
 
@@ -1642,10 +1642,10 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     }
     EnableHdl(pTypeListBox);
 
-    long nHeightDiff = - aGBSz.Height();
-    aGBSz.Height() = aTL1.Y();
-    nHeightDiff += aGBSz.Height();
-    aEntriesGB.SetSizePixel(aGBSz);
+    long nHeightDiff = - aFLSz.Height();
+    aFLSz.Height() = aTL1.Y();
+    nHeightDiff += aFLSz.Height();
+//    aEntriesFL.SetSizePixel(aFLSz);
     Size aDlgSize(GetSizePixel());
     aDlgSize.Height() += nHeightDiff;
     SetSizePixel(aDlgSize);
@@ -1784,6 +1784,9 @@ void    SwAuthMarkModalDlg::Apply()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.10  2001/05/29 13:44:26  fme
+    Fix #86988#: Redesign of dialogs
+
     Revision 1.9  2001/05/25 14:43:23  fme
     Fix #86988#: Dialog redesign
 
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc
index cb761c91e628..0548d2c69d06 100644
--- a/sw/source/ui/index/idxmrk.hrc
+++ b/sw/source/ui/index/idxmrk.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.hrc,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,7 @@
 #define PB_OK       22
 #define PB_CANCEL   23
 #define PB_HELP     24
-#define GB_ENTRIES  25
+#define FL_ENTRIES  25
 #define PB_CREATEENTRY 26
 #define FL_ENTRY        27
 #define FT_TITLE    28
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 0829922578a1..1cbeb5050337 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.src,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-30 20:10:37 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 11:01:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1163,10 +1163,10 @@ ModalDialog DLG_CREATE_AUTH_ENTRY
         Pos = MAP_APPFONT ( 312 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    GroupBox GB_ENTRIES
+    FixedLine FL_ENTRIES
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 300 , 197 ) ;
+        Size = MAP_APPFONT ( 300 , 8 ) ;
         Text = "Eintragsdaten" ;
         Text [ ENGLISH ] = "Entry data" ;
         Text[ english_us ] = "Entry data";