summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorFrank Meies <fme@openoffice.org>2001-05-29 12:46:19 +0000
committerFrank Meies <fme@openoffice.org>2001-05-29 12:46:19 +0000
commit122aefb221441a8d803982d8a76c81c40ce60ec9 (patch)
treec4be3cb822086d7f7150932fe66414b32526c11b /sw/source
parent9eecd8284aa92db821e8ebd6794548279e0d68ec (diff)
Fix #86988#: Redesign of dialogs
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/frmdlg/column.cxx4
-rw-r--r--sw/source/ui/frmdlg/column.hrc6
-rw-r--r--sw/source/ui/frmdlg/column.src4
-rw-r--r--sw/source/ui/frmdlg/cption.cxx4
-rw-r--r--sw/source/ui/frmdlg/cption.hrc6
-rw-r--r--sw/source/ui/frmdlg/cption.src4
-rw-r--r--sw/source/ui/inc/bookmark.hxx10
-rw-r--r--sw/source/ui/inc/cnttab.hxx34
-rw-r--r--sw/source/ui/inc/column.hxx6
-rw-r--r--sw/source/ui/inc/cption.hxx6
-rw-r--r--sw/source/ui/inc/idxmrk.hxx6
-rw-r--r--sw/source/ui/index/cnttab.cxx83
-rw-r--r--sw/source/ui/index/cnttab.hrc25
-rw-r--r--sw/source/ui/index/cnttab.src525
-rw-r--r--sw/source/ui/index/idxmrk.cxx13
-rw-r--r--sw/source/ui/index/idxmrk.hrc8
-rw-r--r--sw/source/ui/index/idxmrk.src18
-rw-r--r--sw/source/ui/misc/bookmark.cxx9
-rw-r--r--sw/source/ui/misc/bookmark.hrc6
-rw-r--r--sw/source/ui/misc/bookmark.src10
20 files changed, 360 insertions, 427 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 4c337a079577..d1967635246c 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: column.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc
index cee1f2f4cfcc..399f9a54603a 100644
--- a/sw/source/ui/frmdlg/column.hrc
+++ b/sw/source/ui/frmdlg/column.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: column.hrc,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,7 +63,7 @@
#define FT_DISTANCE 3
#define ED_DISTANCE 4
#define CB_AUTO_WIDTH 4
-#define FL_COLUMNS 6
+#define FL_COLUMNS 6
#define FT_1 20
#define FT_2 21
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 1de241ccc319..6d9a3fc59cb2 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -2,9 +2,9 @@
*
* $RCSfile: column.src,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index dee65ce7c0b5..de544e33bd34 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cption.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc
index 6addea680cf9..b3f0e654775f 100644
--- a/sw/source/ui/frmdlg/cption.hrc
+++ b/sw/source/ui/frmdlg/cption.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: cption.hrc,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,7 +74,7 @@
#define TXT_POS 10
#define BOX_POS 11
#define FL_SETTINGS 12
-#define BTN_HELP 13
+#define BTN_HELP 13
#define BTN_OPTION 14
#define FL_HEADER 15
#define FT_LEVEL 16
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
index 247c7c0b8032..3a9dc87f1a8b 100644
--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -2,9 +2,9 @@
*
* $RCSfile: cption.src,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: fme $ $Date: 2001-05-29 13:28:26 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index c7978a2229fc..815623a478de 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bookmark.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,8 +65,8 @@
#include <svx/stddlg.hxx>
#endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
+#ifndef _SV_FIXED_HXX //autogen
+#include <vcl/fixed.hxx>
#endif
#ifndef _BUTTON_HXX //autogen
@@ -105,7 +105,7 @@ public:
class SwInsertBookmarkDlg: public SvxStandardDialog
{
BookmarkCombo aBookmarkBox;
- GroupBox aBookmarkFrm;
+ FixedLine aBookmarkFl;
OKButton aOkBtn;
CancelButton aCancelBtn;
PushButton aDeleteBtn;
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index 214faa87240d..d6d545472bd6 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cnttab.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2000-11-03 11:25:50 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,6 +148,7 @@ struct SwIndexSections_Impl;
class SwMultiTOXTabDialog : public SfxTabDialog
{
Window aExampleContainerWIN;
+ Window aDummyContainerWIN;
Window aExampleWIN;
CheckBox aShowExampleCB;
SwTOXMgr* pMgr;
@@ -226,19 +227,21 @@ public:
--------------------------------------------------*/
class SwTOXSelectTabPage : public SfxTabPage
{
+ FixedLine aTypeTitleFL;
+ FixedText aTitleFT;
+ Edit aTitleED;
FixedText aTypeFT;
ListBox aTypeLB;
CheckBox aReadOnlyCB;
- FixedText aTitleFT;
- Edit aTitleED;
- GroupBox aTypeTitleGB;
+ FixedLine aAreaFL;
+ FixedText aAreaFT;
ListBox aAreaLB;
FixedText aLevelFT; //content, user
NumericField aLevelNF; //content, user
- GroupBox aAreaGB;
//content
+ FixedLine aCreateFromFL; // content, user, illustration
CheckBox aFromHeadingsCB;
PushButton aChapterDlgPB;
CheckBox aAddStylesCB;
@@ -266,7 +269,6 @@ class SwTOXSelectTabPage : public SfxTabPage
CheckBox aTOXMarksCB;
//
- GroupBox aCreateFromGB; // content, user, illustration
//index only
CheckBox aCollectSameCB;
@@ -279,17 +281,17 @@ class SwTOXSelectTabPage : public SfxTabPage
MenuButton aAutoMarkPB;
// PushButton aCreateAutoMarkPB;
// PushButton aEditAutoMarkPB;
- GroupBox aIdxOptionsGB; // index only
+ FixedLine aIdxOptionsFL; // index only
// object only
SwOLENames aFromNames;
SvxCheckListBox aFromObjCLB;
- GroupBox aFromObjGB;
+ FixedLine aFromObjFL;
CheckBox aSequenceCB;
FixedText aBracketFT;
ListBox aBracketLB;
- GroupBox aAuthorityFormatGB;
+ FixedLine aAuthorityFormatFL;
Point aCBLeftPos1;
Point aCBLeftPos2;
@@ -455,18 +457,18 @@ class SwTOXEntryTabPage : public SfxTabPage
FixedText aTabPosFT;
MetricField aTabPosMF; // tab stop position
CheckBox aAutoRightCB;
- GroupBox aEntryGB;
+ FixedLine aEntryFL;
CheckBox aRelToStyleCB; // position relative to the right margin of the para style
FixedText aMainEntryStyleFT;
ListBox aMainEntryStyleLB; // character style of main entries in indexes
CheckBox aAlphaDelimCB;
CheckBox aCommaSeparatedCB;
- GroupBox aFormatGB;
+ FixedLine aFormatFL;
RadioButton aSortDocPosRB;
RadioButton aSortContentRB;
- GroupBox aSortingGB;
+ FixedLine aSortingFL;
FixedText aFirstKeyFT;
ListBox aFirstKeyLB;
@@ -483,7 +485,7 @@ class SwTOXEntryTabPage : public SfxTabPage
ImageRadioButton aThirdSortUpRB;
ImageRadioButton aThirdSortDownRB;
- GroupBox aSortKeyGB;
+ FixedLine aSortKeyFL;
String sDelimStr;
String sLevelStr;
@@ -546,9 +548,9 @@ class SwTOXStylesTabPage : public SfxTabPage
FixedText aTemplateFT;
ListBox aParaLayLB;
PushButton aStdBT;
- PushButton aAssignBT;
+ ImageButton aAssignBT;
PushButton aEditStyleBT;
- GroupBox aFormatGB;
+ FixedLine aFormatFL;
SwForm* pCurrentForm;
// void UpdatePattern();
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 0158588ff423..332a67e3f46a 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: column.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: ma $ $Date: 2001-04-12 15:36:58 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -166,6 +166,7 @@ class ColumnValueSet : public ValueSet
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
+
/*--------------------------------------------------------------------
Beschreibung: Spaltendialog jetzt als TabPage
--------------------------------------------------------------------*/
@@ -179,6 +180,7 @@ class SwColumnPage : public SfxTabPage
FixedLine aFLGroup;
ImageButton aBtnUp;
+ FixedText aColumnFT;
FixedText aWidthFT;
FixedText aDistFT;
FixedText aLbl1;
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx
index 80e8503d11f3..e781670d1c04 100644
--- a/sw/source/ui/inc/cption.hxx
+++ b/sw/source/ui/inc/cption.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cption.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: os $ $Date: 2001-03-28 14:55:20 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -133,7 +133,7 @@ class SwCaptionDialog : public SvxStandardDialog
CheckBox aCopyAttributesCB;
FixedText aObjectNameFT;
NoSpaceEdit aObjectNameED;
- GroupBox aSettingsGroup;
+ FixedLine aSettingsFL;
OKButton aOKButton;
CancelButton aCancelButton;
HelpButton aHelpButton;
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx
index 679425b28316..1ce39ffea1f6 100644
--- a/sw/source/ui/inc/idxmrk.hxx
+++ b/sw/source/ui/inc/idxmrk.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: idxmrk.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fme $ $Date: 2001-05-25 14:42:02 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -134,7 +134,7 @@ class SwIndexMarkDlg : public Window //SvxStandardDialog
CheckBox aSearchCaseSensitiveCB;
CheckBox aSearchCaseWordOnlyCB;
- GroupBox aIndexGB;
+ FixedLine aIndexFL;
OKButton aOKBT;
CancelButton aCancelBT;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f1043a77ac1a..4e943cb0e3b1 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.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: os $ $Date: 2001-05-15 10:02:40 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -456,6 +456,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
sal_uInt16 nToxType, sal_Bool bGlobal) :
SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet),
aExampleContainerWIN(this, ResId(WIN_EXAMPLE)),
+ aDummyContainerWIN(this, ResId(WIN_EXAMPLE)),
aExampleWIN( &aExampleContainerWIN, 0 ),
aShowExampleCB( this, ResId(CB_SHOWEXAMPLE)),
sUserDefinedIndex(ResId(ST_USERDEFINEDINDEX)),
@@ -469,8 +470,10 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
bGlobalFlag(bGlobal)
{
FreeResource();
+
aExampleWIN.SetPosSizePixel(aExampleContainerWIN.GetPosPixel(),
aExampleContainerWIN.GetSizePixel());
+
eCurrentTOXType.eType = TOX_CONTENT;
eCurrentTOXType.nIndex = 0;
@@ -542,10 +545,10 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
aShowExampleCB.Check( SW_MOD()->GetModuleConfig()->IsShowIndexPreview());
SetViewAlign( WINDOWALIGN_LEFT );
// SetViewWindow does not work if the dialog is visible!
+
if(!aShowExampleCB.IsChecked())
- {
SetViewWindow( &aExampleContainerWIN );
- }
+
Point aOldPos = GetPosPixel();
ShowPreviewHdl(0);
Point aNewPos = GetPosPixel();
@@ -777,10 +780,12 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
}
sal_Bool bSetViewWindow = aShowExampleCB.IsChecked()
&& pExampleFrame && pExampleFrame->IsServiceAvailable();
- aExampleContainerWIN.Show(bSetViewWindow);
- SetViewWindow( bSetViewWindow ? &aExampleContainerWIN : 0);
- Point aPos = GetPosPixel();
+ aExampleContainerWIN.Show( bSetViewWindow );
+ aDummyContainerWIN.Show( ! bSetViewWindow );
+ SetViewWindow( bSetViewWindow ? &aExampleContainerWIN : &aDummyContainerWIN );
+
+ Point aPos = GetPosPixel();
Size aSize = GetSizePixel();
if(pBox)
AdjustLayout();
@@ -1488,16 +1493,20 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
-----------------------------------------------------------------------*/
SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) :
SfxTabPage(pParent, SW_RES(TP_TOX_SELECT), rAttrSet),
+ aTypeTitleFL( this, ResId(FL_TYPETITLE )),
+ aTitleFT( this, ResId(FT_TITLE )),
+ aTitleED( this, ResId(ED_TITLE )),
aTypeFT( this, ResId(FT_TYPE )),
aTypeLB( this, ResId(LB_TYPE )),
aReadOnlyCB( this, ResId(CB_READONLY )),
- aTitleFT( this, ResId(FT_TITLE )),
- aTitleED( this, ResId(ED_TITLE )),
- aTypeTitleGB( this, ResId(GB_TYPETITLE )),
+
+ aAreaFL( this, ResId(FL_AREA )),
+ aAreaFT( this, ResId(FT_AREA )),
aAreaLB( this, ResId(LB_AREA )),
aLevelFT( this, ResId(FT_LEVEL )),
aLevelNF( this, ResId(NF_LEVEL )),
- aAreaGB( this, ResId(GB_AREA )),
+
+ aCreateFromFL( this, ResId(FL_CREATEFROM )),
aFromHeadingsCB( this, ResId(CB_FROMHEADINGS )),
aChapterDlgPB( this, ResId(PB_CHAPTERDLG )),
aAddStylesCB( this, ResId(CB_ADDSTYLES )),
@@ -1514,7 +1523,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aDisplayTypeFT( this, ResId(FT_DISPLAYTYPE )),
aDisplayTypeLB( this, ResId(LB_DISPLAYTYPE )),
aTOXMarksCB( this, ResId(CB_TOXMARKS )),
- aCreateFromGB( this, ResId(GB_CREATEFROM )),
+
aCollectSameCB( this, ResId(CB_COLLECTSAME )),
aUseFFCB( this, ResId(CB_USEFF )),
aUseDashCB( this, ResId(CB_USE_DASH )),
@@ -1526,14 +1535,14 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
// aFilePB( this, ResId(PB_FILE )),
// aCreateAutoMarkPB( this, ResId(PB_CREATE_AUTOMARK )),
// aEditAutoMarkPB( this, ResId(PB_EDIT_AUTOMARK )),
- aIdxOptionsGB( this, ResId(GB_IDXOPTIONS )),
+ aIdxOptionsFL( this, ResId(FL_IDXOPTIONS )),
aFromNames( ResId(RES_SRCTYPES )),
aFromObjCLB( this, ResId(CLB_FROMOBJ )),
- aFromObjGB( this, ResId(GB_FROMOBJ )),
+ aFromObjFL( this, ResId(FL_FROMOBJ )),
aSequenceCB( this, ResId(CB_SEQUENCE )),
aBracketFT( this, ResId(FT_BRACKET )),
aBracketLB( this, ResId(LB_BRACKET )),
- aAuthorityFormatGB( this, ResId(GB_AUTHORITY )),
+ aAuthorityFormatFL( this, ResId(FL_AUTHORITY )),
sAddStyleUser(ResId(ST_USER_ADDSTYLE)),
sAutoMarkType(ResId(ST_AUTOMARK_TYPE)),
bFirstCall(sal_True)
@@ -1969,7 +1978,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aLevelFT.Show(nType & (TO_CONTENT));
aLevelNF.Show(nType & (TO_CONTENT));
aLevelFromChapterCB.Show(nType & (TO_USER));
- aAreaGB.Show(nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT));
+ aAreaFL.Show(nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT));
aFromHeadingsCB.Show(nType & (TO_CONTENT));
aChapterDlgPB.Show(nType & (TO_CONTENT));
@@ -1986,7 +1995,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aTOXMarksCB.Show(nType & (TO_CONTENT|TO_USER));
- aCreateFromGB.Show(nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE));
+ aCreateFromFL.Show(nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE));
aCaptionSequenceFT.Show(nType & (TO_ILLUSTRATION|TO_TABLE));
aCaptionSequenceLB.Show(nType & (TO_ILLUSTRATION|TO_TABLE));
aDisplayTypeFT.Show(nType & (TO_ILLUSTRATION|TO_TABLE));
@@ -1995,7 +2004,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aSequenceCB.Show(nType & TO_AUTHORITIES);
aBracketFT.Show(nType & TO_AUTHORITIES);
aBracketLB.Show(nType & TO_AUTHORITIES);
- aAuthorityFormatGB.Show(nType & TO_AUTHORITIES);
+ aAuthorityFormatFL.Show(nType & TO_AUTHORITIES);
String sStr;
if(nType & TO_CONTENT)
@@ -2029,11 +2038,11 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
// aCreateAutoMarkPB.Show(nType &TO_INDEX);
// aEditAutoMarkPB.Show(nType & TO_INDEX);
- aIdxOptionsGB.Show(nType & TO_INDEX);
+ aIdxOptionsFL.Show(nType & TO_INDEX);
//object index
aFromObjCLB.Show(nType & TO_OBJECT);
- aFromObjGB.Show(nType & TO_OBJECT);
+ aFromObjFL.Show(nType & TO_OBJECT);
//move controls
aAddStylesCB.SetPosPixel(nType & TO_USER ? aCBLeftPos1 : aCBLeftPos2);
@@ -2487,17 +2496,17 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aTabPosFT(this, ResId(FT_TABPOS )),
aTabPosMF(this, ResId(MF_TABPOS )),
aAutoRightCB(this, ResId(CB_AUTORIGHT )),
- aEntryGB(this, ResId(GB_ENTRY )),
+ aEntryFL(this, ResId(FL_ENTRY )),
aRelToStyleCB(this, ResId(CB_RELTOSTYLE )),
aMainEntryStyleFT(this, ResId(FT_MAIN_ENTRY_STYLE)),
aMainEntryStyleLB(this, ResId(LB_MAIN_ENTRY_STYLE)),
aAlphaDelimCB(this, ResId(CB_ALPHADELIM )),
aCommaSeparatedCB(this, ResId(CB_COMMASEPARATED )),
- aFormatGB(this, ResId(GB_FORMAT )),
+ aFormatFL(this, ResId(FL_FORMAT )),
aSortDocPosRB(this, ResId(RB_DOCPOS )),
aSortContentRB(this, ResId(RB_SORTCONTENT )),
- aSortingGB(this, ResId(GB_SORTING )),
+ aSortingFL(this, ResId(FL_SORTING )),
aFirstKeyFT(this, ResId(FT_FIRSTKEY )),
aFirstKeyLB(this, ResId(LB_FIRSTKEY )),
@@ -2511,7 +2520,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aSecondSortDownRB(this, ResId(RB_SORTDOWN2 )),
aThirdSortUpRB(this, ResId(RB_SORTUP3 )),
aThirdSortDownRB(this, ResId(RB_SORTDOWN3 )),
- aSortKeyGB(this, ResId(GB_SORTKEY )),
+ aSortKeyFL(this, ResId(FL_SORTKEY )),
sNoCharStyle( ResId(STR_NO_CHAR_STYLE)),
sNoCharSortKey( ResId(STR_NOSORTKEY )),
sDelimStr( ResId(STR_DELIM)),
@@ -2799,12 +2808,12 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& rSet)
lcl_ChgWidth(aTokenWIN, -nDiff);
lcl_ChgXPos(aSortDocPosRB, nDiff);
lcl_ChgXPos(aSortContentRB, nDiff);
- lcl_ChgXPos(aFormatGB, nDiff);
- lcl_ChgWidth(aFormatGB, -nDiff);
- lcl_ChgXPos(aSortingGB, nDiff);
- lcl_ChgWidth(aSortingGB, -nDiff);
- lcl_ChgXPos(aEntryGB, nDiff);
- lcl_ChgWidth(aEntryGB, -nDiff);
+ lcl_ChgXPos(aFormatFL, nDiff);
+ lcl_ChgWidth(aFormatFL, -nDiff);
+ lcl_ChgXPos(aSortingFL, nDiff);
+ lcl_ChgWidth(aSortingFL, -nDiff);
+ lcl_ChgXPos(aEntryFL, nDiff);
+ lcl_ChgWidth(aEntryFL, -nDiff);
lcl_ChgXPos(aFirstKeyFT, nDiff);
lcl_ChgXPos(aFirstKeyLB, nDiff);
@@ -2812,12 +2821,12 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& rSet)
lcl_ChgXPos(aSecondKeyLB, nDiff);
lcl_ChgXPos(aThirdKeyFT, nDiff);
lcl_ChgXPos(aThirdKeyLB, nDiff);
- lcl_ChgXPos(aSortKeyGB, nDiff);
+ lcl_ChgXPos(aSortKeyFL, nDiff);
lcl_ChgWidth(aFirstKeyLB, -nDiff);
lcl_ChgWidth(aSecondKeyLB, -nDiff);
lcl_ChgWidth(aThirdKeyLB, -nDiff);
- lcl_ChgWidth(aSortKeyGB, -nDiff);
+ lcl_ChgWidth(aSortKeyFL, -nDiff);
}
Link aLink = aLevelLB.GetSelectHdl();
aLevelLB.SetSelectHdl(Link());
@@ -2847,17 +2856,17 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& rSet)
aAuthFieldsLB.Show( bToxIsAuthorities );
aAuthInsertPB.Show( bToxIsAuthorities );
aAuthRemovePB.Show( bToxIsAuthorities );
- aFormatGB.Show( !bToxIsAuthorities );
+ aFormatFL.Show( !bToxIsAuthorities );
aSortDocPosRB.Show( bToxIsAuthorities );
aSortContentRB.Show( bToxIsAuthorities );
- aSortingGB.Show( bToxIsAuthorities );
+ aSortingFL.Show( bToxIsAuthorities );
aFirstKeyFT.Show( bToxIsAuthorities );
aFirstKeyLB.Show( bToxIsAuthorities );
aSecondKeyFT.Show( bToxIsAuthorities );
aSecondKeyLB.Show( bToxIsAuthorities );
aThirdKeyFT.Show( bToxIsAuthorities );
aThirdKeyLB.Show( bToxIsAuthorities );
- aSortKeyGB.Show( bToxIsAuthorities );
+ aSortKeyFL.Show( bToxIsAuthorities );
aFirstSortUpRB.Show( bToxIsAuthorities );
aFirstSortDownRB.Show( bToxIsAuthorities );
aSecondSortUpRB.Show( bToxIsAuthorities );
@@ -3140,7 +3149,7 @@ IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, RadioButton*, pButton)
aSecondKeyLB.Enable(bEnable);
aThirdKeyFT.Enable(bEnable);
aThirdKeyLB.Enable(bEnable);
- aSortKeyGB.Enable(bEnable);
+ aSortKeyFL.Enable(bEnable);
aFirstSortUpRB.Enable(bEnable);
aFirstSortDownRB.Enable(bEnable);
aSecondSortUpRB.Enable(bEnable);
@@ -4179,7 +4188,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS
aStdBT(this, SW_RES(BT_STD )),
aAssignBT(this, SW_RES(BT_ASSIGN )),
aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )),
- aFormatGB(this, SW_RES(GB_FORMAT )),
+ aFormatFL(this, SW_RES(FL_FORMAT )),
pCurrentForm(0)
{
FreeResource();
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index d40988f28f6f..75fc69d6d5ad 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.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:43 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,13 +79,13 @@
#define BT_TAB 25
#define BT_STD 26
#define BT_PAGE 27
-#define GB_ENTRY 28
+#define FL_ENTRY 28
//#define FT_LEVEL 28
#define LB_LEVEL 29
#define FT_TEMPLATE 30
#define LB_PARALAY 31
#define BT_ASSIGN 32
-#define GB_FORMAT 33
+#define FL_FORMAT 33
#define BT_ENTRY 34
//#define BT_EDIT 34
#define BT_JUMP 35
@@ -118,11 +118,11 @@
#define CB_READONLY 3
#define FT_TITLE 4
//#define ED_TITLE 5
-#define GB_TYPETITLE 6
+#define FL_TYPETITLE 6
#define LB_AREA 7
//#define FT_LEVEL 8
#define NF_LEVEL 9
-#define GB_AREA 10
+#define FL_AREA 10
#define CB_FROMHEADINGS 11
#define PB_CHAPTERDLG 12
#define CB_ADDSTYLES 13
@@ -134,7 +134,7 @@
#define RB_FROMCAPTIONS 19
#define RB_FROMOBJECTNAMES 20
#define CB_TOXMARKS 21
-#define GB_CREATEFROM 22
+#define FL_CREATEFROM 22
#define CB_COLLECTSAME 23
#define CB_USEFF 24
#define CB_CASESENSITIVE 25
@@ -143,7 +143,7 @@
#define CB_FROMFILE 28
//#define PB_FILE 29
#define MB_AUTOMARK 29
-#define GB_IDXOPTIONS 30
+#define FL_IDXOPTIONS 30
//#define PB_CREATE_AUTOMARK 31
//#define PB_EDIT_AUTOMARK 32
@@ -179,12 +179,13 @@
#define STR_NO_CHAR_STYLE 61
#define CLB_FROMOBJ 62
-#define GB_FROMOBJ 63
+#define FL_FROMOBJ 63
#define RES_SRCTYPES 64
#define WIN_LEFT_SCROLL 65
#define WIN_CTRL_PARENT 66
#define WIN_RIGHT_SCROLL 67
#define PB_ALL_LEVELS 68
+#define FT_AREA 69
#define STR_BUTTON_TEXT_START 70
@@ -237,7 +238,7 @@
#define CB_SEQUENCE 122
#define FT_BRACKET 123
#define LB_BRACKET 124
-#define GB_AUTHORITY 125
+#define FL_AUTHORITY 125
#define RB_DOCPOS 126
#define RB_SORTCONTENT 127
#define FT_FIRSTKEY 128
@@ -246,8 +247,8 @@
#define LB_SECONDKEY 131
#define FT_THIRDDKEY 132
#define LB_THIRDKEY 133
-#define GB_SORTKEY 134
-#define GB_SORTING 135
+#define FL_SORTKEY 134
+#define FL_SORTING 135
#define STR_NOSORTKEY 136
#define RB_SORTUP1 137
#define RB_SORTUP2 138
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 1995b1f34211..ee78ac3d122e 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.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: kz $ $Date: 2001-05-17 08:16:40 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -334,8 +334,8 @@ TabDialog DLG_MULTI_TOX
};
Window WIN_EXAMPLE
{
- Pos = MAP_APPFONT ( 0 , 10 ) ;
- Size = MAP_APPFONT ( 150, 160 ) ;
+ Pos = MAP_APPFONT ( 0 , 12 ) ;
+ Size = MAP_APPFONT ( 150, 188 ) ;
};
String ST_USERDEFINEDINDEX
{
@@ -364,29 +364,9 @@ TabDialog DLG_MULTI_TOX
};
CheckBox CB_SHOWEXAMPLE
{
- Size = MAP_APPFONT ( 100, 10 ) ;
- Text = "~Vorschau anzeigen" ;
+ Size = MAP_APPFONT ( 200, 10 ) ;
+ Text = "~Vorschau" ;
Text [ ENGLISH ] = "Show ~preview" ;
- Text[ english_us ] = "Sho~w preview";
- Text[ portuguese ] = "~Mostrar Previsualizar";
- Text[ russian ] = " ";
- Text[ greek ] = "~ ";
- Text[ dutch ] = "~Voorbeeld weergeven";
- Text[ french ] = "Afficher l'~aperu";
- Text[ spanish ] = "Previsuali~zacin";
- Text[ italian ] = "Mostra anteprima";
- Text[ danish ] = "Vis eksempel";
- Text[ swedish ] = "~Visa frhandsvisning";
- Text[ polish ] = "Wy?wietl podgld";
- Text[ portuguese_brazilian ] = "Show ~preview";
- Text[ japanese ] = "ޭ̕\\(~W)";
- Text[ korean ] = "̸ Ÿ(~W)";
- Text[ chinese_simplified ] = "ʾԤ(~W)";
- Text[ chinese_traditional ] = "ܹw(~W)";
- Text[ arabic ] = " ";
- Text[ turkish ] = "nizlemeyi grntle";
- Text[ catalan ] = "Previsuali~zacin";
- Text[ finnish ] = "Nyt ~esikatselu";
};
Text[ english_us ] = "Insert Index";
Text[ portuguese ] = "Inserir ndice";
@@ -434,9 +414,71 @@ TabPage TP_TOX_SELECT
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedText FT_TYPE
+ FixedLine FL_TYPETITLE
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
+ Text = "Typ und Titel" ;
+ Text [ ENGLISH ] = "Type and title" ;
+ Text[ english_us ] = "Type and title";
+ Text[ portuguese ] = "Tipo e ttulo";
+ Text[ russian ] = " ";
+ Text[ greek ] = " ";
+ Text[ dutch ] = "Type en titel";
+ Text[ french ] = "Type et titre";
+ Text[ spanish ] = "Tipo y ttulo";
+ Text[ italian ] = "Tipo e titolo";
+ Text[ danish ] = "Type og overskrift";
+ Text[ swedish ] = "Typ och titel";
+ Text[ polish ] = "Typ i tytu";
+ Text[ portuguese_brazilian ] = "Type and title";
+ Text[ japanese ] = "ނ";
+ Text[ korean ] = " ";
+ Text[ chinese_simplified ] = "";
+ Text[ chinese_traditional ] = "MD";
+ Text[ arabic ] = " ";
+ Text[ turkish ] = "Tip ve balk";
+ Text[ language_user1 ] = " ";
+ Text[ catalan ] = "Tipo y ttulo";
+ Text[ finnish ] = "Tyyppi ja otsikko";
+ };
+ FixedText FT_TITLE
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
+ Size = MAP_APPFONT ( 30 ,10 ) ;
+ Text = "T~itel" ;
+ Text [ ENGLISH ] = "Title" ;
+ Text[ english_us ] = "~Title";
+ Text[ portuguese ] = "~Ttulo";
+ Text[ russian ] = "";
+ Text[ greek ] = "";
+ Text[ dutch ] = "T~itel";
+ Text[ french ] = "~Titre";
+ Text[ spanish ] = "Ttu~lo";
+ Text[ italian ] = "T~itolo";
+ Text[ danish ] = "Overskrift";
+ Text[ swedish ] = "T~itel";
+ Text[ polish ] = "Tytu";
+ Text[ portuguese_brazilian ] = "Title";
+ Text[ japanese ] = "(~T)";
+ Text[ korean ] = "(~T)";
+ Text[ chinese_simplified ] = "(~T)";
+ Text[ chinese_traditional ] = "D(~T)";
+ Text[ arabic ] = "";
+ Text[ turkish ] = "Balk";
+ Text[ language_user1 ] = " ";
+ Text[ catalan ] = "Ttu~lo";
+ Text[ finnish ] = "~Otsikko";
+ };
+ Edit ED_TITLE
+ {
+ Pos = MAP_APPFONT ( 45 , 14 ) ;
+ Size = MAP_APPFONT ( 203 , 12 ) ;
+ Border = TRUE;
+ };
+ FixedText FT_TYPE
+ {
+ Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 30, 10 ) ;
Text = "T~yp" ;
Text [ ENGLISH ] = "Type" ;
@@ -464,7 +506,7 @@ TabPage TP_TOX_SELECT
};
ListBox LB_TYPE
{
- Pos = MAP_APPFONT ( 45 , 14 ) ;
+ Pos = MAP_APPFONT ( 45 , 30 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -701,7 +743,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_READONLY
{
- Pos = MAP_APPFONT ( 130 , 16 ) ;
+ Pos = MAP_APPFONT ( 51 , 46 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
Text = "G~eschtzt vor manuellen nderungen" ;
Text [ ENGLISH ] = "Protected against manual changes" ;
@@ -728,72 +770,24 @@ TabPage TP_TOX_SELECT
Text[ catalan ] = "Protegido contra modificaciones ~manuales";
Text[ finnish ] = "Suojattu manuaalisilta muutoksilta";
};
- FixedText FT_TITLE
- {
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 30 ,10 ) ;
- Text = "T~itel" ;
- Text [ ENGLISH ] = "Title" ;
- Text[ english_us ] = "~Title";
- Text[ portuguese ] = "~Ttulo";
- Text[ russian ] = "";
- Text[ greek ] = "";
- Text[ dutch ] = "T~itel";
- Text[ french ] = "~Titre";
- Text[ spanish ] = "Ttu~lo";
- Text[ italian ] = "T~itolo";
- Text[ danish ] = "Overskrift";
- Text[ swedish ] = "T~itel";
- Text[ polish ] = "Tytu";
- Text[ portuguese_brazilian ] = "Title";
- Text[ japanese ] = "(~T)";
- Text[ korean ] = "(~T)";
- Text[ chinese_simplified ] = "(~T)";
- Text[ chinese_traditional ] = "D(~T)";
- Text[ arabic ] = "";
- Text[ turkish ] = "Balk";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Ttu~lo";
- Text[ finnish ] = "~Otsikko";
- };
- Edit ED_TITLE
+ FixedLine FL_AREA
{
- Pos = MAP_APPFONT ( 45 , 30 ) ;
- Size = MAP_APPFONT ( 203 , 12 ) ;
- Border = TRUE;
+ Pos = MAP_APPFONT ( 6 , 59 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
+ Text = "~Verzeichnis erstellen" ;
+ Text [ ENGLISH ] = "Create index of" ;
};
- GroupBox GB_TYPETITLE
+ FixedText FT_AREA
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248, 42 ) ;
- Text = "Typ und Titel" ;
- Text [ ENGLISH ] = "Type and title" ;
- Text[ english_us ] = "Type and title";
- Text[ portuguese ] = "Tipo e ttulo";
- Text[ russian ] = " ";
- Text[ greek ] = " ";
- Text[ dutch ] = "Type en titel";
- Text[ french ] = "Type et titre";
- Text[ spanish ] = "Tipo y ttulo";
- Text[ italian ] = "Tipo e titolo";
- Text[ danish ] = "Type og overskrift";
- Text[ swedish ] = "Typ och titel";
- Text[ polish ] = "Typ i tytu";
- Text[ portuguese_brazilian ] = "Type and title";
- Text[ japanese ] = "ނ";
- Text[ korean ] = " ";
- Text[ chinese_simplified ] = "";
- Text[ chinese_traditional ] = "MD";
- Text[ arabic ] = " ";
- Text[ turkish ] = "Tip ve balk";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Tipo y ttulo";
- Text[ finnish ] = "Tyyppi ja otsikko";
+ Pos = MAP_APPFONT ( 12 , 72 ) ;
+ Size = MAP_APPFONT ( 30, 8 ) ;
+ Text = "Fr" ;
+ Text [ ENGLISH ] = "Type" ;
};
ListBox LB_AREA
{
- Pos = MAP_APPFONT ( 12 , 59 ) ;
- Size = MAP_APPFONT ( 113 , 12 ) ;
+ Pos = MAP_APPFONT ( 45 , 70 ) ;
+ Size = MAP_APPFONT ( 80 , 12 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList =
@@ -912,37 +906,9 @@ TabPage TP_TOX_SELECT
< "Luku" ; AREA_CHAPTER ;> ;
};
};
- FixedText FT_LEVEL
- {
- Pos = MAP_APPFONT ( 145 , 61 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
- Text = "A~uswerten bis Ebene" ;
- Text [ ENGLISH ] = "Evaluation level" ;
- Text[ english_us ] = "Evaluation level";
- Text[ portuguese ] = "A~valiar at nvel";
- Text[ russian ] = " ";
- Text[ greek ] = " ";
- Text[ dutch ] = "~Aantal niveaus";
- Text[ french ] = "~Niveau de profondeur souhait";
- Text[ spanish ] = "E~valuar hasta nivel";
- Text[ italian ] = "Val~uta fino a livello";
- Text[ danish ] = "Evaluer indtil niveau";
- Text[ swedish ] = "~Utvrdera till niv";
- Text[ polish ] = "Ewaluuj do poziomu";
- Text[ portuguese_brazilian ] = "Evaluation level";
- Text[ japanese ] = "ق܂œKp";
- Text[ korean ] = "򰡣";
- Text[ chinese_simplified ] = "⼶";
- Text[ chinese_traditional ] = "]ADŧO";
- Text[ arabic ] = " ";
- Text[ turkish ] = "u dzeye kadar:";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "E~valuar hasta nivel";
- Text[ finnish ] = "Arviointitaso";
- };
NumericField NF_LEVEL
{
- Pos = MAP_APPFONT ( 228 , 59 ) ;
+ Pos = MAP_APPFONT ( 51 , 86 ) ;
Size = MAP_APPFONT ( 20 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -954,38 +920,45 @@ TabPage TP_TOX_SELECT
Value = 10 ;
SpinSize = 1 ;
};
- GroupBox GB_AREA
+ FixedText FT_LEVEL
{
- Pos = MAP_APPFONT ( 6 , 48 ) ;
- Size = MAP_APPFONT ( 248, 26 ) ;
- Text = "~Verzeichnis erstellen fr" ;
- Text [ ENGLISH ] = "Create index of" ;
- Text[ english_us ] = "Create index for";
- Text[ portuguese ] = "Criar n~dice para";
- Text[ russian ] = " ";
- Text[ greek ] = " ";
- Text[ dutch ] = "~Index maken voor";
- Text[ french ] = "Crer un ~index pour";
- Text[ spanish ] = "Crear ~ndice para";
- Text[ italian ] = "Crea indice per";
- Text[ danish ] = "Opret indeks for";
- Text[ swedish ] = "Skapa f~rteckning fr";
- Text[ polish ] = "Utwrz indeks dla";
- Text[ portuguese_brazilian ] = "Create index of";
- Text[ japanese ] = "쐬̑Ώ";
- Text[ korean ] = " ";
- Text[ chinese_simplified ] = "Ŀ¼";
- Text[ chinese_traditional ] = "ͥؿΩ";
- Text[ arabic ] = " ";
- Text[ turkish ] = "unun iin dizin olutur:";
+ Pos = MAP_APPFONT ( 77 , 88 ) ;
+ Size = MAP_APPFONT ( 80 , 8 ) ;
+ Text = "Ebenen auswerten" ;
+ Text [ ENGLISH ] = "Evaluation level" ;
+ };
+ FixedLine FL_CREATEFROM
+ {
+ Pos = MAP_APPFONT ( 6 , 101 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
+ Text = "Erzeugen aus" ;
+ Text [ ENGLISH ] = "Create from" ;
+ Text[ english_us ] = "Create from";
+ Text[ portuguese ] = "Criar a partir de";
+ Text[ russian ] = " ";
+ Text[ greek ] = " ";
+ Text[ dutch ] = "Maken van";
+ Text[ french ] = "Crer partir de";
+ Text[ spanish ] = "Crear de";
+ Text[ italian ] = "Crea da";
+ Text[ danish ] = "Opret ud fra";
+ Text[ swedish ] = "Skapa frn";
+ Text[ polish ] = "Utwrz z";
+ Text[ portuguese_brazilian ] = "Create from";
+ Text[ japanese ] = "e";
+ Text[ korean ] = "κ ";
+ Text[ chinese_simplified ] = "ɲ";
+ Text[ chinese_traditional ] = "s@q";
+ Text[ arabic ] = " ";
+ Text[ turkish ] = "Kaynak";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear ~ndice para";
- Text[ finnish ] = "Luo hakemisto";
+ Text[ catalan ] = "Crear de";
+ Text[ finnish ] = "Luo";
};
CheckBox CB_FROMHEADINGS
{
- Pos = MAP_APPFONT ( 12 , 90 ) ;
- Size = MAP_APPFONT ( 95 , 8 ) ;
+ Pos = MAP_APPFONT ( 12 , 113 ) ;
+ Size = MAP_APPFONT ( 95 , 10 ) ;
Check = TRUE;
Text = "~Gliederung" ;
Text [ ENGLISH ] = "Outline" ;
@@ -1013,14 +986,14 @@ TabPage TP_TOX_SELECT
};
PushButton PB_CHAPTERDLG
{
- Pos = MAP_APPFONT ( 115 , 88 ) ;
+ Pos = MAP_APPFONT ( 115 , 112 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "~..." ;
TabStop = TRUE ;
};
CheckBox CB_ADDSTYLES
{
- Pos = MAP_APPFONT ( 12 , 106 ) ;
+ Pos = MAP_APPFONT ( 12 , 129 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text = "~weiteren Vorlagen" ;
Text [ ENGLISH ] = "additional styles" ;
@@ -1074,14 +1047,14 @@ TabPage TP_TOX_SELECT
};
PushButton PB_ADDSTYLES
{
- Pos = MAP_APPFONT ( 115 , 104 ) ;
+ Pos = MAP_APPFONT ( 115 , 128 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "..." ;
TabStop = TRUE ;
};
CheckBox CB_TOXMARKS
{
- Pos = MAP_APPFONT ( 12 , 120 ) ;
+ Pos = MAP_APPFONT ( 12 , 145 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text = "Verzeichnism~arkierungen" ;
Text [ ENGLISH ] = "Index entries" ;
@@ -1106,9 +1079,10 @@ TabPage TP_TOX_SELECT
Text[ catalan ] = "Mar~cas del ndice";
Text[ finnish ] = "Hake~mistomerkit";
};
+
RadioButton RB_FROMCAPTIONS
{
- Pos = MAP_APPFONT ( 12 , 88 ) ;
+ Pos = MAP_APPFONT ( 12 , 112 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text = "Bes~chriftungen" ;
Text [ ENGLISH ] = "Captions" ;
@@ -1136,8 +1110,8 @@ TabPage TP_TOX_SELECT
};
FixedText FT_CAPTIONSEQUENCE
{
- Pos = MAP_APPFONT ( 12 , 104 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 128 ) ;
+ Size = MAP_APPFONT ( 40 , 8 ) ;
Text = "~Kategorie" ;
Text [ ENGLISH ] = "Category" ;
Text[ english_us ] = "Category";
@@ -1164,15 +1138,15 @@ TabPage TP_TOX_SELECT
};
ListBox LB_CAPTIONSEQUENCE
{
- Pos = MAP_APPFONT ( 55 , 102 ) ;
+ Pos = MAP_APPFONT ( 55 , 126 ) ;
Size = MAP_APPFONT ( 70 , 40 ) ;
DropDown = TRUE;
TabStop = TRUE;
};
FixedText FT_DISPLAYTYPE
{
- Pos = MAP_APPFONT ( 12 , 120 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 144 ) ;
+ Size = MAP_APPFONT ( 40 , 8 ) ;
Text = "~Anzeige" ;
Text [ ENGLISH ] = "Display" ;
Text[ english_us ] = "Display";
@@ -1199,7 +1173,7 @@ TabPage TP_TOX_SELECT
};
ListBox LB_DISPLAYTYPE
{
- Pos = MAP_APPFONT ( 55 , 118 ) ;
+ Pos = MAP_APPFONT ( 55 , 142 ) ;
Size = MAP_APPFONT ( 70 , 40 ) ;
DropDown = TRUE;
TabStop = TRUE;
@@ -1344,7 +1318,7 @@ TabPage TP_TOX_SELECT
};
RadioButton RB_FROMOBJECTNAMES
{
- Pos = MAP_APPFONT ( 156 , 88 ) ;
+ Pos = MAP_APPFONT ( 156 , 112 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text = "Obje~ktnamen" ;
Text [ ENGLISH ] = "Object names" ;
@@ -1370,37 +1344,9 @@ TabPage TP_TOX_SELECT
Text[ catalan ] = "Nombres de o~bjeto";
Text[ finnish ] = "Objektien nimet";
};
- GroupBox GB_CREATEFROM
- {
- Pos = MAP_APPFONT ( 6 , 77 ) ;
- Size = MAP_APPFONT ( 248, 56 ) ;
- Text = "Erzeugen aus" ;
- Text [ ENGLISH ] = "Create from" ;
- Text[ english_us ] = "Create from";
- Text[ portuguese ] = "Criar a partir de";
- Text[ russian ] = " ";
- Text[ greek ] = " ";
- Text[ dutch ] = "Maken van";
- Text[ french ] = "Crer partir de";
- Text[ spanish ] = "Crear de";
- Text[ italian ] = "Crea da";
- Text[ danish ] = "Opret ud fra";
- Text[ swedish ] = "Skapa frn";
- Text[ polish ] = "Utwrz z";
- Text[ portuguese_brazilian ] = "Create from";
- Text[ japanese ] = "e";
- Text[ korean ] = "κ ";
- Text[ chinese_simplified ] = "ɲ";
- Text[ chinese_traditional ] = "s@q";
- Text[ arabic ] = " ";
- Text[ turkish ] = "Kaynak";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear de";
- Text[ finnish ] = "Luo";
- };
CheckBox CB_COLLECTSAME
{
- Pos = MAP_APPFONT ( 12 , 88 ) ;
+ Pos = MAP_APPFONT ( 12 , 112 ) ;
Size = MAP_APPFONT ( 121 , 10 ) ;
Text = "Zusammenfassen ~gleicher Eintrge" ;
Text [ ENGLISH ] = "Combine identical entries" ;
@@ -1427,7 +1373,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_USEFF
{
- Pos = MAP_APPFONT ( 18 , 101 ) ;
+ Pos = MAP_APPFONT ( 18 , 125 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text = "Zusammenfassen mit ~f oder ff" ;
Text [ english ] = "Combine identical entries with ~pp." ;
@@ -1454,7 +1400,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_USE_DASH
{
- Pos = MAP_APPFONT ( 18 , 114 ) ;
+ Pos = MAP_APPFONT ( 18 , 138 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text = "Zusammenfassen ~mit -" ;
Text [ english ] = "Combine identical entries with -" ;
@@ -1481,7 +1427,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_CASESENSITIVE
{
- Pos = MAP_APPFONT ( 18 , 127 ) ;
+ Pos = MAP_APPFONT ( 18 , 151 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text = "Gro- und ~Kleinschreibung beachten" ;
Text [ ENGLISH ] = "Case sensitive" ;
@@ -1509,7 +1455,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_INITIALCAPS
{
- Pos = MAP_APPFONT ( 136 , 88 ) ;
+ Pos = MAP_APPFONT ( 136 , 112 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text = "Eintrge ~automatisch groschreiben";
Text [ ENGLISH ] = "Capitalize entries";
@@ -1537,7 +1483,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_KEYASENTRY
{
- Pos = MAP_APPFONT ( 136, 102 ) ;
+ Pos = MAP_APPFONT ( 136, 125 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text = "~Schlssel als eigener Eintrag" ;
Text [ ENGLISH ] = "Keys as separate entries" ;
@@ -1564,7 +1510,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_FROMFILE
{
- Pos = MAP_APPFONT ( 136 , 116 ) ;
+ Pos = MAP_APPFONT ( 136 , 138 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text = "Konko~rdanzdatei" ;
Text [ ENGLISH ] = "...file??" ;
@@ -1591,7 +1537,7 @@ TabPage TP_TOX_SELECT
};
MenuButton MB_AUTOMARK
{
- Pos = MAP_APPFONT ( 144 , 129 ) ;
+ Pos = MAP_APPFONT ( 144 , 152 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text = "~Datei" ;
Text [ ENGLISH ] = "File" ;
@@ -1703,7 +1649,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_FROMTABLES
{
- Pos = MAP_APPFONT ( 112 , 88 ) ;
+ Pos = MAP_APPFONT ( 112 , 113 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text = "~Tabellen" ;
Text [ ENGLISH ] = "Tables" ;
@@ -1731,7 +1677,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_FROMFRAMES
{
- Pos = MAP_APPFONT ( 182 , 88 ) ;
+ Pos = MAP_APPFONT ( 182 , 113 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text = "Te~xtrahmen" ;
Text [ ENGLISH ] = "Text frames" ;
@@ -1759,7 +1705,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_FROMGRAPHICS
{
- Pos = MAP_APPFONT ( 112 , 102 ) ;
+ Pos = MAP_APPFONT ( 112 , 127 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text = "~Grafiken" ;
Text [ ENGLISH ] = "Graphics" ;
@@ -1787,7 +1733,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_FROMOLE
{
- Pos = MAP_APPFONT ( 182 , 102 ) ;
+ Pos = MAP_APPFONT ( 182 , 127 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text = "~OLE-Objekten" ;
Text [ ENGLISH ] = "OLE objects" ;
@@ -1815,7 +1761,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_LEVELFROMCHAPTER
{
- Pos = MAP_APPFONT ( 118 , 115 ) ;
+ Pos = MAP_APPFONT ( 118 , 141 ) ;
Size = MAP_APPFONT ( 103 , 10 ) ;
Text = "Ebene aus Urs~prungskapitel" ;
Text [ ENGLISH ] = "Use level from source" ;
@@ -1840,11 +1786,10 @@ TabPage TP_TOX_SELECT
Text[ catalan ] = "Nivel del captulo orige~n";
Text[ finnish ] = "Kyt lhdeluvun tasoa";
};
-
- GroupBox GB_IDXOPTIONS
+ FixedLine FL_IDXOPTIONS
{
- Pos = MAP_APPFONT ( 6 , 77 ) ;
- Size = MAP_APPFONT ( 248, 69 ) ;
+ Pos = MAP_APPFONT ( 6 , 101 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
Text = "Zustze" ;
Text [ ENGLISH ] = "Options" ;
Text[ english_us ] = "Options";
@@ -1871,7 +1816,7 @@ TabPage TP_TOX_SELECT
};
Control CLB_FROMOBJ
{
- Pos = MAP_APPFONT ( 12 , 88 ) ;
+ Pos = MAP_APPFONT ( 12 , 112 ) ;
Size = MAP_APPFONT ( 236 , 55 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -2074,10 +2019,10 @@ TabPage TP_TOX_SELECT
};
};
};
- GroupBox GB_FROMOBJ
+ FixedLine FL_FROMOBJ
{
- Pos = MAP_APPFONT ( 6 , 77) ;
- Size = MAP_APPFONT ( 248, 69 ) ;
+ Pos = MAP_APPFONT ( 6 , 101) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
Text = "Aus folgenden Objekten erzeugen" ;
Text [ ENGLISH ] = "Create from the following objects" ;
Text[ english_us ] = "Create from the following objects";
@@ -2104,7 +2049,7 @@ TabPage TP_TOX_SELECT
};
CheckBox CB_SEQUENCE
{
- Pos = MAP_APPFONT ( 12, 59) ;
+ Pos = MAP_APPFONT ( 12, 70) ;
Size = MAP_APPFONT ( 100, 10 ) ;
Text = "~Eintrge nummerieren" ;
Text [ ENGLISH ] = "Number entries" ;
@@ -2132,7 +2077,7 @@ TabPage TP_TOX_SELECT
};
FixedText FT_BRACKET
{
- Pos = MAP_APPFONT ( 12, 75) ;
+ Pos = MAP_APPFONT ( 12, 86) ;
Size = MAP_APPFONT ( 60, 8 ) ;
Text = "~Klammern" ;
Text [ ENGLISH ] = "Brackets" ;
@@ -2160,7 +2105,7 @@ TabPage TP_TOX_SELECT
};
ListBox LB_BRACKET
{
- Pos = MAP_APPFONT ( 75, 73) ;
+ Pos = MAP_APPFONT ( 75, 84) ;
Size = MAP_APPFONT ( 20, 50 ) ;
Border = TRUE;
DropDown = TRUE;
@@ -2172,10 +2117,10 @@ TabPage TP_TOX_SELECT
< "<>" ;> ;
};
};
- GroupBox GB_AUTHORITY
+ FixedLine FL_AUTHORITY
{
- Pos = MAP_APPFONT ( 6 , 48) ;
- Size = MAP_APPFONT ( 248, 40 ) ;
+ Pos = MAP_APPFONT ( 6 , 59) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
Text = "Formatierung der Eintrge" ;
Text [ ENGLISH ] = "Formatting of the marks" ;
Text[ english_us ] = "Formatting of the entries";
@@ -2810,7 +2755,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_ENTRYNO
{
- Pos = MAP_APPFONT ( 37 , 31 ) ;
+ Pos = MAP_APPFONT ( 37 , 32 ) ;
Size = MAP_APPFONT ( 40, 14 ) ;
Text = "~Kapitelnr." ;
Text [ ENGLISH ] = "Chapter no." ;
@@ -2838,7 +2783,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_ENTRY
{
- Pos = MAP_APPFONT ( 80, 31 ) ;
+ Pos = MAP_APPFONT ( 80, 32 ) ;
Size = MAP_APPFONT ( 40, 14 ) ;
Text = "~Eintragstext" ;
Text [ ENGLISH ] = "Entry text" ;
@@ -2866,7 +2811,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_CHAPTERINFO
{
- Pos = MAP_APPFONT ( 123 , 31 ) ;
+ Pos = MAP_APPFONT ( 123 , 32 ) ;
Size = MAP_APPFONT ( 40, 14) ;
Text = "~Kapitelinfo" ;
Text [ ENGLISH ] = "Chapter info" ;
@@ -2894,7 +2839,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_PAGENO
{
- Pos = MAP_APPFONT ( 166 , 31 ) ;
+ Pos = MAP_APPFONT ( 166 , 32 ) ;
Size = MAP_APPFONT ( 40, 14 ) ;
Text = "~Seitennr." ;
Text [ ENGLISH ] = "Page no." ;
@@ -2922,7 +2867,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_TAB
{
- Pos = MAP_APPFONT ( 209 ,31 ) ;
+ Pos = MAP_APPFONT ( 209 ,32 ) ;
Size = MAP_APPFONT ( 40, 14 ) ;
Text = "~Tabulator" ;
Text [ ENGLISH ] = "Tab stop" ;
@@ -2950,7 +2895,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_HYPERLINK
{
- Pos = MAP_APPFONT ( 209 , 31 ) ;
+ Pos = MAP_APPFONT ( 209 , 32 ) ;
Size = MAP_APPFONT ( 40, 14 ) ;
Text = "H~yperlink" ;
Text [ ENGLISH ] = "Hyperlink" ;
@@ -2978,7 +2923,7 @@ TabPage TP_TOX_ENTRY
};
ListBox LB_AUTHFIELD
{
- Pos = MAP_APPFONT ( 37 , 32 ) ;
+ Pos = MAP_APPFONT ( 37 , 33 ) ;
Size = MAP_APPFONT ( 59, 60 ) ;
DropDown = TRUE;
Border = TRUE;
@@ -2986,7 +2931,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_AUTHINSERT
{
- Pos = MAP_APPFONT ( 99 , 31 ) ;
+ Pos = MAP_APPFONT ( 99 , 32 ) ;
Size = MAP_APPFONT ( 39, 14 ) ;
Text = "~Einfgen" ;
Text [ ENGLISH ] = "Insert" ;
@@ -3014,7 +2959,7 @@ TabPage TP_TOX_ENTRY
};
PushButton PB_AUTHREMOVE
{
- Pos = MAP_APPFONT ( 142 , 31 ) ;
+ Pos = MAP_APPFONT ( 142 , 32 ) ;
Size = MAP_APPFONT ( 39, 14 ) ;
Text = "~Entfernen" ;
Text [ ENGLISH ] = "Remove" ;
@@ -3042,8 +2987,8 @@ TabPage TP_TOX_ENTRY
};
FixedText FT_CHARSTYLE
{
- Pos = MAP_APPFONT ( 37 , 51 ) ;
- Size = MAP_APPFONT (60 , 10 ) ;
+ Pos = MAP_APPFONT ( 37 , 55 ) ;
+ Size = MAP_APPFONT (60 , 8 ) ;
Text = "Zeichen~vorlage" ;
Text [ ENGLISH ] = "Character style" ;
Text[ english_us ] = "Character Style";
@@ -3070,14 +3015,14 @@ TabPage TP_TOX_ENTRY
};
ListBox LB_CHARSTYLE
{
- Pos = MAP_APPFONT ( 100 , 49 ) ;
- Size = MAP_APPFONT ( 98, 40 ) ;
+ Pos = MAP_APPFONT ( 100 , 53 ) ;
+ Size = MAP_APPFONT ( 93, 60 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
PushButton PB_EDITSTYLE
{
- Pos = MAP_APPFONT ( 199 , 48 ) ;
+ Pos = MAP_APPFONT ( 199 , 52 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text = "~Bearbeiten..." ;
Text [ ENGLISH ] = "Edit..." ;
@@ -3105,7 +3050,7 @@ TabPage TP_TOX_ENTRY
};
FixedText FT_FILLCHAR
{
- Pos = MAP_APPFONT ( 37 , 67 ) ;
+ Pos = MAP_APPFONT ( 37 , 71 ) ;
Size = MAP_APPFONT (60 , 8 ) ;
Text = "~Fllzeichen" ;
Text [ ENGLISH ] = "Fill character" ;
@@ -3133,15 +3078,15 @@ TabPage TP_TOX_ENTRY
};
ComboBox CB_FILLCHAR
{
- Pos = MAP_APPFONT ( 100 , 65 ) ;
- Size = MAP_APPFONT ( 20, 40 ) ;
+ Pos = MAP_APPFONT ( 100 , 69 ) ;
+ Size = MAP_APPFONT ( 40, 40 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_CHAPTERENTRY
{
- Pos = MAP_APPFONT ( 37 , 67 ) ;
- Size = MAP_APPFONT ( 60, 10 ) ;
+ Pos = MAP_APPFONT ( 37 , 71 ) ;
+ Size = MAP_APPFONT ( 60, 8 ) ;
Text = "Ka~piteleintrag" ;
Text [ ENGLISH ] = "Chapter entry" ;
Text[ english_us ] = "Chapter entry";
@@ -3168,8 +3113,8 @@ TabPage TP_TOX_ENTRY
};
ListBox LB_CHAPTERENTRY
{
- Pos = MAP_APPFONT ( 100 , 65 ) ;
- Size = MAP_APPFONT ( 98, 40 ) ;
+ Pos = MAP_APPFONT ( 100 , 69 ) ;
+ Size = MAP_APPFONT ( 93, 40 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList =
@@ -3313,7 +3258,7 @@ TabPage TP_TOX_ENTRY
};
FixedText FT_TABPOS
{
- Pos = MAP_APPFONT ( 37 , 83 ) ;
+ Pos = MAP_APPFONT ( 37 , 87 ) ;
Size = MAP_APPFONT ( 60, 8 ) ;
Text = "Tab~ulatorposition" ;
Text [ ENGLISH ] = "Tab stop position" ;
@@ -3341,8 +3286,8 @@ TabPage TP_TOX_ENTRY
};
MetricField MF_TABPOS
{
- Pos = MAP_APPFONT ( 100 , 81 ) ;
- Size = MAP_APPFONT ( 40, 10 ) ;
+ Pos = MAP_APPFONT ( 100 , 85 ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
Left = TRUE ;
@@ -3359,36 +3304,15 @@ TabPage TP_TOX_ENTRY
};
CheckBox CB_AUTORIGHT
{
- Pos = MAP_APPFONT ( 143 , 83 ) ;
+ Pos = MAP_APPFONT ( 143 , 86 ) ;
Size = MAP_APPFONT ( 100, 10 ) ;
- Text = "Am ~rechten Rand" ;
+ Text = "Rechtsbndig" ;
Text [ ENGLISH ] = "Right border" ;
- Text[ english_us ] = "T~o right margin";
- Text[ portuguese ] = "Na margem ~direita";
- Text[ russian ] = " ";
- Text[ greek ] = " ";
- Text[ dutch ] = "Aan rechter ~marge";
- Text[ french ] = "Bord ~droit";
- Text[ spanish ] = "Al bor~de derecho";
- Text[ italian ] = "Bordo dest~ro";
- Text[ danish ] = "Ved hjre margen";
- Text[ swedish ] = "Vid hgermarginalen";
- Text[ polish ] = "Z prawej krawdzi";
- Text[ portuguese_brazilian ] = "Right border";
- Text[ japanese ] = "߰މE[(~O)";
- Text[ korean ] = " (~O)";
- Text[ chinese_simplified ] = "ұ߿հ(~O)";
- Text[ chinese_traditional ] = "bkťդW(~O)";
- Text[ arabic ] = " ";
- Text[ turkish ] = "Sa kenar";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Al bor~de derecho";
- Text[ finnish ] = "Oikea ~ylreuna";
};
- GroupBox GB_ENTRY
+ FixedLine FL_ENTRY
{
Pos = MAP_APPFONT ( 34 , 3 ) ;
- Size = MAP_APPFONT ( 220, 93 ) ;
+ Size = MAP_APPFONT ( 220, 8 ) ;
Text = "Aufbau" ;
Text [ ENGLISH ] = "Structure" ;
Text[ english_us ] = "Structure";
@@ -3444,7 +3368,7 @@ TabPage TP_TOX_ENTRY
FixedText FT_MAIN_ENTRY_STYLE
{
Pos = MAP_APPFONT ( 37 , 112 ) ;
- Size = MAP_APPFONT ( 105, 10 ) ;
+ Size = MAP_APPFONT ( 105, 8 ) ;
Text = "Zeichenvorla~ge fr Haupteintrge" ;
Text [ ENGLISH ] = "Character style of main entries" ;
Text[ english_us ] = "Character Style for main entries";
@@ -3533,10 +3457,10 @@ TabPage TP_TOX_ENTRY
Text[ catalan ] = "Cla~ves separadas por comas";
Text[ finnish ] = "Pilkuilla erotettu avainsana";
};
- GroupBox GB_FORMAT
+ FixedLine FL_FORMAT
{
Pos = MAP_APPFONT ( 34 , 99 ) ;
- Size = MAP_APPFONT ( 220, 83 ) ;
+ Size = MAP_APPFONT ( 220, 8 ) ;
Text = "Formatierung" ;
Text [ ENGLISH ] = "Format" ;
Text[ english_us ] = "Format";
@@ -3563,7 +3487,7 @@ TabPage TP_TOX_ENTRY
};
RadioButton RB_DOCPOS
{
- Pos = MAP_APPFONT ( 40 , 110) ;
+ Pos = MAP_APPFONT ( 40 , 113) ;
Size = MAP_APPFONT ( 80, 10 ) ;
Text = "Dokument~position " ;
Text [ ENGLISH ] = "document position" ;
@@ -3590,7 +3514,7 @@ TabPage TP_TOX_ENTRY
};
RadioButton RB_SORTCONTENT
{
- Pos = MAP_APPFONT ( 134 , 110 ) ;
+ Pos = MAP_APPFONT ( 134 , 113 ) ;
Size = MAP_APPFONT ( 80, 10 ) ;
Text = "~Inhalt" ;
Text [ ENGLISH ] = "content" ;
@@ -3616,10 +3540,10 @@ TabPage TP_TOX_ENTRY
Text[ catalan ] = "C~ontenido";
Text[ finnish ] = "~Sislt";
};
- GroupBox GB_SORTING
+ FixedLine FL_SORTING
{
- Pos = MAP_APPFONT ( 34 , 99 ) ;
- Size = MAP_APPFONT ( 220, 24 ) ;
+ Pos = MAP_APPFONT ( 34 , 102 ) ;
+ Size = MAP_APPFONT ( 220, 8 ) ;
Text = "Sortierung nach" ;
Text [ ENGLISH ] = "Sort by" ;
Text[ english_us ] = "Sort by";
@@ -3896,10 +3820,10 @@ TabPage TP_TOX_ENTRY
Border = TRUE;
DropDown = TRUE;
};
- GroupBox GB_SORTKEY
+ FixedLine FL_SORTKEY
{
Pos = MAP_APPFONT ( 34 , 126) ;
- Size = MAP_APPFONT ( 220, 56 ) ;
+ Size = MAP_APPFONT ( 220, 8 ) ;
Text = "Sortierschlssel" ;
Text [ ENGLISH ] = "Sort keys" ;
Text[ english_us ] = "Sort keys";
@@ -4042,13 +3966,13 @@ TabPage TP_TOX_STYLES
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 25 ) ;
- Size = MAP_APPFONT ( 115 , 131 ) ;
+ Size = MAP_APPFONT ( 102 , 131 ) ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_TEMPLATE
{
- Pos = MAP_APPFONT ( 133 , 14 ) ;
+ Pos = MAP_APPFONT ( 142 , 14 ) ;
Size = MAP_APPFONT ( 54 , 8 ) ;
Text = "~Absatzvorlagen" ;
Text [ ENGLISH ] = "~Paragraph styles" ;
@@ -4079,15 +4003,15 @@ TabPage TP_TOX_STYLES
ListBox LB_PARALAY
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 133 , 25 ) ;
- Size = MAP_APPFONT ( 110 , 131 ) ;
+ Pos = MAP_APPFONT ( 142 , 25 ) ;
+ Size = MAP_APPFONT ( 101 , 131 ) ;
TabStop = TRUE ;
Sort = TRUE ;
AutoHScroll = TRUE ;
};
PushButton BT_STD
{
- Pos = MAP_APPFONT ( 32 , 162 ) ;
+ Pos = MAP_APPFONT ( 64 , 162 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text = "Sta~ndard" ;
Text [ ENGLISH ] = "Sta~ndard" ;
@@ -4114,39 +4038,28 @@ TabPage TP_TOX_STYLES
Text[ catalan ] = "~Predeterminado";
Text[ finnish ] = "~Oletusarvo";
};
- PushButton BT_ASSIGN
+ ImageButton BT_ASSIGN
{
- Pos = MAP_APPFONT ( 133 , 162 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text = "<- ~Zuordnen" ;
- Text [ ENGLISH ] = "<- ~Assign" ;
- Text [ norwegian ] = "<- ~Tilordne" ;
- Text [ italian ] = "<- ~Assegna" ;
- Text [ portuguese_brazilian ] = "<- ~Designar" ;
- Text [ portuguese ] = "<- ~Atribuir" ;
- Text [ finnish ] = "<- ~Liit" ;
- Text [ danish ] = "<- Tildel" ;
- Text [ french ] = "<- Assigner" ;
- Text [ swedish ] = "<- Ti~lldela" ;
- Text [ dutch ] = "<- ~Toewijzen" ;
- Text [ spanish ] = "<- ~Asignar" ;
- Text [ english_us ] = "<- ~Assign" ;
+ Pos = MAP_APPFONT ( 118 , 28 ) ;
+ Size = MAP_APPFONT ( 20 , 12 ) ;
TabStop = TRUE ;
- Text[ chinese_simplified ] = "<- ָ(~A)";
- Text[ russian ] = "<- ~";
- Text[ polish ] = "<- Przypis~z";
- Text[ japanese ] = "<- Kp(~A)";
- Text[ chinese_traditional ] = "<- w(~A)";
- Text[ arabic ] = "<- ";
- Text[ greek ] = "<- ";
- Text[ korean ] = "<- (~A)";
- Text[ turkish ] = "<- Ata";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "<- ~Asignar";
+ ButtonImage = Image
+ {
+ ImageBitmap = Bitmap
+ {
+ File = "one_left.bmp" ;
+ };
+ MaskColor = Color
+ {
+ Red = 0xC000 ;
+ Green = 0xC000 ;
+ Blue = 0xC000 ;
+ };
+ };
};
PushButton BT_EDIT_STYLE
{
- Pos = MAP_APPFONT ( 186 , 162 ) ;
+ Pos = MAP_APPFONT ( 193 , 162 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text = "~Bearbeiten" ;
Text [ ENGLISH ] = "~Edit" ;
@@ -4173,10 +4086,10 @@ TabPage TP_TOX_STYLES
Text[ catalan ] = "~Editar";
Text[ finnish ] = "~Muokkaa";
};
- GroupBox GB_FORMAT
+ FixedLine FL_FORMAT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 179 ) ;
+ Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Zuordnung" ;
Text [ ENGLISH ] = "Assignment" ;
Text[ english_us ] = "Assignment";
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 3834b8ecee2d..f6fdc4d8fbd3 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.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -224,7 +224,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
aApplyToAllCB(this,SW_RES(CB_APPLY_TO_ALL)),
aSearchCaseSensitiveCB(this, SW_RES(CB_CASESENSITIVE )),
aSearchCaseWordOnlyCB(this, SW_RES(CB_WORDONLY )),
- aIndexGB(this, SW_RES(GB_INDEX )),
+ aIndexFL(this, SW_RES(FL_INDEX )),
bSelected(sal_False)
{
SetStyle(GetStyle()|WB_DIALOGCONTROL);
@@ -607,7 +607,7 @@ class SwNewUserIdxDlg : public ModalDialog
OKButton aOKPB;
CancelButton aCancelPB;
HelpButton aHelpPB;
- GroupBox aNameGB;
+ FixedLine aNameFL;
FixedText aNameFT;
Edit aNameED;
@@ -622,7 +622,7 @@ class SwNewUserIdxDlg : public ModalDialog
aOKPB(this, ResId( PB_OK )),
aCancelPB(this, ResId( PB_CANCEL )),
aHelpPB(this, ResId( PB_HELP )),
- aNameGB(this, ResId( GB_NAME )),
+ aNameFL(this, ResId( FL_NAME )),
aNameFT(this, ResId( FT_NAME )),
aNameED(this, ResId( ED_NAME ))
{
@@ -1784,6 +1784,9 @@ void SwAuthMarkModalDlg::Apply()
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.9 2001/05/25 14:43:23 fme
+ Fix #86988#: Dialog redesign
+
Revision 1.8 2001/03/27 21:47:24 jp
optimize SeachOption initialisation
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc
index 53cbfa105854..cb761c91e628 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.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,7 +74,7 @@
#define DCB_KEY 6
#define LBL_LEVEL 7
#define SL_LEVEL 8
-#define GB_INDEX 10
+#define FL_INDEX 10
#define LBL_KEY2 11
#define DCB_KEY2 12
#define CB_APPLY_TO_ALL 13
@@ -94,7 +94,7 @@
#define ST_CHANGE 32
#define WIN_DLG 33
#define BT_NEW 34
-#define GB_NAME 37
+#define FL_NAME 37
#define FT_NAME 38
#define ED_NAME 39
#define LB_ENTRY 40
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index d9b11da0f619..566e0b597715 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.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:44:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -228,10 +228,10 @@
TabStop = TRUE ; \
SYMBOL = IMAGEBUTTON_LAST ; \
}; \
- GroupBox GB_INDEX \
+ FixedLine FL_INDEX \
{ \
Pos = MAP_APPFONT ( 6 , 3 ) ; \
- Size = MAP_APPFONT ( 151 , GB_HEIGHT ) ; \
+ Size = MAP_APPFONT ( 151 , 8 ) ; \
Text = "Markierung" ; \
Text [ ENGLISH ] = "Mark" ; \
Text [ norwegian ] = "Merk" ; \
@@ -621,10 +621,10 @@ ModalDialog DLG_NEW_USER_IDX
Pos = MAP_APPFONT ( 141 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
- GroupBox GB_NAME
+ FixedLine FL_NAME
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 132 , 54 ) ;
+ Size = MAP_APPFONT ( 130 , 8 ) ;
Text = "Neues Benutzerverzeichnis" ;
Text [ ENGLISH ] = "New user index name" ;
@@ -652,8 +652,8 @@ ModalDialog DLG_NEW_USER_IDX
};
FixedText FT_NAME
{
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 17 ) ;
+ Size = MAP_APPFONT ( 40 , 8 ) ;
Text = "~Name" ;
Text [ ENGLISH ] = "Name" ;
@@ -683,7 +683,7 @@ ModalDialog DLG_NEW_USER_IDX
{
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 15 ) ;
- Size = MAP_APPFONT ( 80 , 12 ) ;
+ Size = MAP_APPFONT ( 78 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d6c208b6da57..de11eebba6ef 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bookmark.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:46:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -180,7 +180,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS ) :
SvxStandardDialog(pParent,SW_RES(DLG_INSERT_BOOKMARK)),
aBookmarkBox(this,SW_RES(CB_BOOKMARK)),
- aBookmarkFrm(this,SW_RES(GB_BOOKMARK)),
+ aBookmarkFl(this,SW_RES(FL_BOOKMARK)),
aOkBtn(this,SW_RES(BT_OK)),
aCancelBtn(this,SW_RES(BT_CANCEL)),
aDeleteBtn(this,SW_RES(BT_DELETE)),
@@ -355,6 +355,9 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:44 hr
+ initial import
+
Revision 1.50 2000/09/18 16:05:55 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/misc/bookmark.hrc b/sw/source/ui/misc/bookmark.hrc
index ea0efd8bf21f..c63b853091b0 100644
--- a/sw/source/ui/misc/bookmark.hrc
+++ b/sw/source/ui/misc/bookmark.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: bookmark.hrc,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:46:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,7 @@
#define CB_BOOKMARK 1
-#define GB_BOOKMARK 2
+#define FL_BOOKMARK 2
#define BT_OK 20
#define BT_CANCEL 21
diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src
index b412139b555a..fc959af53fc3 100644
--- a/sw/source/ui/misc/bookmark.src
+++ b/sw/source/ui/misc/bookmark.src
@@ -2,9 +2,9 @@
*
* $RCSfile: bookmark.src,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: rt $ $Date: 2001-05-10 06:42:04 $
+ * last change: $Author: fme $ $Date: 2001-05-29 13:46:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -101,7 +101,7 @@ ModalDialog DLG_INSERT_BOOKMARK
ComboBox CB_BOOKMARK
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 99 , 70 ) ;
+ Size = MAP_APPFONT ( 99 , 76 ) ;
TABSTOP = TRUE ;
AutoHScroll = TRUE ;
SORT = TRUE ;
@@ -137,10 +137,10 @@ ModalDialog DLG_INSERT_BOOKMARK
TEXT[ turkish ] = "~Sil";
TEXT[ catalan ] = "~Eliminar";
};
- GroupBox GB_BOOKMARK
+ FixedLine FL_BOOKMARK
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 111 , 87 ) ;
+ Size = MAP_APPFONT ( 111 , 8 ) ;
TEXT = "Textmarken" ;
TEXT [ English ] = "Bookmarks" ;
TEXT [ norwegian ] = "Bokmerker" ;