diff options
| author | Frank Meies <fme@openoffice.org> | 2001-06-01 10:04:53 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-06-01 10:04:53 +0000 |
| commit | 88e9759680ffba1b8d492cab38b4c82acde8c6f5 (patch) | |
| tree | 68f433cf182bb062f37ae1b52a26322ed8281b71 /sw/source | |
| parent | 2999d1545e7685d0541b1f27aa3a57c615347e9f (diff) | |
Fix #86988#: Redesign of dialogs
Diffstat (limited to 'sw/source')
59 files changed, 483 insertions, 522 deletions
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index b82d51ec2d32..2d2970061486 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -2,9 +2,9 @@ * * $RCSfile: selglos.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:52:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,14 +85,14 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const String &rShortName) : ModalDialog(pParent, SW_RES(DLG_SEL_GLOS)), aGlosBox(this, SW_RES( LB_GLOS)), - aGlosFrm(this, SW_RES( GB_GLOS)), + aGlosFL(this, SW_RES( FL_GLOS)), aOKBtn(this, SW_RES( BT_OK)), aCancelBtn(this, SW_RES( BT_CANCEL)), aHelpBtn(this, SW_RES(BT_HELP)) { - String sText(aGlosFrm.GetText()); + String sText(aGlosFL.GetText()); sText += rShortName; - aGlosFrm.SetText(sText); + aGlosFL.SetText(sText); FreeResource(); aGlosBox.SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl)); @@ -113,6 +113,9 @@ IMPL_LINK(SwSelGlossaryDlg, DoubleClickHdl, ListBox*, pBox) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:35 hr + initial import + Revision 1.16 2000/09/18 16:05:22 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/dochdl/selglos.hrc b/sw/source/ui/dochdl/selglos.hrc index a5657aed1323..a42f126c1ecd 100644 --- a/sw/source/ui/dochdl/selglos.hrc +++ b/sw/source/ui/dochdl/selglos.hrc @@ -2,9 +2,9 @@ * * $RCSfile: selglos.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:52:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,4 +62,4 @@ #define BT_CANCEL 101 #define BT_HELP 102 #define LB_GLOS 1 -#define GB_GLOS 2 +#define FL_GLOS 2 diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index ebe206fe0675..bc4a13a3dcd9 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -2,9 +2,9 @@ * * $RCSfile: selglos.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:12:23 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:52:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,10 +105,10 @@ ModalDialog DLG_SEL_GLOS Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_GLOS + FixedLine FL_GLOS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 152 , 91 ) ; + Size = MAP_APPFONT ( 152 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? AutoTexte zum Krzel : AutoTexte zum Krzel */ Text = "AutoTexte zum Krzel " ; Text [ ENGLISH ] = "Entries for Short Name " ; diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 430ecf66d48e..e2cebe349d9f 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.hrc @@ -2,9 +2,9 @@ * * $RCSfile: label.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2001-02-09 09:07:12 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ #define LB_DATABASE 5 #define FT_TABLE 6 #define LB_TABLE 7 -#define GRP_WRITING 8 +#define FL_WRITING 8 #define BTN_CONT 9 #define BTN_SHEET 10 #define TXT_MAKE 11 @@ -83,7 +83,7 @@ #define TXT_TYPE 13 #define BOX_TYPE 14 #define INF_FORMAT 15 -#define GRP_FORMAT 16 +#define FL_FORMAT 16 #define FT_DBFIELD 17 #define LB_DBFIELD 18 #define BTN_INSERT 19 @@ -95,12 +95,11 @@ #define FT_AUTO_TEXT_GROUP 4 #define LB_AUTO_TEXT_GROUP 5 #define ED_TEXT 6 -#define GB_CONTENT 7 +#define FL_CONTENT 7 #define WIN_EXAMPLE 8 -#define GB_EXAMPLE 9 #define ST_VISCARD_GROUP 10 -#define GB_DATA 30 +#define FL_DATA 30 #define FT_NAME 31 #define ED_FIRSTNAME 32 #define ED_NAME 33 diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index e942dd540ac2..6b15d3246d87 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.src @@ -2,9 +2,9 @@ * * $RCSfile: label.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:20:57 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -358,7 +358,7 @@ TabPage TP_LAB_LAB }; FixedText FT_DATABASE { - Pos = MAP_APPFONT ( 149 , 27 ) ; + Pos = MAP_APPFONT ( 149 , 16 ) ; Size = MAP_APPFONT ( 99 , 8 ) ; Text = "~Datenbank" ; Text [ English ] = "Database" ; @@ -388,14 +388,14 @@ TabPage TP_LAB_LAB ListBox LB_DATABASE { Border = TRUE ; - Pos = MAP_APPFONT ( 149 , 38 ) ; + Pos = MAP_APPFONT ( 149 , 27 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; TabStop = TRUE ; DropDown = TRUE ; }; FixedText FT_TABLE { - Pos = MAP_APPFONT ( 149 , 54 ) ; + Pos = MAP_APPFONT ( 149 , 45 ) ; Size = MAP_APPFONT ( 99 , 8 ) ; Text = "Tabe~lle" ; Text [ ENGLISH ] = "Table" ; @@ -424,21 +424,21 @@ TabPage TP_LAB_LAB ListBox LB_TABLE { Border = TRUE ; - Pos = MAP_APPFONT ( 149 , 65 ) ; + Pos = MAP_APPFONT ( 149 , 56 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ImageButton BTN_INSERT { - Pos = MAP_APPFONT ( 124 , 104 ) ; + Pos = MAP_APPFONT ( 124 , 92 ) ; Size = MAP_APPFONT ( 18 , 12 ) ; SYMBOL = IMAGEBUTTON_ARROW_LEFT ; TabStop = TRUE ; }; FixedText FT_DBFIELD { - Pos = MAP_APPFONT ( 149 , 93 ) ; + Pos = MAP_APPFONT ( 149 , 81 ) ; Size = MAP_APPFONT ( 99 , 8 ) ; Text = "Datenbank~feld" ; Text [ English ] = "Database field" ; @@ -468,15 +468,15 @@ TabPage TP_LAB_LAB ListBox LB_DBFIELD { Border = TRUE ; - Pos = MAP_APPFONT ( 149 , 104 ) ; + Pos = MAP_APPFONT ( 149 , 92 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GRP_WRITING + FixedLine FL_WRITING { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 119 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Group = TRUE ; Text = "Aufschrift" ; Text [ English ] = "Writing" ; @@ -646,10 +646,10 @@ TabPage TP_LAB_LAB Size = MAP_APPFONT ( 236 , 8 ) ; Left = TRUE ; }; - GroupBox GRP_FORMAT + FixedLine FL_FORMAT { Pos = MAP_APPFONT ( 6 , 125 ) ; - Size = MAP_APPFONT ( 248 , 54 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Group = TRUE ; Text = "Format" ; Text [ English ] = "Format" ; @@ -823,10 +823,10 @@ TabPage TP_VISITING_CARDS TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GB_CONTENT + FixedLine FL_CONTENT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 121 , 179 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Inhalt" ; Text [ English ] = "Content" ; Text[ english_us ] = "Content"; @@ -856,33 +856,6 @@ TabPage TP_VISITING_CARDS Pos = MAP_APPFONT ( 139, 14 ) ; Size = MAP_APPFONT ( 109 , 162 ) ; }; - GroupBox GB_EXAMPLE - { - Pos = MAP_APPFONT ( 133 , 3 ) ; - Size = MAP_APPFONT ( 121 , 179 ) ; - Text = "Vorschau" ; - Text [ English ] = "Preview" ; - Text[ english_us ] = "Preview"; - Text[ portuguese ] = "Previsualizar"; - Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Voorbeeld"; - Text[ french ] = "Aperu"; - Text[ spanish ] = "Previsualizacin"; - Text[ italian ] = "Anteprima"; - Text[ danish ] = "Eksempel"; - Text[ swedish ] = "Frhandsvisning"; - Text[ polish ] = "Podgld"; - Text[ portuguese_brazilian ] = "Preview"; - Text[ japanese ] = "ޭ"; - Text[ korean ] = "̸"; - Text[ chinese_simplified ] = "Ԥ"; - Text[ chinese_traditional ] = "w"; - Text[ arabic ] = ""; - Text[ turkish ] = "nizleme"; - Text[ catalan ] = "Previsualizacin"; - Text[ finnish ] = "Esikatselu"; - }; String ST_VISCARD_GROUP { Text = "Cards"; @@ -893,10 +866,10 @@ TabPage TP_PRIVATE_DATA HelpID = HID_TP_PRIVATE_DATA ; Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; - GroupBox GB_DATA + FixedLine FL_DATA { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 154 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Private Daten" ; Text [ English ] = "Private data" ; Text[ english_us ] = "Private data"; @@ -1285,10 +1258,10 @@ TabPage TP_BUSINESS_DATA HelpID = HID_TP_BUSINESS_DATA; Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; - GroupBox GB_DATA + FixedLine FL_DATA { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 170 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Geschftliche Daten" ; Text [ English ] = "Business data" ; Text[ english_us ] = "Business data"; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index e5fe40b0f191..0c3c6db782a4 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: label1.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2001-04-27 11:29:00 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -531,7 +531,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : aInsertBT (this, SW_RES(BTN_INSERT )), aDBFieldFT (this, SW_RES(FT_DBFIELD )), aDBFieldLB (this, SW_RES(LB_DBFIELD )), - aWritingGroup (this, SW_RES(GRP_WRITING)), + aWritingFL (this, SW_RES(FL_WRITING)), aContButton (this, SW_RES(BTN_CONT )), aSheetButton (this, SW_RES(BTN_SHEET )), aMakeText (this, SW_RES(TXT_MAKE )), @@ -539,7 +539,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : aTypeText (this, SW_RES(TXT_TYPE )), aTypeBox (this, SW_RES(BOX_TYPE )), aFormatInfo (this, SW_RES(INF_FORMAT )), - aFormatGroup (this, SW_RES(GRP_FORMAT )) + aFormatFL (this, SW_RES(FL_FORMAT )) { WaitObject aWait( pParent ); @@ -604,14 +604,14 @@ void SwLabPage::SetToBusinessCard() aInsertBT.Hide(); aDBFieldFT.Hide(); aDBFieldLB.Hide(); - aWritingGroup.Hide(); + aWritingFL.Hide(); //resize the form - Point aGBPos(aWritingGroup.GetPosPixel()); - long nDiffPos = aFormatGroup.GetPosPixel().Y() - aGBPos.Y(); - Size aGBSz(aFormatGroup.GetSizePixel()); -// aGBSz.Height() += nDiffPos; - aFormatGroup.SetPosSizePixel(aGBPos, aGBSz); + Point aFLPos(aWritingFL.GetPosPixel()); + long nDiffPos = aFormatFL.GetPosPixel().Y() - aFLPos.Y(); + Size aFLSz(aFormatFL.GetSizePixel()); +// aFLSz.Height() += nDiffPos; + aFormatFL.SetPosSizePixel(aFLPos, aFLSz); // move all controls up lcl_ChgYPos(aContButton, -nDiffPos); @@ -955,9 +955,8 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) aAutoTextLB(this, ResId( LB_AUTO_TEXT )), aAutoTextGroupFT(this, ResId( FT_AUTO_TEXT_GROUP )), aAutoTextGroupLB(this, ResId( LB_AUTO_TEXT_GROUP )), - aContentGB(this, ResId( GB_CONTENT )), + aContentFL(this, ResId( FL_CONTENT )), aExampleWIN(this, ResId( WIN_EXAMPLE )), - aExampleGB(this, ResId( GB_EXAMPLE )), sVisCardGroup(ResId(ST_VISCARD_GROUP)), pExampleFrame(0) { @@ -1311,7 +1310,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, --------------------------------------------------*/ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_PRIVATE_DATA), rSet), - aDataGB (this, ResId( GB_DATA )), + aDataFL (this, ResId( FL_DATA )), aNameFT (this, ResId( FT_NAME )), aFirstNameED (this, ResId( ED_FIRSTNAME )), aNameED (this, ResId( ED_NAME )), @@ -1432,7 +1431,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet) --------------------------------------------------*/ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet), - aDataGB (this, ResId( GB_DATA )), + aDataFL (this, ResId( FL_DATA )), aCompanyFT (this, ResId( FT_COMP )), aCompanyED (this, ResId( ED_COMP )), aCompanyExtFT (this, ResId( FT_COMP_EXT )), diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 8f9eb27061d6..211fa6b85199 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-01-24 09:03:23 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -665,7 +665,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) : ModalDialog(pParent, SW_RES(DLG_SAVE_LABEL)), rLabRec(rRec), pLabPage(pParent), - aOptionsGB(this,ResId(GB_OPTIONS )), + aOptionsFL(this,ResId(FL_OPTIONS )), aMakeFT(this, ResId(FT_MAKE )), aMakeCB(this, ResId(CB_MAKE )), aTypeFT(this, ResId(FT_TYPE )), diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc index f6b8eb5dc845..da4f16d728c4 100644 --- a/sw/source/ui/envelp/labfmt.hrc +++ b/sw/source/ui/envelp/labfmt.hrc @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-01-24 09:03:23 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,12 +85,12 @@ #define FLD_COLUMNS 15 #define TXT_ROWS 16 #define FLD_ROWS 17 -#define GRP_NONAME 18 +#define FL_NONAME 18 #define PB_SAVE 19 #define FI_MAKE 20 #define FI_TYPE 21 -#define GB_OPTIONS 1 +#define FL_OPTIONS 1 #define FT_MAKE 2 #define CB_MAKE 3 #define FT_TYPE 4 diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index e82ebb3e0095..2e63a074d82c 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-01-24 09:03:23 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ public: ---------------------------------------------------------------------------*/ class SwSaveLabelDlg : public ModalDialog { - GroupBox aOptionsGB; + FixedLine aOptionsFL; FixedText aMakeFT; ComboBox aMakeCB; FixedText aTypeFT; diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 62281e2b0888..240be4336e69 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:23:05 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,12 +82,12 @@ TabPage TP_LAB_FMT Window WIN_PREVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( 108 , 18 ) ; + Pos = MAP_APPFONT ( 108 , 17 ) ; Size = MAP_APPFONT ( 146 , 161 ) ; }; FixedText TXT_HDIST { - Pos = MAP_APPFONT ( 6 , 8 ) ; + Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Horiz. Abstand" ; Text [ English ] = "Horiz. distance" ; @@ -119,7 +119,7 @@ TabPage TP_LAB_FMT MetricField FLD_HDIST { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 6 ) ; + Pos = MAP_APPFONT ( 60 , 17 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -131,7 +131,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_VDIST { - Pos = MAP_APPFONT ( 6 , 24 ) ; + Pos = MAP_APPFONT ( 6 , 35 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Vert. Abstand" ; Text [ English ] = "Vert. distance" ; @@ -162,7 +162,7 @@ TabPage TP_LAB_FMT MetricField FLD_VDIST { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 22 ) ; + Pos = MAP_APPFONT ( 60 , 33 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -174,7 +174,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_WIDTH { - Pos = MAP_APPFONT ( 6 , 40 ) ; + Pos = MAP_APPFONT ( 6 , 51 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Breite" ; Text [ English ] = "Width" ; @@ -205,7 +205,7 @@ TabPage TP_LAB_FMT MetricField FLD_WIDTH { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 38 ) ; + Pos = MAP_APPFONT ( 60 , 49 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -217,7 +217,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_HEIGHT { - Pos = MAP_APPFONT ( 6 , 56 ) ; + Pos = MAP_APPFONT ( 6 , 67 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "H~he" ; Text [ English ] = "Height" ; @@ -248,7 +248,7 @@ TabPage TP_LAB_FMT MetricField FLD_HEIGHT { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 54 ) ; + Pos = MAP_APPFONT ( 60 , 65 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -260,7 +260,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_LEFT { - Pos = MAP_APPFONT ( 6 , 72 ) ; + Pos = MAP_APPFONT ( 6 , 83 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Rand ~links" ; Text [ English ] = "Left margin" ; @@ -291,7 +291,7 @@ TabPage TP_LAB_FMT MetricField FLD_LEFT { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 70 ) ; + Pos = MAP_APPFONT ( 60 , 81 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -305,7 +305,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_UPPER { - Pos = MAP_APPFONT ( 6 , 88 ) ; + Pos = MAP_APPFONT ( 6 , 99 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Rand ~oben" ; Text [ English ] = "Upper margin" ; @@ -336,7 +336,7 @@ TabPage TP_LAB_FMT MetricField FLD_UPPER { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 86 ) ; + Pos = MAP_APPFONT ( 60 , 97 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -350,7 +350,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_COLUMNS { - Pos = MAP_APPFONT ( 6 , 104 ) ; + Pos = MAP_APPFONT ( 6 , 115 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Spalten" ; Text [ English ] = "Columns" ; @@ -381,7 +381,7 @@ TabPage TP_LAB_FMT NumericField FLD_COLUMNS { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 102 ) ; + Pos = MAP_APPFONT ( 60 , 113 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -392,7 +392,7 @@ TabPage TP_LAB_FMT }; FixedText TXT_ROWS { - Pos = MAP_APPFONT ( 6 , 120 ) ; + Pos = MAP_APPFONT ( 6 , 131 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Zeilen" ; Text [ English ] = "Rows" ; @@ -423,7 +423,7 @@ TabPage TP_LAB_FMT NumericField FLD_ROWS { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 118 ) ; + Pos = MAP_APPFONT ( 60 , 129 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -434,7 +434,7 @@ TabPage TP_LAB_FMT }; PushButton PB_SAVE { - Pos = MAP_APPFONT ( 50 , 137 ) ; + Pos = MAP_APPFONT ( 50 , 148 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text = "~Speichern..." ; Text [ English ] = "Save..." ; @@ -757,10 +757,10 @@ ModalDialog DLG_SAVE_LABEL Size = MAP_APPFONT ( 100 , 12 ) ; Border = TRUE; }; - GroupBox GB_OPTIONS + FixedLine FL_OPTIONS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 165 , 54 ) ; + Size = MAP_APPFONT ( 165 , 8 ) ; Text = "Optionen"; Text [ ENGLISH ] = "Options" ; Text[ english_us ] = "Options"; diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index b6df439d3342..ec9fb8de2289 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: labimp.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jp $ $Date: 2001-04-26 19:45:44 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,6 @@ #ifndef _SVEDIT_HXX //autogen #include <svtools/svmedit.hxx> #endif -#ifndef _SV_GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _SV_FIELD_HXX //autogen #include <vcl/field.hxx> #endif @@ -273,7 +270,7 @@ class SwLabPage : public SfxTabPage FixedText aDBFieldFT; ListBox aDBFieldLB; // PushButton aDatabaseButton; - GroupBox aWritingGroup; + FixedLine aWritingFL; RadioButton aContButton; RadioButton aSheetButton; @@ -282,7 +279,7 @@ class SwLabPage : public SfxTabPage FixedText aTypeText; ListBox aTypeBox; FixedInfo aFormatInfo; - GroupBox aFormatGroup; + FixedLine aFormatFL; sal_Bool m_bLabel; @@ -328,10 +325,9 @@ class SwVisitingCardPage : public SfxTabPage FixedText aAutoTextGroupFT; ListBox aAutoTextGroupLB; - GroupBox aContentGB; + FixedLine aContentFL; Window aExampleWIN; - GroupBox aExampleGB; String sVisCardGroup; String sTempURL; @@ -364,7 +360,7 @@ public: --------------------------------------------------*/ class SwPrivateDataPage : public SfxTabPage { - GroupBox aDataGB; + FixedLine aDataFL; FixedText aNameFT; Edit aFirstNameED; @@ -412,7 +408,7 @@ public: --------------------------------------------------*/ class SwBusinessDataPage : public SfxTabPage { - GroupBox aDataGB; + FixedLine aDataFL; FixedText aCompanyFT; Edit aCompanyED; FixedText aCompanyExtFT; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 6ea70368a7a6..5196d86a7eae 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: labprt.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,10 +99,10 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : aRowText (this, SW_RES(TXT_ROW )), aRowField (this, SW_RES(FLD_ROW )), aSynchronCB (this, SW_RES(CB_SYNCHRON)), - aGBDontKnow (this, SW_RES(GB_DONTKNOW)), + aFLDontKnow (this, SW_RES(FL_DONTKNOW)), aPrinterInfo (this, SW_RES(INF_PRINTER)), aPrtSetup (this, SW_RES(BTN_PRTSETUP)), - aGBPrinter (this, SW_RES(GB_PRINTER )) + aFLPrinter (this, SW_RES(FL_PRINTER )) { FreeResource(); @@ -261,6 +261,9 @@ void SwLabPrtPage::Reset(const SfxItemSet& rSet) // -------------------------------------------------------------------------- /* $Log: not supported by cvs2svn $ +Revision 1.1.1.1 2000/09/18 17:14:36 hr +initial import + Revision 1.37 2000/09/18 16:05:26 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc index 4b79b2335ee8..ba18297729a7 100644 --- a/sw/source/ui/envelp/labprt.hrc +++ b/sw/source/ui/envelp/labprt.hrc @@ -2,9 +2,9 @@ * * $RCSfile: labprt.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ #define TXT_ROW 6 #define FLD_ROW 7 #define BTN_PRTSETUP 8 -#define GB_PRINTER 9 -#define GB_DONTKNOW 10 +#define FL_PRINTER 9 +#define FL_DONTKNOW 10 #define CB_SYNCHRON 11 // Ueberlaufpruefung ******************************************************** diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 847397410548..62362a9c04c2 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: labprt.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,11 +94,11 @@ class SwLabPrtPage : public SfxTabPage FixedText aRowText; NumericField aRowField; CheckBox aSynchronCB; - GroupBox aGBDontKnow; + FixedLine aFLDontKnow; FixedInfo aPrinterInfo; PushButton aPrtSetup; - GroupBox aGBPrinter; + FixedLine aFLPrinter; SwLabPrtPage(Window* pParent, const SfxItemSet& rSet); ~SwLabPrtPage(); diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index 5afbbd4224b7..edde4e9a8db9 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.src @@ -2,9 +2,9 @@ * * $RCSfile: labprt.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:25:07 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,10 +237,11 @@ TabPage TP_LAB_PRT Text[ finnish ] = "~Synkronoi sislt"; Text[ catalan ] = "~Sincronizar contenidos"; }; - GroupBox GB_DONTKNOW + FixedLine FL_DONTKNOW { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 53 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; + Text = "Verteilen" ; }; FixedText INF_PRINTER { @@ -298,10 +299,10 @@ TabPage TP_LAB_PRT Text[ finnish ] = "Asennus"; Text[ catalan ] = "Configurar..."; }; - GroupBox GB_PRINTER + FixedLine FL_PRINTER { Pos = MAP_APPFONT ( 6 , 59 ) ; - Size = MAP_APPFONT ( 248 , 28 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = " Drucker " ; Text [ ENGLISH ] = " Printer " ; Text [ dutch ] = "Printer " ; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 2887a44bfea2..0d0972e65aff 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2001-05-15 10:02:00 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,7 +172,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aFromNF (this, SW_RES(NF_FROM)), aBisFT (this, SW_RES(FT_BIS)), aToNF (this, SW_RES(NF_TO)), - aRecordGB (this, SW_RES(GB_RECORD)), + aRecordFL (this, SW_RES(FL_RECORD)), aPrinterRB (this, SW_RES(RB_PRINTER)), aMailingRB (this, SW_RES(RB_MAILING)), @@ -200,7 +200,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aFormatSwCB (this, SW_RES(CB_FORMAT_SW)), aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)), aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)), - aDestGB (this, SW_RES(GB_DEST)), + aDestFL (this, SW_RES(FL_DEST)), aOkBTN (this, SW_RES(BTN_OK)), aCancelBTN (this, SW_RES(BTN_CANCEL)), @@ -217,7 +217,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, { aSelection = *pSelection; //move all controls - long nDiff = aRecordGB.GetPosPixel().Y() - pBeamerWin->GetPosPixel().Y(); + long nDiff = aRecordFL.GetPosPixel().Y() - pBeamerWin->GetPosPixel().Y(); pBeamerWin->Show(FALSE); Size aSize = GetSizePixel(); aSize.Height() -= nDiff; @@ -229,7 +229,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, &aFromNF , &aBisFT , &aToNF , - &aRecordGB , + &aRecordFL , &aPrinterRB , &aMailingRB , &aFileRB , @@ -253,7 +253,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, &aFormatHtmlCB, &aFormatRtfCB , &aFormatSwCB , - &aDestGB , + &aDestFL , 0}; for( Window** ppW = aCntrlArr; *ppW; ++ppW ) diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc index 00256bc7e294..4653f00fecb9 100644 --- a/sw/source/ui/envelp/mailmrge.hrc +++ b/sw/source/ui/envelp/mailmrge.hrc @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-03-07 13:40:13 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ // Elemente ----------------------------------------------------------------- -#define GB_RECORD 1 +#define FL_RECORD 1 #define RB_ALL 2 #define RB_MARKED 3 #define RB_FROM 4 @@ -84,7 +84,7 @@ #define LB_ADDRESSFLD 14 #define FT_SUBJECT 15 #define ED_SUBJECT 16 -#define GB_DEST 17 +#define FL_DEST 17 #define CB_SINGLE_JOBS 18 #define FT_FORMAT 19 #define CB_FORMAT_SW 20 diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index b7add33eadea..33edfeb5c68b 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.src @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:27:35 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:53:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -228,10 +228,10 @@ ModalDialog DLG_MAILMERGE Minimum = 1 ; Maximum = 999999 ; }; - GroupBox GB_RECORD + FixedLine FL_RECORD { Pos = MAP_APPFONT ( 6 , 86 ) ; - Size = MAP_APPFONT ( 130 , 109 ) ; + Size = MAP_APPFONT ( 130 , 8 ) ; Text = "Datenstze" ; Text [ ENGLISH ] = "Records" ; Text [ norwegian ] = "Records" ; @@ -653,8 +653,8 @@ ModalDialog DLG_MAILMERGE }; FixedText FT_FORMAT { - Pos = MAP_APPFONT ( 148 , 155 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; + Pos = MAP_APPFONT ( 148 , 157 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; Disable = TRUE ; Text = "Mail-Format" ; Text [ ENGLISH ] = "Mail format" ; @@ -682,7 +682,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_HTML { - Pos = MAP_APPFONT ( 220 , 155 ) ; + Pos = MAP_APPFONT ( 220 , 156 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; /* ### ACHTUNG: Neuer Text in Resource? HTM~L : HTML */ @@ -712,7 +712,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_RTF { - Pos = MAP_APPFONT ( 220 , 168 ) ; + Pos = MAP_APPFONT ( 220 , 169 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; Text = "~RTF" ; @@ -741,7 +741,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_SW { - Pos = MAP_APPFONT ( 220, 181 ) ; + Pos = MAP_APPFONT ( 220, 182 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; Text = "%PRODUCTNAME Writer" ; @@ -768,10 +768,10 @@ ModalDialog DLG_MAILMERGE Text[ catalan ] = "%PRODUCTNAME Writer"; Text[ finnish ] = "%PRODUCTNAME! Writer"; }; - GroupBox GB_DEST + FixedLine FL_DEST { Pos = MAP_APPFONT ( 142 , 86 ) ; - Size = MAP_APPFONT ( 170 , 109 ) ; + Size = MAP_APPFONT ( 170 , 8 ) ; Text = "Ausgabe" ; Text [ ENGLISH ] = "Destination" ; Text [ english_us ] = "Output" ; diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 0996ffdd27c5..b1acea29e048 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2000-10-24 11:38:19 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, rSh( rS ), aLabelED (this, SW_RES(ED_LABEL )), aEditED (this, SW_RES(ED_EDIT )), - aEditGB (this, SW_RES(GB_EDIT )), + aEditFL (this, SW_RES(FL_EDIT )), aOKBT (this, SW_RES(BT_OK )), aCancelBT (this, SW_RES(BT_CANCEL )), aNextBT (this, SW_RES(PB_NEXT )), @@ -249,6 +249,9 @@ IMPL_LINK(SwFldInputDlg, NextHdl, PushButton*, EMPTYARG) /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.2 2000/10/24 11:38:19 jp + must change: use charclass instead of international + Revision 1.1.1.1 2000/09/18 17:14:37 hr initial import diff --git a/sw/source/ui/fldui/inpdlg.hrc b/sw/source/ui/fldui/inpdlg.hrc index a5741d19a994..df92627f5a47 100644 --- a/sw/source/ui/fldui/inpdlg.hrc +++ b/sw/source/ui/fldui/inpdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:37 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ #define FT_LABEL 1 #define ED_EDIT 3 -#define GB_EDIT 4 +#define FL_EDIT 4 #define BT_OK 5 #define BT_CANCEL 6 #define ED_LABEL 7 diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 31eac205e043..4d22d9efb486 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2001-05-30 20:22:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,10 +133,10 @@ ModalDialog DLG_FLD_INPUT TabStop = TRUE ; Left = TRUE ; }; - GroupBox GB_EDIT + FixedLine FL_EDIT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 127 , 108 ) ; + Size = MAP_APPFONT ( 127 , 8 ) ; Text = "Bearbeiten" ; Text [ English ] = "Edit" ; Text [ norwegian ] = "Rediger" ; diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index fe75cacbe36a..6c416f89e8aa 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-11-15 13:28:49 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,7 +123,7 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : aUrlPB ( this, SW_RES( PB_URL ) ), aEditRB ( this, SW_RES( RB_EDIT ) ), aEditED ( this, SW_RES( ED_EDIT ) ), - aPostItGB ( this, SW_RES( GB_POSTIT ) ), + aPostItFL ( this, SW_RES( FL_POSTIT ) ), aOKBtn ( this, SW_RES( BTN_POST_OK ) ), aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ), aPrevBtn ( this, SW_RES( BTN_PREV ) ), diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc index a58ce4b73211..1a264bb85ae9 100644 --- a/sw/source/ui/fldui/javaedit.hrc +++ b/sw/source/ui/fldui/javaedit.hrc @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:37 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ #define ED_TYPE 11 #define RB_EDIT 12 #define ED_EDIT 13 -#define GB_POSTIT 14 +#define FL_POSTIT 14 #define BTN_PREV 15 #define BTN_NEXT 16 #define STR_JAVA_EDIT 17 diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index aa16dd9c83b9..e5d9dd7d3d5e 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2001-05-30 20:24:14 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:58:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,10 +195,10 @@ ModalDialog DLG_JAVAEDIT IgnoreTab = TRUE ; TabStop = TRUE ; }; - GroupBox GB_POSTIT + FixedLine FL_POSTIT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 179 , 147 ) ; + Size = MAP_APPFONT ( 179 , 8 ) ; Text = "Inhalt" ; Text [ ENGLISH ] = "Contents" ; Text [ norwegian ] = "Innhold " ; diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc index 399f9a54603a..7520e2dbd162 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.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fme $ $Date: 2001-05-29 13:37:13 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:00:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ #define WN_BSP 41 #define LB_REFERENCE 42 #define CB_REGISTER 43 -#define GB_REGISTER 44 +#define FL_REGISTER 44 #define FT_REFERENCE 45 #define ED_DIST1 46 diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c20b80277857..645393475ab1 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:00:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -709,7 +709,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) aRealSizeBT.SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl)); } // else -// aTypeGB.SetSizePixel(Size(aTypeGB.GetSizePixel().Width(), aSizeGB.GetSizePixel().Height())); +// aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height())); if ( nDlgType == DLG_FRM_GRF ) aFixedRatioCB.Check( FALSE ); @@ -723,7 +723,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) } else { -// aTypeGB.SetSizePixel(Size(aTypeGB.GetSizePixel().Width(), aSizeGB.GetSizePixel().Height())); +// aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height())); aGrfSize = ((const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE)).GetSize(); } @@ -2110,7 +2110,7 @@ void SwFrmPage::SetFormatUsed(BOOL bFmt) SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage( pParent, SW_RES(TP_GRF_EXT), rSet ), aBmpWin (this, WN_BMP, Graphic(), Bitmap(BMP_EXAMPLE) ), - aConnectGB (this, SW_RES( GB_CONNECT )), + aConnectFL (this, SW_RES( FL_CONNECT )), aConnectFT (this, SW_RES( FT_CONNECT )), aConnectED (this, SW_RES( ED_CONNECT )), aBrowseBT (this, SW_RES( PB_BROWSE )), @@ -2122,7 +2122,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : aLeftPagesRB( this, SW_RES( RB_MIRROR_LEFT_PAGES )), aRightPagesRB( this, SW_RES( RB_MIRROR_RIGHT_PAGES )), - aMirrorFrm (this, SW_RES( GB_MIRROR )), + aMirrorFL (this, SW_RES( FL_MIRROR )), pGrfDlg( 0 ) { FreeResource(); @@ -2244,7 +2244,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) aRightPagesRB.Enable(bEnableMirrorRB); aMirrorHorzBox.Enable(bEnable); aMirrorVertBox.Enable(bEnable); - aMirrorFrm.Enable(bEnable); + aMirrorFL.Enable(bEnable); aAllPagesRB .SaveValue(); aLeftPagesRB.SaveValue(); diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc index b58c34a518e3..9215bc5eb4ad 100644 --- a/sw/source/ui/frmdlg/frmpage.hrc +++ b/sw/source/ui/frmdlg/frmpage.hrc @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.hrc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:00:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,11 +96,11 @@ #define CB_VERT 47 //#define LB_MIRROR_PAGES 49 //#define FT_MIRROR_PAGES 50 -#define GB_MIRROR 51 +#define FL_MIRROR 51 #define WN_BMP 52 #define PB_BROWSE 53 #define ED_CONNECT 54 -#define GB_CONNECT 55 +#define FL_CONNECT 55 #define FT_CONNECT 57 #define FT_URL 58 #define ED_URL 59 diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index 01e66d7f8f75..440983ef7e36 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.src @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:00:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1024,7 +1024,7 @@ TabPage TP_FRM_STD }; PushButton BT_REALSIZE { - Pos = MAP_APPFONT ( 67 , 84 ) ; + Pos = MAP_APPFONT ( 55 , 86 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -1083,7 +1083,7 @@ TabPage TP_FRM_STD FixedLine FL_TYPE_SEP { Pos = MAP_APPFONT ( 111 , 10 ) ; - Size = MAP_APPFONT ( 4 , 87 ) ; + Size = MAP_APPFONT ( 4 , 90 ) ; }; RadioButton RB_ANCHOR_PAGE { @@ -1252,7 +1252,7 @@ TabPage TP_FRM_STD Window WN_BSP { Pos = MAP_APPFONT ( 202 , 14 ) ; - Size = MAP_APPFONT ( 54 , 84 ) ; + Size = MAP_APPFONT ( 54 , 86 ) ; }; FixedText FT_HORIZONTAL { @@ -1558,10 +1558,10 @@ TabPage TP_GRF_EXT { File = "dog.bmp" ; }; - GroupBox GB_CONNECT + FixedLine FL_CONNECT { Pos = MAP_APPFONT ( 6 , 87 ) ; - Size = MAP_APPFONT ( 248 , 37 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Verknpfung" ; Text [ ENGLISH ] = "Link" ; Text [ norwegian ] = "Kobling" ; @@ -1821,10 +1821,10 @@ TabPage TP_GRF_EXT Pos = MAP_APPFONT ( 120 , 14 ) ; Size = MAP_APPFONT ( 127 , 66 ) ; }; - GroupBox GB_MIRROR + FixedLine FL_MIRROR { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 81 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Spiegeln" ; Text [ ENGLISH ] = "Mirror" ; Text [ norwegian ] = "Speil" ; 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 = "Eintrge" ; 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"; diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 8e970c46eb4b..63179e38f78c 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfnote.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-03-02 14:08:37 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,25 +185,25 @@ SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN, aPosFT (this, ResId( FT_POS )), aPosPageBox (this, ResId( RB_POS_PAGE )), aPosChapterBox (this, ResId( RB_POS_CHAPTER)), - aNumGrp (this, ResId( GB_NUM )), + aNumFL (this, ResId( FL_NUM )), aParaTemplLbl (this, ResId( FT_PARA_TEMPL)), aParaTemplBox (this, ResId( LB_PARA_TEMPL)), aPageTemplLbl (this, ResId( FT_PAGE_TEMPL)), aPageTemplBox (this, ResId( LB_PAGE_TEMPL)), - aTemplGrp (this, ResId( GB_TEMPL )), + aTemplFL (this, ResId( FL_TEMPL )), aFtnCharTextTemplLbl( this, ResId( FT_TEXT_CHARFMT)), aFtnCharTextTemplBox( this, ResId( LB_TEXT_CHARFMT)), aFtnCharAnchorTemplLbl( this, ResId( FT_ANCHR_CHARFMT)), aFtnCharAnchorTemplBox( this, ResId( LB_ANCHR_CHARFMT)), - aCharTemplGrp( this, ResId(GB_CHAR_TEMPL)), + aCharTemplFL( this, ResId(FL_CHAR_TEMPL)), aContLbl (this, ResId( FT_CONT )), aContEdit (this, ResId( ED_CONT )), aContFromLbl (this, ResId( FT_CONT_FROM )), aContFromEdit (this, ResId( ED_CONT_FROM )), - aContGrp (this, ResId( GB_CONT )), + aContFL (this, ResId( FL_CONT )), aNumPage(aNumCountBox.GetEntry(FTNNUM_PAGE)), pSh( 0 ), @@ -233,8 +233,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) aFtnCharTextTemplBox.Hide(); aFtnCharAnchorTemplLbl.Hide(); aFtnCharAnchorTemplBox.Hide(); - aCharTemplGrp .Hide(); - aTemplGrp .Hide(); + aCharTemplFL .Hide(); + aTemplFL .Hide(); } if ( bEndNote ) { @@ -245,7 +245,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) aContEdit.Hide(); aContFromLbl.Hide(); aContFromEdit.Hide(); - aContGrp.Hide(); + aContFL.Hide(); bPosDoc = TRUE; } else @@ -534,6 +534,9 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.4 2001/03/02 14:08:37 os + extended numbering types available + Revision 1.3 2001/02/23 12:45:29 os Complete use of DefaultNumbering component diff --git a/sw/source/ui/misc/docfnote.hrc b/sw/source/ui/misc/docfnote.hrc index 3532cd387dab..e7a544538cdb 100644 --- a/sw/source/ui/misc/docfnote.hrc +++ b/sw/source/ui/misc/docfnote.hrc @@ -2,9 +2,9 @@ * * $RCSfile: docfnote.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,19 +68,19 @@ #define LB_NUMCOUNT 11 #define FLD_OFFSET 12 #define FT_OFFSET 13 -#define GB_NUM 14 +#define FL_NUM 14 #define LB_PARA_TEMPL 30 #define LB_PAGE_TEMPL 31 #define FT_PARA_TEMPL 32 #define FT_PAGE_TEMPL 33 -#define GB_TEMPL 34 +#define FL_TEMPL 34 #define FT_CONT 40 #define ED_CONT 41 #define FT_CONT_FROM 42 #define ED_CONT_FROM 43 -#define GB_CONT 44 +#define FL_CONT 44 #define FT_PREFIX 45 #define ED_PREFIX 46 @@ -89,6 +89,6 @@ #define FT_TEXT_CHARFMT 49 #define LB_TEXT_CHARFMT 50 #define FT_ANCHR_CHARFMT 51 -#define GB_CHAR_TEMPL 52 +#define FL_CHAR_TEMPL 52 #define LB_ANCHR_CHARFMT 53 diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index 98808352e52a..44a3e805a93a 100644 --- a/sw/source/ui/misc/docfnote.src +++ b/sw/source/ui/misc/docfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: docfnote.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:22:15 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,10 +164,10 @@ TabPage TP_FOOTNOTEOPTION HelpID = HID_FOOTNOTE_OPTIONS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 185 ) ; - GroupBox GB_NUM + FixedLine FL_NUM { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 83 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Automatische Nummerierung" ; Text [ ENGLISH ] = "Automatic numbering" ; Text [ norwegian ] = "Auto. nummerering" ; @@ -618,10 +618,10 @@ TabPage TP_FOOTNOTEOPTION Text[ language_user1 ] = " "; Text[ catalan ] = "F~in del documento"; }; - GroupBox GB_TEMPL + FixedLine FL_TEMPL { Pos = MAP_APPFONT ( 6 , 89 ) ; - Size = MAP_APPFONT ( 115 , 42 ) ; + Size = MAP_APPFONT ( 115 , 8 ) ; Text = "Vorlagen" ; Text [ ENGLISH ] = "Styles" ; Text [ norwegian ] = "Styles" ; @@ -725,10 +725,10 @@ TabPage TP_FOOTNOTEOPTION TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GB_CHAR_TEMPL + FixedLine FL_CHAR_TEMPL { Pos = MAP_APPFONT ( 125 , 89 ) ; - Size = MAP_APPFONT ( 129 , 42 ) ; + Size = MAP_APPFONT ( 129 , 8 ) ; Text = "Zeichenvorlagen" ; Text [ ENGLISH ] = "Character styles" ; @@ -830,10 +830,10 @@ TabPage TP_FOOTNOTEOPTION DropDown = TRUE ; Sort = TRUE ; }; - GroupBox GB_CONT + FixedLine FL_CONT { Pos = MAP_APPFONT ( 6 , 134 ) ; - Size = MAP_APPFONT ( 248 , 42 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Hinweistext mehrseitige Funoten" ; Text [ ENGLISH ] = "Continuation notice" ; Text [ norwegian ] = "+++Continuation notice" ; @@ -945,10 +945,10 @@ TabPage TP_ENDNOTEOPTION HelpID = HID_ENDNOTE_OPTIONS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 185 ) ; - GroupBox GB_NUM + FixedLine FL_NUM { Pos = MAP_APPFONT ( 6 , 2 ) ; - Size = MAP_APPFONT ( 248 , 42 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Automatische Nummerierung" ; Text [ ENGLISH ] = "Automatic numbering" ; Text [ norwegian ] = "Auto. nummerering" ; @@ -1221,10 +1221,10 @@ TabPage TP_ENDNOTEOPTION Text[ language_user1 ] = " "; Text[ catalan ] = "Fin del ~documento"; }; - GroupBox GB_TEMPL + FixedLine FL_TEMPL { Pos = MAP_APPFONT ( 6 , 46 ) ; - Size = MAP_APPFONT ( 115 , 42 ) ; + Size = MAP_APPFONT ( 115 , 8 ) ; Text = "Vorlagen" ; Text [ ENGLISH ] = "Styles" ; Text [ norwegian ] = "Styles" ; @@ -1328,10 +1328,10 @@ TabPage TP_ENDNOTEOPTION TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GB_CHAR_TEMPL + FixedLine FL_CHAR_TEMPL { Pos = MAP_APPFONT ( 125 , 46 ) ; - Size = MAP_APPFONT ( 129 , 42 ) ; + Size = MAP_APPFONT ( 129 , 8 ) ; Text = "Zeichenvorlagen" ; Text [ ENGLISH ] = "Character styles" ; Text[ english_us ] = "Character Styles"; @@ -1430,10 +1430,10 @@ TabPage TP_ENDNOTEOPTION DropDown = TRUE ; Sort = TRUE ; }; - GroupBox GB_CONT + FixedLine FL_CONT { Pos = MAP_APPFONT ( 80 , 91 ) ; - Size = MAP_APPFONT ( 174 , 42 ) ; + Size = MAP_APPFONT ( 174 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Hinweistext mehrseitige Funoten : Hinweistext mehrseitige Funoten */ Text = "Hinweistext mehrseitige Funoten" ; Text [ ENGLISH ] = "Continuation notice" ; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 03d25e190a4f..05cbcc5dbb71 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -2,9 +2,9 @@ * * $RCSfile: glossary.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: fme $ $Date: 2001-05-28 15:03:34 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,7 +262,7 @@ class SwNewGlosNameDlg : public ModalDialog NoSpaceEdit aNewShort; OKButton aOk; CancelButton aCancel; - GroupBox aGrp; + FixedLine aFL; FixedText aONFT; Edit aOldName; FixedText aOSFT; @@ -295,7 +295,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, aOldShort(this,SW_RES( ED_OS )), aNewName(this, SW_RES( ED_NN )), aNewShort(this,SW_RES( ED_NS )), - aGrp (this, SW_RES( GB_NN )) + aFL (this, SW_RES( FL_NN )) { FreeResource(); aOldName.SetText( rOldName ); diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc index 40a70c7b8c00..f4939be50a74 100644 --- a/sw/source/ui/misc/glossary.hrc +++ b/sw/source/ui/misc/glossary.hrc @@ -2,9 +2,9 @@ * * $RCSfile: glossary.hrc,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: fme $ $Date: 2001-05-21 12:29:30 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,8 +97,8 @@ #define FN_GL_REPLACE_TEXT 78 // Box Bibliothek Textbausteine -#define GB_EDIT 1 -#define GB_BIB 2 +#define FL_EDIT 1 +#define FL_BIB 2 #define ED_BIB 3 #define PB_NEW 10 @@ -118,7 +118,7 @@ #define ED_OS 6 #define ED_NN 7 #define ED_NS 8 -#define GB_NN 9 +#define FL_NN 9 #define BT_CANCEL 10 #define BT_OKNEW 11 diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index 47d0ad999f70..42ff022a8f68 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -2,9 +2,9 @@ * * $RCSfile: glossary.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: fme $ $Date: 2001-05-21 12:29:30 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,7 +254,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_FILE_REL { - Pos = MAP_APPFONT ( 14 , 144 ) ; + Pos = MAP_APPFONT ( 14 , 145 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; Text = "Im ~Dateisystem" ; Text [ ENGLISH ] = "on ~filesystem" ; @@ -282,7 +282,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_NET_REL { - Pos = MAP_APPFONT ( 109 , 144 ) ; + Pos = MAP_APPFONT ( 109 , 145 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; Text = "Im ~Internet" ; Text [ ENGLISH ] = "on int~ernet" ; @@ -314,7 +314,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_SHOW_EXAMPLE { - Pos = MAP_APPFONT ( 231 , 144 ) ; + Pos = MAP_APPFONT ( 231 , 145 ) ; Size = MAP_APPFONT ( 82 , 12 ) ; Text = "~Vorschau anzeigen" ; Text [ ENGLISH ] = "Show ~preview" ; @@ -1137,10 +1137,10 @@ ModalDialog DLG_RENAME_GLOS Size = MAP_APPFONT ( 21 , 12 ) ; Left = TRUE ; }; - GroupBox GB_NN + FixedLine FL_NN { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 219 , 41 ) ; + Size = MAP_APPFONT ( 219 , 8 ) ; }; Text [ dutch ] = "Naam tekstbouwsteen wijzigen" ; Text [ english_us ] = "Rename AutoText" ; diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index a4f264f7bcbf..21929d321832 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -2,9 +2,9 @@ * * $RCSfile: impfnote.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2001-03-02 14:09:26 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,9 +67,6 @@ #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif @@ -100,25 +97,25 @@ class SwEndNoteOptionPage : public SfxTabPage FixedText aPosFT; RadioButton aPosPageBox; RadioButton aPosChapterBox; - GroupBox aNumGrp; + FixedLine aNumFL; FixedText aParaTemplLbl; ListBox aParaTemplBox; FixedText aPageTemplLbl; ListBox aPageTemplBox; - GroupBox aTemplGrp; + FixedLine aTemplFL; FixedText aFtnCharAnchorTemplLbl; ListBox aFtnCharAnchorTemplBox; FixedText aFtnCharTextTemplLbl; ListBox aFtnCharTextTemplBox; - GroupBox aCharTemplGrp; + FixedLine aCharTemplFL; FixedText aContLbl; Edit aContEdit; FixedText aContFromLbl; Edit aContFromEdit; - GroupBox aContGrp; + FixedLine aContFL; String aNumPage; SwWrtShell *pSh; diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 19caab6a7539..1fe0a8b3f35a 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -284,10 +284,10 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, BOOL bEd aNumberCharBtn (this,SW_RES(RB_NUMBER_CHAR)), aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)), aNumberExtChar (this,SW_RES(BT_NUMBER_CHAR)), - aNumberFrm (this,SW_RES(GB_NUMBER)), + aNumberFL (this,SW_RES(FL_NUMBER)), aFtnBtn (this,SW_RES(RB_TYPE_FTN)), aEndNoteBtn (this,SW_RES(RB_TYPE_ENDNOTE)), - aTypeBox (this,SW_RES(GB_TYPE)), + aTypeFL (this,SW_RES(FL_TYPE)), aOkBtn (this,SW_RES(BT_OK)), aCancelBtn (this,SW_RES(BT_CANCEL)), @@ -400,6 +400,9 @@ void SwInsFootNoteDlg::Init() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:45 hr + initial import + Revision 1.46 2000/09/18 16:05:57 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/misc/insfnote.hrc b/sw/source/ui/misc/insfnote.hrc index 780a89c5b85c..3524c320f763 100644 --- a/sw/source/ui/misc/insfnote.hrc +++ b/sw/source/ui/misc/insfnote.hrc @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,8 @@ #define RB_NUMBER_CHAR 2 #define ED_NUMBER_CHAR 3 #define BT_NUMBER_CHAR 4 -#define GB_NUMBER 5 -#define GB_TYPE 6 +#define FL_NUMBER 5 +#define FL_TYPE 6 #define RB_TYPE_FTN 7 #define RB_TYPE_ENDNOTE 8 diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index c23e3a649639..c3c957f28506 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:28:38 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,10 +192,10 @@ ModalDialog DLG_INS_FOOTNOTE Text[ language_user1 ] = " "; Text[ catalan ] = "~Caracteres"; }; - GroupBox GB_NUMBER + FixedLine FL_NUMBER { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 77 , 54 ) ; + Size = MAP_APPFONT ( 77 , 8 ) ; Text = "Nummerierung" ; Text [ ENGLISH ] = "Numbering" ; Text [ norwegian ] = "Nummering" ; @@ -286,10 +286,10 @@ ModalDialog DLG_INS_FOOTNOTE Text[ catalan ] = "Nota al ~final"; Text[ finnish ] = "~Loppuhuomautus"; }; - GroupBox GB_TYPE + FixedLine FL_TYPE { Pos = MAP_APPFONT ( 6 , 60 ) ; - Size = MAP_APPFONT ( 77 , 36 ) ; + Size = MAP_APPFONT ( 77 , 8 ) ; Text = "Art" ; Text [ ENGLISH ] = "Type" ; Text [ english_us ] = "Type" ; diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index b41f96061c7c..e4d7fac2f6e0 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -2,9 +2,9 @@ * * $RCSfile: insrule.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent, SwDocShell* pDocSh ) : SfxModalDialog(pParent, SW_RES(DLG_INSERT_RULER)), - aSelectionGB(this, ResId(GB_SEL )), + aSelectionFL(this, ResId(FL_SEL )), pExampleVS (new SwRulerValueSet(this, ResId(VS_EXAMPLE ), aGrfNames, pDocSh)), aOkPB (this, ResId(PB_OK )), aCancelPB (this, ResId(PB_CANCEL )), @@ -302,6 +302,9 @@ IMPL_LINK(SwInsertGrfRulerDlg, DoubleClickHdl, ValueSet*, pVS) Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:45 hr + initial import + Revision 1.22 2000/09/18 16:05:57 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/misc/insrule.hrc b/sw/source/ui/misc/insrule.hrc index a395f187bc2f..33efef20701e 100644 --- a/sw/source/ui/misc/insrule.hrc +++ b/sw/source/ui/misc/insrule.hrc @@ -2,9 +2,9 @@ * * $RCSfile: insrule.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ #include "misc.hrc" -#define GB_SEL 1 +#define FL_SEL 1 #define VS_EXAMPLE 2 #define PB_OK 3 #define PB_CANCEL 4 diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src index 0952403fcf82..566778ae5b85 100644 --- a/sw/source/ui/misc/insrule.src +++ b/sw/source/ui/misc/insrule.src @@ -2,9 +2,9 @@ * * $RCSfile: insrule.src,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:30:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,10 +70,10 @@ ModalDialog DLG_INSERT_RULER Text = "Horizontale Linie einfgen" ; Text [ ENGLISH ] = "InsertRuler" ; Moveable = TRUE ; - GroupBox GB_SEL + FixedLine FL_SEL { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 174 , 118 ) ; + Size = MAP_APPFONT ( 174 , 8 ) ; Text = "Auswahl" ; Text [ ENGLISH ] = "Selection" ; Text [ english_us ] = "Selection" ; @@ -100,8 +100,8 @@ ModalDialog DLG_INSERT_RULER }; Control VS_EXAMPLE { - Pos = MAP_APPFONT ( 9 , 12 ) ; - Size = MAP_APPFONT ( 168 , 106 ) ; + Pos = MAP_APPFONT ( 9 , 14 ) ; + Size = MAP_APPFONT ( 168 , 104 ) ; Hide = TRUE ; Border = TRUE ; TabStop = TRUE ; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index f89b24af60b3..518ef1633527 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: linenum.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2001-03-02 14:09:26 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,17 +172,17 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent, aNumIntervalFT ( this, SW_RES( FT_NUM_INVERVAL )), aNumIntervalNF ( this, SW_RES( NF_NUM_INVERVAL )), aNumRowsFT ( this, SW_RES( FT_NUM_ROWS )), - aDisplayGB ( this, SW_RES( GB_DISPLAY )), + aDisplayFL ( this, SW_RES( FL_DISPLAY )), aDivisorFT ( this, SW_RES( FT_DIVISOR )), aDivisorED ( this, SW_RES( ED_DIVISOR )), aDivIntervalFT ( this, SW_RES( FT_DIV_INTERVAL )), aDivIntervalNF ( this, SW_RES( NF_DIV_INTERVAL )), aDivRowsFT ( this, SW_RES( FT_DIV_ROWS )), - aDivisorGB ( this, SW_RES( GB_DIVISOR )), + aDivisorFL ( this, SW_RES( FL_DIVISOR )), aCountEmptyLinesCB ( this, SW_RES( CB_COUNT_EMPTYLINES )), aCountFrameLinesCB ( this, SW_RES( CB_COUNT_FRAMELINES )), aRestartEachPageCB ( this, SW_RES( CB_RESTART_PAGE )), - aCountGB ( this, SW_RES( GB_COUNT )) + aCountFL ( this, SW_RES( FL_COUNT )) { FreeResource(); @@ -315,17 +315,17 @@ IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG ) aNumIntervalFT.Enable(bEnable); aNumIntervalNF.Enable(bEnable); aNumRowsFT.Enable(bEnable); - aDisplayGB.Enable(bEnable); + aDisplayFL.Enable(bEnable); aDivisorFT.Enable(bEnable); aDivisorED.Enable(bEnable); aDivIntervalFT.Enable(bEnable); aDivIntervalNF.Enable(bEnable); aDivRowsFT.Enable(bEnable); - aDivisorGB.Enable(bEnable); + aDivisorFL.Enable(bEnable); aCountEmptyLinesCB.Enable(bEnable); aCountFrameLinesCB.Enable(bEnable); aRestartEachPageCB.Enable(bEnable); - aCountGB.Enable(bEnable); + aCountFL.Enable(bEnable); return 0; } @@ -390,6 +390,9 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& rSet ) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.3 2001/03/02 14:09:26 os + extended numbering types available + Revision 1.2 2001/02/23 12:45:29 os Complete use of DefaultNumbering component diff --git a/sw/source/ui/misc/linenum.hrc b/sw/source/ui/misc/linenum.hrc index e3e3e63e23dd..033e93da198d 100644 --- a/sw/source/ui/misc/linenum.hrc +++ b/sw/source/ui/misc/linenum.hrc @@ -2,9 +2,9 @@ * * $RCSfile: linenum.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,15 +70,15 @@ #define FT_NUM_INVERVAL 10 #define NF_NUM_INVERVAL 11 #define FT_NUM_ROWS 12 -#define GB_DISPLAY 13 +#define FL_DISPLAY 13 #define FT_DIVISOR 14 #define ED_DIVISOR 15 #define FT_DIV_INTERVAL 16 #define NF_DIV_INTERVAL 17 #define FT_DIV_ROWS 18 -#define GB_DIVISOR 19 +#define FL_DIVISOR 19 #define CB_COUNT_EMPTYLINES 20 #define CB_COUNT_FRAMELINES 21 -#define GB_COUNT 22 +#define FL_COUNT 22 #define CB_RESTART_PAGE 23 diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index dc9a8f2c20f0..67dc376ce2a1 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.src @@ -2,9 +2,9 @@ * * $RCSfile: linenum.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:32:52 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -493,10 +493,10 @@ TabPage TP_LINENUMBERING Text[ catalan ] = "Lneas"; Text[ finnish ] = "viivat"; }; - GroupBox GB_DISPLAY + FixedLine FL_DISPLAY { Pos = MAP_APPFONT ( 6 , 17 ) ; - Size = MAP_APPFONT ( 248 , 90 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Anzeige" ; Text [ English ] = "Display" ; Text [ english_us ] = "View" ; @@ -629,10 +629,10 @@ TabPage TP_LINENUMBERING Text[ catalan ] = "Lneas"; Text[ finnish ] = "Viivat"; }; - GroupBox GB_DIVISOR + FixedLine FL_DIVISOR { Pos = MAP_APPFONT ( 6 , 110 ) ; - Size = MAP_APPFONT ( 121 , 53 ) ; + Size = MAP_APPFONT ( 121 , 8 ) ; Text = "Teiler" ; Text [ English ] = "Divisor" ; Text [ english_us ] = "Separator" ; @@ -743,10 +743,10 @@ TabPage TP_LINENUMBERING Text[ catalan ] = "~Reiniciar al comienzo de pgina"; Text[ finnish ] = "~Aloita jokainen uusi sivu uudelleen"; }; - GroupBox GB_COUNT + FixedLine FL_COUNT { Pos = MAP_APPFONT ( 133 , 110 ) ; - Size = MAP_APPFONT ( 121 , 53 ) ; + Size = MAP_APPFONT ( 121 , 8 ) ; Text = "Zhlen" ; Text [ English ] = "Count" ; Text [ english_us ] = "Count" ; diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 881f5e72d70a..a20c3029a652 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -2,9 +2,9 @@ * * $RCSfile: num.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-23 12:45:29 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,9 +190,9 @@ static BOOL bLastRelative = FALSE; SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, SW_RES( TP_NUM_POSITION ), rSet ), - aLevelGB( this, ResId(GB_LEVEL )), + aLevelFL( this, ResId(FL_LEVEL )), aLevelLB( this, ResId(LB_LEVEL )), - aPositionGB( this, ResId(GB_POSITION )), + aPositionFL( this, ResId(FL_POSITION )), aAlignFT( this, ResId(FT_ALIGN )), aAlignLB( this, ResId(LB_ALIGN )), aDistBorderFT( this, ResId(FT_BORDERDIST )), @@ -203,7 +203,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, aIndentFT( this, ResId(FT_INDENT )), aIndentMF( this, ResId(MF_INDENT )), aStandardPB( this, ResId(PB_STANDARD )), - aPreviewGB( this, ResId(GB_PREVIEW )), aPreviewWIN( this, ResId(WIN_PREVIEW )), bInInintControl(FALSE), pActNum(0), @@ -906,6 +905,9 @@ IMPL_LINK(SwSvxNumBulletTabDialog, RemoveNumberingHdl, PushButton*, EMPTYARG) Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.2 2001/02/23 12:45:29 os + Complete use of DefaultNumbering component + Revision 1.1.1.1 2000/09/18 17:14:45 hr initial import diff --git a/sw/source/ui/misc/num.hrc b/sw/source/ui/misc/num.hrc index 4775a035f304..5febe4534331 100644 --- a/sw/source/ui/misc/num.hrc +++ b/sw/source/ui/misc/num.hrc @@ -2,9 +2,9 @@ * * $RCSfile: num.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,9 +60,9 @@ ************************************************************************/ -#define GB_LEVEL 1 +#define FL_LEVEL 1 #define LB_LEVEL 2 -#define GB_POSITION 3 +#define FL_POSITION 3 #define FT_BORDERDIST 4 #define MF_BORDERDIST 5 #define CB_RELATIVE 6 @@ -73,7 +73,6 @@ #define FT_ALIGN 11 #define LB_ALIGN 12 #define PB_STANDARD 13 -#define GB_PREVIEW 14 #define WIN_PREVIEW 15 #define ST_RESET 16 diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index 4abe93fd43c8..735b424524eb 100644 --- a/sw/source/ui/misc/num.src +++ b/sw/source/ui/misc/num.src @@ -2,9 +2,9 @@ * * $RCSfile: num.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:35:03 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,10 +79,10 @@ TabPage TP_NUM_POSITION SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; - GroupBox GB_LEVEL + FixedLine FL_LEVEL { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 38 , 179 ) ; + Size = MAP_APPFONT ( 35 , 8 ) ; Text = "Ebene" ; Text [ ENGLISH ] = "Level" ; Text [ norwegian ] = "Level" ; @@ -117,10 +117,10 @@ TabPage TP_NUM_POSITION Border = TRUE ; SimpleMode = TRUE ; }; - GroupBox GB_POSITION + FixedLine FL_POSITION { Pos = MAP_APPFONT ( 47 , 3 ) ; - Size = MAP_APPFONT ( 207 , 92 ) ; + Size = MAP_APPFONT ( 207 , 8 ) ; Text = "Position und Abstand" ; Text [ ENGLISH ] = "Position and distance" ; Group = TRUE ; @@ -148,8 +148,8 @@ TabPage TP_NUM_POSITION }; FixedText FT_BORDERDIST { - Pos = MAP_APPFONT ( 50 , 16 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; + Pos = MAP_APPFONT ( 53 , 16 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text = "Ein~rckung"; Text [ ENGLISH ] = "Distance text <-> border" ; Text [ english_us ] = "Indent" ; @@ -222,8 +222,8 @@ TabPage TP_NUM_POSITION }; FixedText FT_INDENT { - Pos = MAP_APPFONT ( 50 , 32 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; + Pos = MAP_APPFONT ( 53 , 32 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text = "Abstand zum Te~xt" ; Text [ ENGLISH ] = "Indent" ; Text [ english_us ] = "Space to Te~xt" ; @@ -268,8 +268,8 @@ TabPage TP_NUM_POSITION }; FixedText FT_NUMDIST { - Pos = MAP_APPFONT ( 50 , 48 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; + Pos = MAP_APPFONT ( 53 , 48 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text = "~Mindestabstand Nummer <-> Text" ; Text [ ENGLISH ] = "Distance text <-> numbering" ; Text [ english_us ] = "~Minimum space numbering <-> text" ; @@ -314,8 +314,8 @@ TabPage TP_NUM_POSITION }; FixedText FT_ALIGN { - Pos = MAP_APPFONT ( 50 , 64 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; + Pos = MAP_APPFONT ( 53 , 64 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text = "Ausri~chtung der Nummerierung" ; Text [ ENGLISH ] = "Alignment of the numbering" ; Text [ english_us ] = "Numbering ~alignment" ; @@ -513,38 +513,10 @@ TabPage TP_NUM_POSITION Text[ catalan ] = "~Predeterminado"; Text[ finnish ] = "~Oletusarvo"; }; - GroupBox GB_PREVIEW - { - Pos = MAP_APPFONT ( 47 , 98 ) ; - Size = MAP_APPFONT ( 207 , 84 ) ; - Text = "Vorschau" ; - Text [ ENGLISH ] = "Preview" ; - Text [ english_us ] = "Preview" ; - Text [ portuguese_brazilian ] = "Vorschau" ; - Text [ swedish ] = "Frhandsvisning" ; - Text [ danish ] = "Eksempel" ; - Text [ italian ] = "Anteprima" ; - Text [ spanish ] = "Previsualizacin" ; - Text [ french ] = "Aperu" ; - Text [ dutch ] = "Voorbeeld" ; - Text [ portuguese ] = "Previsualizar" ; - Text[ chinese_simplified ] = "Ԥ"; - Text[ russian ] = ""; - Text[ polish ] = "Podgld"; - Text[ japanese ] = "ޭ"; - Text[ chinese_traditional ] = "w"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "̸"; - Text[ turkish ] = "nizleme"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Previsualizacin"; - Text[ finnish ] = "Esikatselu"; - }; Window WIN_PREVIEW { - Pos = MAP_APPFONT ( 50 , 109 ) ; - Size = MAP_APPFONT ( 201 , 70 ) ; + Pos = MAP_APPFONT ( 53 , 99 ) ; + Size = MAP_APPFONT ( 198 , 80 ) ; }; }; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c8abab5a3e15..1b1f6871ef7b 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outline.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2001-04-22 14:04:26 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ class SwNumNamesDlg: public ModalDialog { Edit aFormEdit; ListBox aFormBox; - GroupBox aFormGrp; + FixedLine aFormFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; @@ -296,7 +296,7 @@ SwNumNamesDlg::SwNumNamesDlg(Window *pParent) : ModalDialog(pParent, SW_RES(DLG_NUM_NAMES)), aFormEdit(this, SW_RES(ED_FORM)), aFormBox(this, SW_RES(LB_FORM)), - aFormGrp(this, SW_RES(GB_FORM)), + aFormFL(this, SW_RES(FL_FORM)), aOKBtn(this, SW_RES(BT_OK)), aCancelBtn(this, SW_RES(BT_CANCEL)), aHelpBtn(this, SW_RES(BT_HELP)) @@ -552,9 +552,8 @@ short SwOutlineTabDialog::Ok() * --------------------------------------------------*/ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_OUTLINE_NUM), rSet), - aLevelGB( this, ResId(GB_LEVEL )), + aLevelFL( this, ResId(FL_LEVEL )), aLevelLB( this, ResId(LB_LEVEL )), - aPreviewGB( this, ResId(GB_PREVIEW )), aPreviewWIN( this, ResId(WIN_PREVIEW )), aCollLbl(this, SW_RES(FT_COLL)), aCollBox(this, SW_RES(LB_COLL)), @@ -571,7 +570,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte aSuffixED(this, SW_RES(ED_SUFFIX)), aStartLbl(this, SW_RES(FT_START)), aStartEdit(this, SW_RES(ED_START)), - aNumberGrp(this, SW_RES(GB_NUMBER)), + aNumberFL(this, SW_RES(FL_NUMBER)), aNoFmtName(SW_RES(ST_NO_COLL)), nActLevel(1), pCollNames(0), diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc index 2e7f639e8754..0565a6585e30 100644 --- a/sw/source/ui/misc/outline.hrc +++ b/sw/source/ui/misc/outline.hrc @@ -2,9 +2,9 @@ * * $RCSfile: outline.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ #define FI_3 13 #define FI_4 14 #define FI_5 15 -//#define GB_LEVEL 16 +//#define FL_LEVEL 16 #define FT_COLL 20 #define LB_COLL 21 @@ -85,21 +85,21 @@ #define ED_DELIM_BEVOR 27 #define ED_DELIM_AFTER 28 #define CB_COMPLETE 29 -#define GB_NUMBER 30 +#define FL_NUMBER 30 #define LB_ALIGN 31 -#define GB_ALIGN 33 +#define FL_ALIGN 33 #define FT_START 40 #define ED_START 41 -#define GB_START 42 +#define FL_START 42 #define BT_OK 100 #define BT_CANCEL 101 #define BT_HELP 102 #define BT_FORM 103 #define BT_RESET 104 -#define GB_FORM 105 +#define FL_FORM 105 #define LB_FORM 106 #define ED_FORM 107 #define FT_ALL_LEVEL 108 @@ -118,10 +118,9 @@ #define MN_FORM9 119 #define MN_SAVE 120 -#define GB_LEVEL 130 +#define FL_LEVEL 130 #define LB_LEVEL 131 #define WIN_PREVIEW 132 -#define GB_PREVIEW 133 #define FT_SUFFIX 134 #define ED_SUFFIX 135 #define FT_PREFIX 136 diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index 260acd5c75f8..e80157b24af5 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.src @@ -2,9 +2,9 @@ * * $RCSfile: outline.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:38:09 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,10 +108,10 @@ ModalDialog DLG_NUM_NAMES Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_FORM + FixedLine FL_FORM { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; Text = "Form" ; Text [ ENGLISH ] = "Form" ; Text [ english_us ] = "Format" ; @@ -871,15 +871,15 @@ TabPage TP_OUTLINE_NUM ListBox LB_LEVEL { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 21 , 129 ) ; + Size = MAP_APPFONT ( 26 , 129 ) ; TabStop = TRUE ; DropDown = FALSE ; Border = TRUE ; }; - GroupBox GB_LEVEL + FixedLine FL_LEVEL { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 33 , 143 ) ; + Size = MAP_APPFONT ( 35 , 8 ) ; Text = "Ebene" ; Text [ ENGLISH ] = "Level" ; Text [ norwegian ] = "Level" ; @@ -907,7 +907,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_COLL { - Pos = MAP_APPFONT ( 48 , 14 ) ; + Pos = MAP_APPFONT ( 53 , 14 ) ; Size = MAP_APPFONT ( 81 , 8 ) ; Text = "~Absatzvorlage" ; Text [ ENGLISH ] = "~Paragraph style" ; @@ -939,8 +939,8 @@ TabPage TP_OUTLINE_NUM ListBox LB_COLL { Border = TRUE ; - Pos = MAP_APPFONT ( 48 , 25 ) ; - Size = MAP_APPFONT ( 122 , 75 ) ; + Pos = MAP_APPFONT ( 53 , 25 ) ; + Size = MAP_APPFONT ( 117 , 75 ) ; TabStop = TRUE ; Group = TRUE ; Sort = TRUE ; @@ -949,7 +949,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_NUMBER { - Pos = MAP_APPFONT ( 48 , 43 ) ; + Pos = MAP_APPFONT ( 53 , 43 ) ; Size = MAP_APPFONT ( 35 , 8 ) ; Text = "~Nummer" ; Text [ ENGLISH ] = "~Number" ; @@ -979,8 +979,8 @@ TabPage TP_OUTLINE_NUM }; ListBox LB_NUMBER { - Pos = MAP_APPFONT ( 97 , 41 ) ; - Size = MAP_APPFONT ( 73 , 65 ) ; + Pos = MAP_APPFONT ( 100 , 41 ) ; + Size = MAP_APPFONT ( 70 , 65 ) ; TabStop = TRUE ; Group = TRUE ; DropDown = TRUE ; @@ -988,7 +988,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_CHARFMT { - Pos = MAP_APPFONT ( 48 , 59 ) ; + Pos = MAP_APPFONT ( 53 , 59 ) ; Size = MAP_APPFONT ( 45 , 8 ) ; Text = "Zeichenv~orlage" ; Text [ ENGLISH ] = "Character style" ; @@ -1018,13 +1018,13 @@ TabPage TP_OUTLINE_NUM { TabStop = TRUE ; DropDown = TRUE ; - Pos = MAP_APPFONT ( 97 , 57 ) ; - Size = MAP_APPFONT ( 73 , 65 ) ; + Pos = MAP_APPFONT ( 100 , 57 ) ; + Size = MAP_APPFONT ( 70 , 65 ) ; }; FixedText FT_ALL_LEVEL { - Pos = MAP_APPFONT ( 48 , 75 ) ; - Size = MAP_APPFONT ( 48 , 10 ) ; + Pos = MAP_APPFONT ( 53 , 75 ) ; + Size = MAP_APPFONT ( 46 , 8 ) ; Text = "~Vollstndig" ; Text [ ENGLISH ] = "~Complete" ; Text [ norwegian ] = "~Fullstendig" ; @@ -1053,8 +1053,8 @@ TabPage TP_OUTLINE_NUM NumericField NF_ALL_LEVEL { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 73 ) ; - Size = MAP_APPFONT ( 73 , 12 ) ; + Pos = MAP_APPFONT ( 100 , 73 ) ; + Size = MAP_APPFONT ( 70 , 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -1067,7 +1067,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_DELIM { - Pos = MAP_APPFONT ( 48 , 89 ) ; + Pos = MAP_APPFONT ( 53 , 89 ) ; Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Trennzeichen" ; Text [ ENGLISH ] = "Delimiter" ; @@ -1097,7 +1097,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_PREFIX { - Pos = MAP_APPFONT ( 54 , 102 ) ; + Pos = MAP_APPFONT ( 59 , 102 ) ; Size = MAP_APPFONT ( 40 , 8 ) ; Text = "~davor" ; Text [ ENGLISH ] = "before" ; @@ -1128,15 +1128,15 @@ TabPage TP_OUTLINE_NUM Edit ED_PREFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 100 ) ; - Size = MAP_APPFONT ( 73 , 12 ) ; + Pos = MAP_APPFONT ( 100 , 100 ) ; + Size = MAP_APPFONT ( 70 , 12 ) ; TabStop = TRUE ; Group = TRUE ; Left = TRUE ; }; FixedText FT_SUFFIX { - Pos = MAP_APPFONT ( 54 , 117 ) ; + Pos = MAP_APPFONT ( 59 , 117 ) ; Size = MAP_APPFONT ( 40 , 8 ) ; Text = "dah~inter" ; Text [ ENGLISH ] = "behind" ; @@ -1167,15 +1167,15 @@ TabPage TP_OUTLINE_NUM Edit ED_SUFFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 115 ) ; - Size = MAP_APPFONT ( 73 , 12 ) ; + Pos = MAP_APPFONT ( 100 , 115 ) ; + Size = MAP_APPFONT ( 70 , 12 ) ; TabStop = TRUE ; Group = TRUE ; Left = TRUE ; }; FixedText FT_START { - Pos = MAP_APPFONT ( 48 , 133 ) ; + Pos = MAP_APPFONT ( 53 , 133 ) ; Size = MAP_APPFONT ( 43 , 8 ) ; Text = "~Beginn bei" ; Text [ English ] = "~Start at" ; @@ -1206,8 +1206,8 @@ TabPage TP_OUTLINE_NUM NumericField ED_START { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 131 ) ; - Size = MAP_APPFONT ( 73 , 12 ) ; + Pos = MAP_APPFONT ( 100 , 131 ) ; + Size = MAP_APPFONT ( 70 , 12 ) ; TabStop = TRUE ; Left = TRUE ; Spin = TRUE ; @@ -1218,10 +1218,10 @@ TabPage TP_OUTLINE_NUM Last = 99 ; SpinSize = 1 ; }; - GroupBox GB_NUMBER + FixedLine FL_NUMBER { - Pos = MAP_APPFONT ( 42 , 3 ) ; - Size = MAP_APPFONT ( 131 , 143 ) ; + Pos = MAP_APPFONT ( 47 , 3 ) ; + Size = MAP_APPFONT ( 207 , 8 ) ; Text = "Nummerierung" ; Text [ ENGLISH ] = "Numbering" ; Text [ norwegian ] = "Nummering" ; @@ -1253,34 +1253,6 @@ TabPage TP_OUTLINE_NUM Pos = MAP_APPFONT ( 179 , 14 ) ; Size = MAP_APPFONT ( 72 , 129 ) ; }; - GroupBox GB_PREVIEW - { - Pos = MAP_APPFONT ( 176 , 3 ) ; - Size = MAP_APPFONT ( 78 , 143 ) ; - Text = "Vorschau" ; - Text [ ENGLISH ] = "Preview" ; - Text [ english_us ] = "Preview" ; - Text [ portuguese_brazilian ] = "Vorschau" ; - Text [ swedish ] = "Frhandsvisning" ; - Text [ danish ] = "Eksempel" ; - Text [ italian ] = "Anteprima" ; - Text [ spanish ] = "Previsualizacin" ; - Text [ french ] = "Aperu" ; - Text [ dutch ] = "Voorbeeld" ; - Text [ portuguese ] = "Previsualizar" ; - Text[ chinese_simplified ] = "Ԥ"; - Text[ russian ] = ""; - Text[ polish ] = "Podgld"; - Text[ japanese ] = "ޭ"; - Text[ chinese_traditional ] = "w"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "̸"; - Text[ turkish ] = "nizleme"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Previsualizacin"; - Text[ finnish ] = "Esikatselu"; - }; String ST_NO_COLL { Text = "(keine)" ; diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index c89144c7f075..11675449aed5 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jp $ $Date: 2001-04-24 18:11:39 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,14 +222,14 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : aTypDLB3(this, SW_RES(DLB_KEY3 )), aSortUp3RB(this, SW_RES(RB_UP3 )), aSortDn3RB(this, SW_RES(RB_DN3 )), - aSortGrp(this, SW_RES(GB_SORT )), + aSortFL(this, SW_RES(FL_SORT_2 )), aColumnRB(this, SW_RES(RB_COL )), aRowRB(this, SW_RES(RB_ROW )), - aDirGrp(this, SW_RES(GB_DIR )), + aDirFL(this, SW_RES(FL_DIR )), aDelimTabRB(this, SW_RES(RB_TAB )), aDelimFreeRB(this, SW_RES(RB_TABCH )), aDelimEdt(this, SW_RES(ED_TABCH )), - aDelimGrp(this, SW_RES(GB_DELIM )), + aDelimFL(this, SW_RES(FL_DELIM )), aDelimPB(this, SW_RES( PB_DELIM)), aLangFL(this, SW_RES( FL_LANG )), aLangLB(this, SW_RES( LB_LANG )), @@ -536,6 +536,9 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.6 2001/04/24 18:11:39 jp + use CollatorResource + Revision 1.5 2001/04/06 08:59:00 jp changes for international (CJK)-sorting diff --git a/sw/source/ui/misc/srtdlg.hrc b/sw/source/ui/misc/srtdlg.hrc index 4333c222ea60..0c8d5472c846 100644 --- a/sw/source/ui/misc/srtdlg.hrc +++ b/sw/source/ui/misc/srtdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2001-04-06 08:59:01 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,17 +71,17 @@ #define CB_KEY3 11 #define ED_KEY3 12 #define DLB_KEY3 13 -#define GB_SORT 14 +#define FL_SORT_2 14 #define RB_COL 15 #define RB_ROW 16 -#define GB_DIR 17 +#define FL_DIR 17 #define RB_UP 18 #define RB_DN 19 -#define GB_ORDER 20 +#define FL_ORDER 20 #define RB_TAB 21 #define RB_TABCH 22 #define ED_TABCH 23 -#define GB_DELIM 24 +#define FL_DELIM 24 #define STR_ROW 25 #define STR_COL 26 #define BT_HELP 27 diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index b4da2e91bbbf..629b3c02cbda 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-05-17 08:43:36 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -568,7 +568,7 @@ ModalDialog DLG_SORTING Text[ language_user1 ] = " "; Text[ catalan ] = "Des~cendente"; }; - FixedLine GB_SORT + FixedLine FL_SORT_2 { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 200 , 8 ) ; @@ -658,10 +658,10 @@ ModalDialog DLG_SORTING Text[ language_user1 ] = " "; Text[ catalan ] = "~Filas"; }; - FixedLine GB_DIR + FixedLine FL_DIR { Pos = MAP_APPFONT ( 6 , 108 ) ; - Size = MAP_APPFONT ( 98 , 8 ) ; + Size = MAP_APPFONT ( 95 , 8 ) ; Text = "Richtung" ; Text [ ENGLISH ] = "Direction" ; Text [ norwegian ] = "Retning" ; @@ -756,7 +756,7 @@ ModalDialog DLG_SORTING TabStop = TRUE ; Left = TRUE ; }; - FixedLine GB_DELIM + FixedLine FL_DELIM { Pos = MAP_APPFONT ( 107 , 108 ) ; Size = MAP_APPFONT ( 99 , 8 ) ; @@ -849,7 +849,7 @@ ModalDialog DLG_SORTING FixedLine FL_LANG { Pos = MAP_APPFONT ( 6 , 147 ) ; - Size = MAP_APPFONT ( 99 , 8 ) ; + Size = MAP_APPFONT ( 95 , 8 ) ; Text = "Sprache" ; Text [ ENGLISH ] = "Language" ; Text[ english_us ] = "Language"; @@ -875,8 +875,8 @@ ModalDialog DLG_SORTING }; ListBox LB_LANG { - Pos = MAP_APPFONT ( 12 , 157 ) ; - Size = MAP_APPFONT ( 90 , 61 ) ; + Pos = MAP_APPFONT ( 12 , 158 ) ; + Size = MAP_APPFONT ( 83 , 61 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -910,8 +910,8 @@ ModalDialog DLG_SORTING }; CheckBox CB_CASE { - Pos = MAP_APPFONT ( 113 , 160 ) ; - Size = MAP_APPFONT ( 90 , 12 ) ; + Pos = MAP_APPFONT ( 113 , 159 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; Text = "Exacter Vergleich" ; Text [ ENGLISH ] = "Case sensitive" ; |