diff options
| author | Oliver Specht <os@openoffice.org> | 2001-02-09 07:01:42 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2001-02-09 07:01:42 +0000 |
| commit | 33cd57d3a9b8e5af03c6373fdbc5e55f6f96d4fe (patch) | |
| tree | 69d3b959b6756a86a03a4f52dc0891def79c7221 /sw/source | |
| parent | 4ce6e5c5aca342b121f145b133b286a8e4cfe775 (diff) | |
TabPage size changed
Diffstat (limited to 'sw/source')
26 files changed, 1029 insertions, 1562 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 44c7e82000a6..d8dc4b9780d6 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopt.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2000-10-30 14:33:37 $ + * last change: $Author: os $ $Date: 2001-02-09 07:56:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -534,7 +534,6 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem case RID_SW_TP_HTML_OPTGRID_PAGE: case RID_SVXPAGE_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); - ((SvxGridTabPage*)pRet)->HideSnapGrid(); break; break; @@ -588,6 +587,9 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem /*------------------------------------------------------------------------- $Log: not supported by cvs2svn $ + Revision 1.4 2000/10/30 14:33:37 jp + GetBinding: View must not exist + Revision 1.3 2000/10/06 13:31:28 jp should changes: don't use IniManager diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 2085ae238eb4..86e116d1c1a4 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: optdlg.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:33 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,8 +145,7 @@ #define GRP_2 72 #define GRP_3 73 #define GRP_4 74 -#define GRP_5 75 -#define GB_FAX 76 +#define FT_FAX 76 #define CB_BACKGROUND 79 #define RB_NO 80 diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 4c021c59fc30..9de1c83416ca 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: optdlg.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2001-01-23 10:06:07 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,12 +79,12 @@ TabPage TP_CONTENT_OPT { HelpID = HID_CONTENT_OPT ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_DISP { - Pos = MAP_APPFONT ( 6 , 2 ) ; - Size = MAP_APPFONT ( 120 , 69 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 120 , 77 ) ; Text = "Anzeigen" ; Text [ ENGLISH ] = "Display" ; Text [ norwegian ] = "Display" ; @@ -112,7 +112,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_GRF { - Pos = MAP_APPFONT ( 12 , 11 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Grafiken und Objekte" ; Text [ ENGLISH ] = "Gra~phics and Objects" ; @@ -142,7 +142,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_TBL { - Pos = MAP_APPFONT ( 12 , 23 ) ; + Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Tabellen " ; Text [ ENGLISH ] = "~Tables" ; @@ -170,7 +170,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_DRWFAST { - Pos = MAP_APPFONT ( 12 , 35 ) ; + Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Zeichnungen und ~Kontrollfelder" ; Text [ ENGLISH ] = "Dra~wings and controls" ; @@ -198,7 +198,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_FIELD { - Pos = MAP_APPFONT ( 12 , 47 ) ; + Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? F~eldname : F~eldname anzeigen */ Text = "F~eldnamen" ; @@ -225,7 +225,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_POSTIT { - Pos = MAP_APPFONT ( 12 , 59 ) ; + Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "N~otizen" ; Text [ ENGLISH ] = "N~otes" ; @@ -251,8 +251,8 @@ TabPage TP_CONTENT_OPT }; GroupBox GB_BACK { - Pos = MAP_APPFONT ( 6 , 74 ) ; - Size = MAP_APPFONT ( 120 , 57 ) ; + Pos = MAP_APPFONT ( 6 , 83 ) ; + Size = MAP_APPFONT ( 120 , 63 ) ; Text = "Hinterlegung" ; Text [ ENGLISH ] = "Background" ; Text [ norwegian ] = "Background" ; @@ -280,7 +280,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_IDX_ENTRY { - Pos = MAP_APPFONT ( 12 , 83 ) ; + Pos = MAP_APPFONT ( 12 , 94 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Verzeichniseintr~ge" ; Text [ ENGLISH ] = "Index entries" ; @@ -308,7 +308,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_INDEX { - Pos = MAP_APPFONT ( 12 , 95 ) ; + Pos = MAP_APPFONT ( 12 , 107 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Verzeichn~isse" ; Text [ ENGLISH ] = "Indexes" ; @@ -334,7 +334,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_FOOTBACK { - Pos = MAP_APPFONT ( 12 , 107 ) ; + Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Fu~noten" ; Text [ ENGLISH ] = "Footnotes" ; @@ -360,9 +360,8 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_FLDBACK { - Pos = MAP_APPFONT ( 12 , 119 ) ; + Pos = MAP_APPFONT ( 12 , 133 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Felder : ~Felder hinterlegen */ Text = "~Felder" ; Text [ ENGLISH ] = "Fields" ; Text [ english_us ] = "Fie~lds" ; @@ -388,8 +387,8 @@ TabPage TP_CONTENT_OPT //_---------------------------- GroupBox GB_NOPRINT { - Pos = MAP_APPFONT ( 134 , 2 ) ; - Size = MAP_APPFONT ( 120 , 129 ) ; + Pos = MAP_APPFONT ( 134 , 3 ) ; + Size = MAP_APPFONT ( 120 , 143 ) ; Text = "Nicht druckbare Zeichen" ; Text [ ENGLISH ] = "Unprintable Characters" ; Text [ norwegian ] = "Unprintable Characters" ; @@ -417,7 +416,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_PARA { - Pos = MAP_APPFONT ( 140 , 12 ) ; + Pos = MAP_APPFONT ( 140 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Absatzende" ; Text [ ENGLISH ] = "Paragraph ends" ; @@ -447,7 +446,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_SHYPH { - Pos = MAP_APPFONT ( 140 , 25 ) ; + Pos = MAP_APPFONT ( 140 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Weiche Trenner" ; Text [ ENGLISH ] = "Soft hyphens" ; @@ -475,7 +474,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_SPACE { - Pos = MAP_APPFONT ( 140 , 38 ) ; + Pos = MAP_APPFONT ( 140 , 40 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Lee~rzeichen" ; Text [ ENGLISH ] = "Spaces" ; @@ -503,7 +502,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_HSPACE { - Pos = MAP_APPFONT ( 140 , 51 ) ; + Pos = MAP_APPFONT ( 140 , 53 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Ge~sch. Leerzeichen" ; Text [ ENGLISH ] = "Nonbreaking spaces" ; @@ -531,7 +530,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_TAB { - Pos = MAP_APPFONT ( 140 , 64 ) ; + Pos = MAP_APPFONT ( 140 , 66 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Ta~bulatoren" ; Text [ ENGLISH ] = "~Tabs" ; @@ -559,7 +558,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_BREAK { - Pos = MAP_APPFONT ( 140 , 77 ) ; + Pos = MAP_APPFONT ( 140 , 79 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Umbr~che" ; Text [ ENGLISH ] = "Breaks" ; @@ -587,7 +586,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_HIDDEN { - Pos = MAP_APPFONT ( 140 , 90 ) ; + Pos = MAP_APPFONT ( 140 , 92 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Verste~ckter Text" ; Text [ ENGLISH ] = "~Hidden text" ; @@ -615,7 +614,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_HIDDEN_PARA { - Pos = MAP_APPFONT ( 140 , 103 ) ; + Pos = MAP_APPFONT ( 140 , 105 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Versteckte Abstze" ; Text [ ENGLISH ] = "H~idden paragraphs" ; @@ -650,11 +649,11 @@ TabPage TP_LAYOUT_OPT HelpID = HID_LAYOUT_OPT ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; GroupBox GB_LINE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 120 , 93 ) ; + Size = MAP_APPFONT ( 120 , 89 ) ; Text = "Linien" ; Text [ ENGLISH ] = "Lines" ; Group = TRUE ; @@ -680,7 +679,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_TXTBEG { - Pos = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Te~xtbegrenzungen" ; Text [ ENGLISH ] = "Text boundaries" ; @@ -709,7 +708,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_TABBEG { - Pos = MAP_APPFONT ( 12 , 25 ) ; + Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Tabelle~nbegrenzungen" ; Text [ ENGLISH ] = "~Table boundaries" ; @@ -737,7 +736,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_SECT_BOUNDS { - Pos = MAP_APPFONT ( 12 , 38 ) ; + Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Bereichsbegrenzungen" ; Text [ ENGLISH ] = "~Section boundaries" ; @@ -763,7 +762,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_CROSS { - Pos = MAP_APPFONT ( 12 , 51 ) ; + Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "H~ilfslinien" ; Text [ ENGLISH ] = "~Crosshair" ; @@ -791,7 +790,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_HANDLE { - Pos = MAP_APPFONT ( 12 , 64 ) ; + Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Einfache Griffe" ; Text [ ENGLISH ] = "Simple Handles" ; @@ -817,7 +816,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_BIGHANDLE { - Pos = MAP_APPFONT ( 12 , 77 ) ; + Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Groe Griffe" ; Text [ ENGLISH ] = "Big Handles" ; @@ -844,7 +843,7 @@ TabPage TP_LAYOUT_OPT GroupBox GB_WINDOW { Pos = MAP_APPFONT ( 134 , 3 ) ; - Size = MAP_APPFONT ( 120 , 93 ) ; + Size = MAP_APPFONT ( 120 , 89 ) ; Text = "Fenster"; Text [ italian ] = "Finestra"; Text [ portuguese_brazilian ] = "Janela"; @@ -871,7 +870,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_HSCROLL { - Pos = MAP_APPFONT ( 140 , 12 ) ; + Pos = MAP_APPFONT ( 140 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Horizontale Bildla~ufleiste" ; Text [ ENGLISH ] = "~Horizontal scrollbar" ; @@ -897,7 +896,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_VSCROLL { - Pos = MAP_APPFONT ( 140 , 25 ) ; + Pos = MAP_APPFONT ( 140 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Vertikale Bildlaufleiste" ; Text [ ENGLISH ] = "~Vertical scrollbar" ; @@ -923,7 +922,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_HRULER { - Pos = MAP_APPFONT ( 140 , 38 ) ; + Pos = MAP_APPFONT ( 140 , 40 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Horizontales ~Lineal" ; Text [ ENGLISH ] = "~Horic. ruler" ; @@ -951,7 +950,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_VRULER { - Pos = MAP_APPFONT ( 140 , 51 ) ; + Pos = MAP_APPFONT ( 140 , 53 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "Verti~kales Lineal" ; Text [ ENGLISH ] = "~Vert. ruler" ; @@ -979,7 +978,7 @@ TabPage TP_LAYOUT_OPT }; CheckBox CB_SMOOTH_SCROLL { - Pos = MAP_APPFONT ( 140 , 64 ) ; + Pos = MAP_APPFONT ( 140 , 66 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text = "~Weiches Scrollen" ; Text [ ENGLISH ] = "S~mooth scroll" ; @@ -1005,7 +1004,7 @@ TabPage TP_LAYOUT_OPT }; GroupBox GB_METRIC { - Pos = MAP_APPFONT ( 6 , 101 ) ; + Pos = MAP_APPFONT ( 6 , 95 ) ; Size = MAP_APPFONT ( 120 , 26 ) ; Text = "Maeinheit"; Text [ ENGLISH ] = "Metric Units" ; @@ -1033,7 +1032,7 @@ TabPage TP_LAYOUT_OPT }; ListBox LB_METRIC { - Pos = MAP_APPFONT ( 12 , 112 ) ; + Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 70 , 50 ) ; Border = TRUE ; DropDown = TRUE ; @@ -1319,7 +1318,7 @@ TabPage TP_LAYOUT_OPT }; GroupBox GB_TAB { - Pos = MAP_APPFONT ( 134 , 101 ) ; + Pos = MAP_APPFONT ( 134 , 95 ) ; Size = MAP_APPFONT ( 120 , 26 ) ; Text = "Tabulatorenabstand"; Text [ ENGLISH ] = "Default Tab distance" ; @@ -1349,7 +1348,7 @@ TabPage TP_LAYOUT_OPT MetricField MF_TAB { Border = TRUE ; - Pos = MAP_APPFONT ( 140 , 110 ) ; + Pos = MAP_APPFONT ( 140 , 106 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -1371,12 +1370,12 @@ TabPage TP_LAYOUT_OPT TabPage TP_OPTPRINT_PAGE { HelpID = HID_OPTPRINT_PAGE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GRP_1 { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 78 , 92 ) ; + Size = MAP_APPFONT ( 78 , 89 ) ; Text = "Inhalt" ; Text [ ENGLISH ] = "Contents" ; Text [ norwegian ] = "Innhold " ; @@ -1571,7 +1570,7 @@ TabPage TP_OPTPRINT_PAGE GroupBox GRP_2 { Pos = MAP_APPFONT ( 90 , 3 ) ; - Size = MAP_APPFONT ( 78 , /*92*/66 ) ; + Size = MAP_APPFONT ( 78 , 89 ) ; Text = "Seiten" ; Text [ ENGLISH ] = "Pages" ; Text [ norwegian ] = "Pages" ; @@ -1826,7 +1825,7 @@ TabPage TP_OPTPRINT_PAGE GroupBox GRP_3 { Pos = MAP_APPFONT ( 174 , 3 ) ; - Size = MAP_APPFONT ( 80 , /*92*/66 ) ; + Size = MAP_APPFONT ( 80 , 89 ) ; Text = "Notizen" ; Text [ ENGLISH ] = "Notes" ; Text [ norwegian ] = "Notes" ; @@ -1852,36 +1851,35 @@ TabPage TP_OPTPRINT_PAGE Text[ turkish ] = "Not"; Text[ language_user1 ] = " "; }; - - GroupBox GRP_5 - { - Pos = MAP_APPFONT ( 90 , 70 ) ; - Size = MAP_APPFONT ( 164 , 25 ) ; - Text = "Ausgabe" ; - Text [ ENGLISH ] = "Destination" ; - Text [ english_us ] = "Output" ; - Text [ italian ] = "Destinazione" ; - Text [ spanish ] = "Destino" ; - Text [ french ] = "Sortie" ; - Text [ dutch ] = "Uitgave" ; - Text [ swedish ] = "Utdata" ; - Text [ danish ] = "Output" ; - Text [ portuguese_brazilian ] = "Ausgabe" ; - Text [ portuguese ] = "Destino" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; - Text[ polish ] = "Wyjcie"; - Text[ japanese ] = "߯"; - Text[ chinese_traditional ] = "X"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = ""; - Text[ turkish ] = "kt"; + GroupBox GRP_4 + { + Pos = MAP_APPFONT ( 6 , 95 ) ; + Size = MAP_APPFONT ( 248 , 52 ) ; + Text = "Sonstiges" ; + Text [ English ] = "Other" ; + Text [ dutch ] = "Overige" ; + Text [ english_us ] = "Other" ; + Text [ italian ] = "Altro" ; + Text [ spanish ] = "Otros" ; + Text [ french ] = "Autres" ; + Text [ swedish ] = "Annat" ; + Text [ danish ] = "Andet" ; + Text [ portuguese ] = "Outros" ; + Text [ portuguese_brazilian ] = "Sonstiges" ; + Text[ chinese_simplified ] = ""; + Text[ russian ] = ""; + Text[ polish ] = "Inne"; + Text[ japanese ] = "̑"; + Text[ chinese_traditional ] = "L"; + Text[ arabic ] = " "; + Text[ greek ] = ""; + Text[ korean ] = "Ÿ"; + Group = TRUE ; }; CheckBox CB_SINGLEJOBS { - Pos = MAP_APPFONT ( 96 , 81 ) ; - Size = MAP_APPFONT ( 152 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 106 ) ; + Size = MAP_APPFONT ( 200 , 10 ) ; Text = "Einzelne Druck~jobs erzeugen" ; Text [ ENGLISH ] = "Si~ngle print jobs" ; TabStop = TRUE ; @@ -1904,83 +1902,22 @@ TabPage TP_OPTPRINT_PAGE Text[ korean ] = " μ ۾(~S)"; Text[ turkish ] = "Bi~reysel yazdrma ileri olutur"; }; - CheckBox CB_PAPERFROMSETUP { - Pos = MAP_APPFONT ( 138 , 112 ) ; - Size = MAP_APPFONT ( 108 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 119 ) ; + Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; - Text = "aus ~Druckereinstellung" ; - Text [ ENGLISH ] = "from printer ~setup" ; - Text [ norwegian ] = "from printer ~setup" ; - Text [ italian ] = "Come da imposta~zione stampante" ; - Text [ portuguese_brazilian ] = "da impressora ~setup" ; - Text [ portuguese ] = "Da configurao da ~impressora" ; - Text [ finnish ] = "kirjoittimen ~asetuksista" ; - Text [ danish ] = "fra udskriftsindstillingerne" ; - Text [ french ] = "d'aprs ~les paramtres de l'imprimante" ; - Text [ swedish ] = "frn ~skrivarinstllning" ; - Text [ dutch ] = "~uit printerinstelling" ; - Text [ spanish ] = "De la c~onfiguracin de la impresora" ; - Text [ english_us ] = "From printer ~settings" ; - Group = TRUE ; - Text[ chinese_simplified ] = "ôӡ趨(~S)"; - Text[ russian ] = " "; - Text[ polish ] = "Z ustaw~ienia drukarki"; - Text[ japanese ] = "̐ݒ肩(~S)"; - Text[ chinese_traditional ] = "ĥΦL]w(~S)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " (~S)"; - Text[ turkish ] = "Yazc ayarlarn kullan"; - Text[ language_user1 ] = " "; - }; - GroupBox GRP_4 - { - Pos = MAP_APPFONT ( 132 , 101 ) ; - Size = MAP_APPFONT ( 122 , 29 ) ; - Text = "Papierschacht" ; - Text [ English ] = "Paper tray" ; - Text [ norwegian ] = "Paper tray" ; - Text [ italian ] = "Cassetto" ; - Text [ portuguese_brazilian ] = "Bandeja para o papel" ; - Text [ portuguese ] = "Tabuleiro de alimentao" ; - Text [ finnish ] = "Paperilokero" ; - Text [ danish ] = "Papirbakke" ; - Text [ french ] = "Bac d'alimentation" ; - Text [ swedish ] = "Pappersmagasin" ; - Text [ dutch ] = "Papierinvoer" ; - Text [ spanish ] = "Origen del papel" ; - Text [ english_us ] = "Paper tray" ; - Group = TRUE ; - Text[ chinese_simplified ] = "ֽԴ"; - Text[ russian ] = " "; - Text[ polish ] = "Zasobnik papieru"; - Text[ japanese ] = "@"; - Text[ chinese_traditional ] = "ȱiӷ"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " "; - Text[ turkish ] = "Kat kayna"; - Text[ language_user1 ] = " "; + Text = "Papierschacht aus ~Druckereinstellung" ; + Text [ ENGLISH ] = "Paper tray from printer ~setup" ; + Text [ norwegian ] = "Paper tray from printer ~setup" ; }; - ListBox LB_FAX + FixedText FT_FAX { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 112 ) ; - Size = MAP_APPFONT ( 108 , 70 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Sort = TRUE ; + Pos = MAP_APPFONT ( 12 , 134 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Group = TRUE ; - }; - GroupBox GB_FAX - { - Pos = MAP_APPFONT ( 6 , 101 ) ; - Size = MAP_APPFONT ( 120 , 29 ) ; - Text = "Fax" ; + Text = "Fa~x" ; Text[English] = "Fax" ; - Group = TRUE ; Text[ english_us ] = "Fax"; Text[ portuguese ] = "Fax"; Text[ russian ] = ""; @@ -1999,7 +1936,16 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "ǯu"; Text[ arabic ] = ""; Text[ turkish ] = "Faks"; - Text[ language_user1 ] = " "; + }; + ListBox LB_FAX + { + Border = TRUE ; + Pos = MAP_APPFONT ( 70 , 132 ) ; + Size = MAP_APPFONT ( 184 , 70 ) ; + TabStop = TRUE ; + DropDown = TRUE ; + Sort = TRUE ; + Group = TRUE ; }; }; /**************************************************************************/ @@ -2010,12 +1956,12 @@ TabPage TP_OPTPRINT_PAGE TabPage TP_STD_FONT { HelpID = HID_STD_FONT ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_STDCHR { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 159 , 113 ) ; + Size = MAP_APPFONT ( 195 , 113 ) ; Text = "Grundschriften" ; Text [ English ] = "Standard fonts" ; Text [ norwegian ] = "Standard fonts" ; @@ -2186,7 +2132,7 @@ TabPage TP_STD_FONT ComboBox LB_STANDARD { Pos = MAP_APPFONT ( 63 , 14 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -2194,7 +2140,7 @@ TabPage TP_STD_FONT ComboBox LB_TITLE { Pos = MAP_APPFONT ( 63 , 31 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 135, 73 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -2202,7 +2148,7 @@ TabPage TP_STD_FONT ComboBox LB_LIST { Pos = MAP_APPFONT ( 63 , 48 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -2210,7 +2156,7 @@ TabPage TP_STD_FONT ComboBox LB_LABEL { Pos = MAP_APPFONT ( 63 , 65 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -2218,7 +2164,7 @@ TabPage TP_STD_FONT ComboBox LB_IDX { Pos = MAP_APPFONT ( 63 , 83 ) ; - Size = MAP_APPFONT ( 96 , 73 ) ; + Size = MAP_APPFONT ( 135, 73 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; @@ -2251,7 +2197,7 @@ TabPage TP_STD_FONT }; PushButton PB_STANDARD { - Pos = MAP_APPFONT ( 171 , 6 ) ; + Pos = MAP_APPFONT ( 204 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text = "S~tandard" ; Text [ English ] = "S~tandard" ; @@ -2284,12 +2230,12 @@ TabPage TP_STD_FONT TabPage TP_OPTTABLE_PAGE { HelpID = HID_OPTTABLE_PAGE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_MOVE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 120 , 39 ) ; + Size = MAP_APPFONT ( 120 , 41 ) ; Text = "Verschieben" ; Text [ English ] = "Move" ; Text [ english_us ] = "Shift" ; @@ -2314,8 +2260,8 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_ROWMOVE { - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 16 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; Text = "~Zeile" ; Text [ English ] = "~Row" ; Text [ english_us ] = "~Row" ; @@ -2341,7 +2287,7 @@ TabPage TP_OPTTABLE_PAGE MetricField MF_ROWMOVE { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 11 ) ; + Pos = MAP_APPFONT ( 83 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -2356,8 +2302,8 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_COLMOVE { - Pos = MAP_APPFONT ( 12 , 27 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 31 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; Text = "~Spalte" ; Text [ English ] = "~Column" ; Text [ english_us ] = "~Column" ; @@ -2383,7 +2329,7 @@ TabPage TP_OPTTABLE_PAGE MetricField MF_COLMOVE { Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 26 ) ; + Pos = MAP_APPFONT ( 83 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -2399,7 +2345,7 @@ TabPage TP_OPTTABLE_PAGE GroupBox GB_INSERT { Pos = MAP_APPFONT ( 132 , 3 ) ; - Size = MAP_APPFONT ( 120 , 39 ) ; + Size = MAP_APPFONT ( 122 , 41 ) ; Text = "Einfgen" ; Text [ English ] = "Insert" ; Text [ english_us ] = "Insert" ; @@ -2424,8 +2370,8 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_ROWINSERT { - Pos = MAP_APPFONT ( 138 , 12 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; + Pos = MAP_APPFONT ( 138 , 16 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; Text = "Z~eile" ; Text [ English ] = "Ro~w" ; Text [ english_us ] = "Ro~w" ; @@ -2451,7 +2397,7 @@ TabPage TP_OPTTABLE_PAGE MetricField MF_ROWINSERT { Border = TRUE ; - Pos = MAP_APPFONT ( 192 , 11 ) ; + Pos = MAP_APPFONT ( 211 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -2466,7 +2412,7 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_COLINSERT { - Pos = MAP_APPFONT ( 138 , 27 ) ; + Pos = MAP_APPFONT ( 138 , 31 ) ; Size = MAP_APPFONT ( 51 , 10 ) ; Text = "S~palte" ; Text [ English ] = "C~olumn" ; @@ -2493,7 +2439,7 @@ TabPage TP_OPTTABLE_PAGE MetricField MF_COLINSERT { Border = TRUE ; - Pos = MAP_APPFONT ( 192 , 26 ) ; + Pos = MAP_APPFONT ( 211 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -2508,8 +2454,8 @@ TabPage TP_OPTTABLE_PAGE }; GroupBox GB_HANDLING { - Pos = MAP_APPFONT ( 6 , 45 ) ; - Size = MAP_APPFONT ( 246 , 74 ) ; + Pos = MAP_APPFONT ( 6 , 46 ) ; + Size = MAP_APPFONT ( 248 , 66 ) ; Text = "Verhalten" ; Text [ English ] = "Behaviour" ; Text [ english_us ] = "Behavior" ; @@ -2534,7 +2480,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_FIX { - Pos = MAP_APPFONT ( 12 , 56 ) ; + Pos = MAP_APPFONT ( 12 , 57 ) ; Size = MAP_APPFONT ( 78 , 10 ) ; Text = "~Fix" ; Text [ English ] = "~Fix" ; @@ -2560,8 +2506,8 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_FIX { - Pos = MAP_APPFONT ( 93 , 56 ) ; - Size = MAP_APPFONT ( 155 , 19 ) ; + Pos = MAP_APPFONT ( 93 , 55 ) ; + Size = MAP_APPFONT ( 155 , 16 ) ; Text = "Vernderungen einer Zeile bzw. Spalte wirken sich nur auf den direkten Nachbarn aus" ; Text [ English ] = "Changes of a row and column respectively will affect the direct neighbor only" ; WordBreak = TRUE ; @@ -2587,7 +2533,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_FIXPROP { - Pos = MAP_APPFONT ( 12 , 77 ) ; + Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 78 , 10 ) ; Text = "F~ix, proportional" ; Text [ English ] = "F~ix, proportional" ; @@ -2613,8 +2559,8 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_FIXPROP { - Pos = MAP_APPFONT ( 93 , 77 ) ; - Size = MAP_APPFONT ( 155 , 19 ) ; + Pos = MAP_APPFONT ( 93 , 74 ) ; + Size = MAP_APPFONT ( 155 , 16 ) ; Text = "Vernderungen einer Zeile bzw. Spalte wirken sich auf die gesamte Tabelle aus" ; Text [ English ] = "Changes of a row and column respectively will affect the whole table" ; WordBreak = TRUE ; @@ -2640,7 +2586,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_VAR { - Pos = MAP_APPFONT ( 12 , 98 ) ; + Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 78 , 10 ) ; Text = "~Variabel" ; Text [ English ] = "~Variable" ; @@ -2666,7 +2612,7 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_VAR { - Pos = MAP_APPFONT ( 93 , 98 ) ; + Pos = MAP_APPFONT ( 93 , 93 ) ; Size = MAP_APPFONT ( 155 , 16 ) ; Text = "Vernderungen einer Zeile bzw. Spalte wirken sich auf die Tabellengre aus" ; Text [ English ] = "Changes of a row and column respectively will affect the table size" ; @@ -2693,7 +2639,7 @@ TabPage TP_OPTTABLE_PAGE }; FixedText FT_DESC { - Pos = MAP_APPFONT ( 12 , 121 ) ; + Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text = "Diese Einstellungen sind bei der Tastaturbedienung wirksam." ; Text [ English ] = "These settings affect the keyboard handling." ; @@ -2728,12 +2674,12 @@ TabPage TP_OPTSRCVIEW { HelpID = HID_OPTSRCVIEW ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_COLOR { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 80 ) ; + Size = MAP_APPFONT ( 248 , 74 ) ; Text = "Farbzuordnung Syntax - Highlighting" ; Text [ English ] = "Color assignment syntax highlighting" ; Text [ english_us ] = "Colors for syntax highlighting" ; @@ -2759,7 +2705,7 @@ TabPage TP_OPTSRCVIEW FixedText FT_SGML { Pos = MAP_APPFONT ( 12 , 16 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "~SGML" ; Text [ English ] = "~SGML" ; Text [ english_us ] = "~SGML" ; @@ -2785,14 +2731,14 @@ TabPage TP_OPTSRCVIEW ListBox LB_SGML { Border = TRUE ; - Pos = MAP_APPFONT ( 188 , 16 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Pos = MAP_APPFONT ( 188 , 14 ) ; + Size = MAP_APPFONT ( 60 , 80 ) ; DropDown = TRUE ; }; FixedText FT_COMMENT { - Pos = MAP_APPFONT ( 12 , 31 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "~Kommentar" ; Text [ English ] = "~Comment" ; Text [ portuguese ] = "~Comentrio" ; @@ -2818,14 +2764,14 @@ TabPage TP_OPTSRCVIEW ListBox LB_COMMENT { Border = TRUE ; - Pos = MAP_APPFONT ( 188 , 31 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Pos = MAP_APPFONT ( 188 , 30 ) ; + Size = MAP_APPFONT ( 60 , 80 ) ; DropDown = TRUE ; }; FixedText FT_KEYWD { - Pos = MAP_APPFONT ( 12 , 46 ) ; - Size = MAP_APPFONT ( 70 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 48 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "Sch~lsselwort" ; Text [ English ] = "~Keyword" ; Text [ english_us ] = "~Key word" ; @@ -2852,13 +2798,13 @@ TabPage TP_OPTSRCVIEW { Border = TRUE ; Pos = MAP_APPFONT (188 , 46 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Size = MAP_APPFONT ( 60 , 80 ) ; DropDown = TRUE ; }; FixedText FT_UNKNOWN { - Pos = MAP_APPFONT ( 12 , 61 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 64 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "~Unbekannt" ; Text [ English ] = "~Unknown" ; Text [ english_us ] = "~Unknown" ; @@ -2884,8 +2830,8 @@ TabPage TP_OPTSRCVIEW ListBox LB_UNKNOWN { Border = TRUE ; - Pos = MAP_APPFONT ( 188 , 61 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Pos = MAP_APPFONT ( 188 , 62 ) ; + Size = MAP_APPFONT ( 60 , 80 ) ; DropDown = TRUE ; }; }; @@ -2898,12 +2844,12 @@ TabPage TP_OPTSHDWCRSR { HelpID = HID_OPTSHDWCRSR ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_SHDWCRSFLAG { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 100 ) ; + Size = MAP_APPFONT ( 248 , 92 ) ; Text = "Direkt-Cursor" ; Text [ ENGLISH ] = "Direct cursor" ; Text [ english_us ] = "Direct Cursor" ; @@ -2928,7 +2874,7 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_SHDWCRSONOFF { - Pos = MAP_APPFONT ( 12 , 15 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "~Direkt-Cursor" ; Text [ ENGLISH ] = "~Direct cursor" ; @@ -2956,8 +2902,8 @@ TabPage TP_OPTSHDWCRSR }; FixedText FT_SHDWCRSFILLMODE { - Pos = MAP_APPFONT ( 12 , 31 ) ; - Size = MAP_APPFONT ( 48 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 48 , 8 ) ; Text = "Einfgen" ; Text [ English ] = "Insert" ; Left = TRUE ; @@ -2983,7 +2929,7 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLMARGIN { - Pos = MAP_APPFONT ( 80 , 31 ) ; + Pos = MAP_APPFONT ( 80 , 27 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "~Absatzausrichtung" ; Text [ ENGLISH ] = "~Adjustment" ; @@ -3011,7 +2957,7 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLINDENT { - Pos = MAP_APPFONT ( 80 , 44 ) ; + Pos = MAP_APPFONT ( 80 , 40 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "linker Absatz~rand" ; Text [ ENGLISH ] = "Left ~margin" ; @@ -3037,7 +2983,7 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLTAB { - Pos = MAP_APPFONT ( 80 , 57 ) ; + Pos = MAP_APPFONT ( 80 , 53 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "~Tabulator" ; Text [ ENGLISH ] = "~Tab" ; @@ -3063,7 +3009,7 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLSPACE { - Pos = MAP_APPFONT ( 80 , 70 ) ; + Pos = MAP_APPFONT ( 80 , 66 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "Tabulator und ~Leerzeichen" ; Text [ ENGLISH ] = "Tabs and ~space" ; @@ -3089,7 +3035,7 @@ TabPage TP_OPTSHDWCRSR }; FixedText FT_SHDWCRSCOLOR { - Pos = MAP_APPFONT ( 12 , 86 ) ; + Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Farbe" ; Text [ English ] = "~Color" ; @@ -3116,14 +3062,14 @@ TabPage TP_OPTSHDWCRSR ListBox LB_SHDWCRSCOLOR { Border = TRUE ; - Pos = MAP_APPFONT ( 80 , 86 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Pos = MAP_APPFONT ( 80 , 80 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; DropDown = TRUE ; }; GroupBox GB_CRSR_OPT { - Pos = MAP_APPFONT ( 6 , 106 ) ; - Size = MAP_APPFONT ( 248 , 25 ) ; + Pos = MAP_APPFONT ( 6 , 95 ) ; + Size = MAP_APPFONT ( 248 , 24 ) ; Text = "Optionen" ; Text [ ENGLISH ] = "Options" ; Text [ NORWEGIAN ] = "Options" ; @@ -3150,7 +3096,7 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_ALLOW_IN_PROT { - Pos = MAP_APPFONT ( 12 , 118 ) ; + Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 220 , 10 ) ; TabStop = TRUE ; Group = TRUE ; diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index aa043687060b..f94fbb7950f7 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -2,9 +2,9 @@ * * $RCSfile: optload.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2000-12-01 08:29:32 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,30 +74,10 @@ TabPage TP_OPTLOAD_PAGE HelpID = HID_OPTLOAD_PAGE ; Size = MAP_APPFONT ( 260 , 135 ) ; Hide = TRUE ; -/* FixedText FT_UPDATE_LINKS - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - Text = "Verknpfungen beim Laden aktualisieren" ; - Text [ English ] = "Update links while loading" ; - Text[ italian ] = "Aggiorna collegamenti durante il caricamento"; - Text[ portuguese_brazilian ] = "Refresh links"; - Text[ portuguese ] = "Actualizar ligaes ao carregar"; - Text[ danish ] = "Refresh links"; - Text[ french ] = "Actualiser les liens lors du chargement"; - Text[ swedish ] = "Uppdatera lnkar vid laddning"; - Text[ dutch ] = "Verbindingen bij het laden actualiseren"; - Text[ spanish ] = "Actualizar vnculos al cargar"; - Text[ english_us ] = "Update links"; - Text[ chinese_simplified ] = "װʱ"; - Text[ russian ] = " "; - Text[ polish ] = "Aktualizuj cza"; - Text[ japanese ] = "Verknpfungen aktualisieren"; - };*/ GroupBox GB_LINK { - Pos = MAP_APPFONT ( 6 , 2 ) ; - Size = MAP_APPFONT ( 248 , 37 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 248 , 38 ) ; Text = "Verknpfungen aktualisieren" ; Text [ English ] = "Update links" ; Text[ english_us ] = "Update links"; @@ -122,7 +102,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_ALWAYS { - Pos = MAP_APPFONT ( 12 , 13 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text = "~Immer" ; Text [ ENGLISH ] = "~Always" ; @@ -149,7 +129,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_REQUEST { - Pos = MAP_APPFONT ( 90 , 13 ) ; + Pos = MAP_APPFONT ( 90 , 14 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text = "Auf Nach~frage" ; Text [ ENGLISH ] = "On request" ; @@ -176,7 +156,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_NEVER { - Pos = MAP_APPFONT ( 168 , 13 ) ; + Pos = MAP_APPFONT ( 168 , 14 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text = "~Nie" ; Text [ ENGLISH ] = "Never" ; @@ -203,7 +183,7 @@ TabPage TP_OPTLOAD_PAGE }; CheckBox CB_LINK_DOCONLY { - Pos = MAP_APPFONT ( 12 , 25) ; + Pos = MAP_APPFONT ( 12 , 28) ; Size = MAP_APPFONT ( 220 , 10 ) ; Text = "Nur fr das aktuelle ~Dokument" ; Text [ English ] = "Actual document only" ; @@ -229,8 +209,8 @@ TabPage TP_OPTLOAD_PAGE }; GroupBox GB_FIELD { - Pos = MAP_APPFONT ( 6 , 42 ) ; - Size = MAP_APPFONT ( 248 , 53 ) ; + Pos = MAP_APPFONT ( 6 , 44 ) ; + Size = MAP_APPFONT ( 248 , 51 ) ; Text = "Felder und Diagramme" ; Text [ English ] = "Update" ; Text[ english_us ] = "Fields and charts"; @@ -307,7 +287,7 @@ TabPage TP_OPTLOAD_PAGE }; CheckBox CB_FLD_DOCONLY { - Pos = MAP_APPFONT ( 12 , 83) ; + Pos = MAP_APPFONT ( 12 , 82) ; Size = MAP_APPFONT ( 213 , 10 ) ; Text = "Nur fr das aktuelle D~okument" ; Text [ English ] = "Current document only" ; @@ -334,7 +314,7 @@ TabPage TP_OPTLOAD_PAGE GroupBox GB_COMPAT { Pos = MAP_APPFONT ( 6 , 98 ) ; - Size = MAP_APPFONT ( 248 , 33 ) ; + Size = MAP_APPFONT ( 248 , 37 ) ; Text = "Kompatibilitt" ; Text [ English ] = "Compatibility" ; Text[ english_us ] = "Compatibility"; @@ -385,7 +365,7 @@ TabPage TP_OPTLOAD_PAGE }; CheckBox CB_MERGE_PARA_DIST_PAGESTART { - Pos = MAP_APPFONT ( 12 , 121) ; + Pos = MAP_APPFONT ( 12 , 122) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text = "A~bsatz- und Tabellenabstnde an Seitenanfngen addieren"; Text [ English ] = "Add distances at the beginning of pages" ; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index fe4810ba48cb..4a9f03eee79c 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: optpage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2001-01-24 10:15:53 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -559,33 +559,6 @@ IMPL_LINK(SwLayoutOptPage, MetricHdl, ListBox*, EMPTYARG) TabPage Drucker Zusatzeinstellungen -------------------------------------------------------*/ -// makro fuers init ------------------------------------------------------ - -#define _INIT \ - aGrfCB (this, SW_RES(CB_PGRF)), \ - aTabCB (this, SW_RES(CB_PTAB)), \ - aDrawCB (this, SW_RES(CB_PDRAW)), \ - aCtrlFldCB (this, SW_RES(CB_CTRLFLD)), \ - aBackgroundCB (this, SW_RES(CB_BACKGROUND)),\ - aBlackFontCB (this, SW_RES(CB_BLACK_FONT)),\ - aGroup1 (this, SW_RES(GRP_1)), \ - aLeftPageCB (this, SW_RES(CB_LEFTP)),\ - aRightPageCB (this, SW_RES(CB_RIGHTP)),\ - aReverseCB (this, SW_RES(CB_REVERSE)),\ - aProspectCB (this, SW_RES(CB_PROSPECT)),\ - aGroup2 (this, SW_RES(GRP_2)), \ - aNoRB (this, SW_RES(RB_NO)), \ - aOnlyRB (this, SW_RES(RB_ONLY)), \ - aEndRB (this, SW_RES(RB_END)), \ - aEndPageRB (this, SW_RES(RB_PAGEEND)),\ - aGroup3 (this, SW_RES(GRP_3)), \ - aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)),\ - aGroup5 (this, SW_RES(GRP_5)), \ - aSingleJobsCB (this, SW_RES(CB_SINGLEJOBS)),\ - aGroup4 (this, SW_RES(GRP_4)), \ - aFaxLB (this, SW_RES(LB_FAX)), \ - aFaxGB (this, SW_RES(GB_FAX)), \ - bAttrModified( FALSE ) // ----------------------------------------------------------------------- @@ -594,7 +567,29 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet), bPreview ( FALSE ), - _INIT + aGrfCB (this, SW_RES(CB_PGRF)), + aTabCB (this, SW_RES(CB_PTAB)), + aDrawCB (this, SW_RES(CB_PDRAW)), + aCtrlFldCB (this, SW_RES(CB_CTRLFLD)), + aBackgroundCB (this, SW_RES(CB_BACKGROUND)), + aBlackFontCB (this, SW_RES(CB_BLACK_FONT)), + aGroup1 (this, SW_RES(GRP_1)), + aLeftPageCB (this, SW_RES(CB_LEFTP)), + aRightPageCB (this, SW_RES(CB_RIGHTP)), + aReverseCB (this, SW_RES(CB_REVERSE)), + aProspectCB (this, SW_RES(CB_PROSPECT)), + aGroup2 (this, SW_RES(GRP_2)), + aNoRB (this, SW_RES(RB_NO)), + aOnlyRB (this, SW_RES(RB_ONLY)), + aEndRB (this, SW_RES(RB_END)), + aEndPageRB (this, SW_RES(RB_PAGEEND)), + aGroup3 (this, SW_RES(GRP_3)), + aGroup4 (this, SW_RES(GRP_4)), + aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)), + aSingleJobsCB (this, SW_RES(CB_SINGLEJOBS)), + aFaxFT (this, SW_RES(FT_FAX)), + aFaxLB (this, SW_RES(LB_FAX)), + bAttrModified( FALSE ) { Init(); FreeResource(); @@ -634,7 +629,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, } -#undef _INIT //------------------------------------------------------------------------ void SwAddPrinterTabPage::SetPreview(BOOL bPrev) diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 12ef0d9f2cbf..f44fa5f04dd9 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.src @@ -2,9 +2,9 @@ * * $RCSfile: redlopt.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:36:55 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,11 +78,11 @@ TabPage TP_REDLINE_OPT HelpID = HID_REDLINE_OPT ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; RadioButton RB_INSERT { - Pos = MAP_APPFONT ( 12 , 18 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 75 , 10 ) ; Text = "~Einfgen" ; Text [ ENGLISH ] = "Insert" ; Check = TRUE ; @@ -108,8 +108,8 @@ TabPage TP_REDLINE_OPT }; RadioButton RB_DELETED { - Pos = MAP_APPFONT ( 12 , 34 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 90 , 14 ) ; + Size = MAP_APPFONT ( 75 , 10 ) ; Text = "~Lschen" ; Text [ ENGLISH ] = "Delete" ; Text [ portuguese ] = "E~liminar" ; @@ -134,8 +134,8 @@ TabPage TP_REDLINE_OPT }; RadioButton RB_CHANGED { - Pos = MAP_APPFONT ( 12 , 50 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; + Pos = MAP_APPFONT ( 178 , 14 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "~Attributnderung" ; Text [ ENGLISH ] = "Change attribute" ; Text [ portuguese ] = "~Modificar atributo" ; @@ -160,7 +160,7 @@ TabPage TP_REDLINE_OPT }; FixedText FT_TE_ATTRIB { - Pos = MAP_APPFONT ( 74 , 18 ) ; + Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 40 , 10 ) ; Text = "A~ttribute" ; Text [ English ] = "Attributes" ; @@ -186,8 +186,8 @@ TabPage TP_REDLINE_OPT }; ListBox LB_TE_ATTRIB { - Pos = MAP_APPFONT ( 115 , 17 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 27 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -466,8 +466,8 @@ TabPage TP_REDLINE_OPT }; ListBox LB_TL_ATTRIB { - Pos = MAP_APPFONT ( 115 , 17 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 27 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; Hide = TRUE ; @@ -726,8 +726,8 @@ TabPage TP_REDLINE_OPT }; ListBox LB_TC_ATTRIB { - Pos = MAP_APPFONT ( 115 , 17 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 27 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; Hide = TRUE ; @@ -1007,7 +1007,7 @@ TabPage TP_REDLINE_OPT }; FixedText FT_TE_COL { - Pos = MAP_APPFONT ( 74 , 34 ) ; + Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 40 , 10 ) ; Text = "~Farbe" ; Text [ English ] = "Color" ; @@ -1033,23 +1033,23 @@ TabPage TP_REDLINE_OPT }; ListBox LB_TE_COL { - Pos = MAP_APPFONT ( 115 , 33 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 42 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; }; ListBox LB_TL_COL { - Pos = MAP_APPFONT ( 115 , 33 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 42 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; Hide = TRUE ; }; ListBox LB_TC_COL { - Pos = MAP_APPFONT ( 115 , 33 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 42 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; Hide = TRUE ; @@ -1057,8 +1057,8 @@ TabPage TP_REDLINE_OPT Window WIN_TE { Border = TRUE ; - Pos = MAP_APPFONT ( 198 , 22 ) ; - Size = MAP_APPFONT ( 50 , 18 ) ; + Pos = MAP_APPFONT ( 178 , 27 ) ; + Size = MAP_APPFONT ( 70 , 27 ) ; Text = "Beispiel" ; Text [ English ] = "Example" ; Text [ portuguese ] = "Exemplo" ; @@ -1084,7 +1084,7 @@ TabPage TP_REDLINE_OPT GroupBox GB_TE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 70 ) ; + Size = MAP_APPFONT ( 248 , 57 ) ; Text = "Textdarstellung" ; Text [ English ] = "Text representation" ; Text [ portuguese ] = "Visualizar texto" ; @@ -1109,9 +1109,9 @@ TabPage TP_REDLINE_OPT }; FixedText FT_MARKPOS { - Pos = MAP_APPFONT ( 65 , 93 ) ; + Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; - Text = "Markierung" ; + Text = "Ma~rkierung" ; Text [ English ] = "Mark" ; Text [ portuguese ] = "Marca" ; Text [ english_us ] = "Mark" ; @@ -1135,8 +1135,8 @@ TabPage TP_REDLINE_OPT }; ListBox LB_MARKPOS { - Pos = MAP_APPFONT ( 115 , 92 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 74 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -1310,9 +1310,9 @@ TabPage TP_REDLINE_OPT }; FixedText FT_LC_COL { - Pos = MAP_APPFONT ( 65 , 109 ) ; - Size = MAP_APPFONT ( 48 , 10 ) ; - Text = "Farbe" ; + Pos = MAP_APPFONT ( 12 , 91 ) ; + Size = MAP_APPFONT ( 48 , 8 ) ; + Text = "Far~be" ; Text [ English ] = "Color" ; Text [ english_us ] = "Color" ; Text [ portuguese_brazilian ] = "Farbe" ; @@ -1336,20 +1336,20 @@ TabPage TP_REDLINE_OPT }; ListBox LB_LC_COL { - Pos = MAP_APPFONT ( 115 , 108 ) ; - Size = MAP_APPFONT ( 80 , 60 ) ; + Pos = MAP_APPFONT ( 90 , 89 ) ; + Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; }; Window WIN_MARK { - Pos = MAP_APPFONT ( 198 , 92 ) ; - Size = MAP_APPFONT ( 52 , 31 ) ; + Pos = MAP_APPFONT ( 178 , 74 ) ; + Size = MAP_APPFONT ( 70 , 28 ) ; }; GroupBox GB_LC { - Pos = MAP_APPFONT ( 6 , 79 ) ; - Size = MAP_APPFONT ( 248 , 50 ) ; + Pos = MAP_APPFONT ( 6 , 63 ) ; + Size = MAP_APPFONT ( 248 , 41 ) ; Text = "Genderte Zeilen" ; Text [ English ] = "Changed lines" ; Text [ portuguese ] = "Linhas modificadas" ; diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index e4454ff8ea4d..90d1aafdc5c6 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: docstdlg.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:37:33 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,11 +67,11 @@ TabPage TP_DOC_STAT { HelpID = HID_DOC_STAT ; Hide = TRUE; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; FixedText FT_PAGE { Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Seiten:" ; Text [ ENGLISH ] = "Number of pages:" ; Text [ norwegian ] = "Number of pages:" ; @@ -99,8 +99,8 @@ TabPage TP_DOC_STAT }; FixedText FT_TABLE { - Pos = MAP_APPFONT ( 6 , 22 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 18 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Tabellen:" ; Text [ ENGLISH ] = "Number of tables:" ; Text [ norwegian ] = "Number of tables:" ; @@ -128,8 +128,8 @@ TabPage TP_DOC_STAT }; FixedText FT_GRF { - Pos = MAP_APPFONT ( 6 , 38 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 30 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Grafiken:" ; Text [ ENGLISH ] = "Number of graphics:" ; Text [ norwegian ] = "Number of graphics:" ; @@ -157,8 +157,8 @@ TabPage TP_DOC_STAT }; FixedText FT_OLE { - Pos = MAP_APPFONT ( 6 , 54 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 42 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl OLE-Objekte:" ; Text [ ENGLISH ] = "Number of OLE objects:" ; Text [ norwegian ] = "Number of OLE objects:" ; @@ -186,9 +186,8 @@ TabPage TP_DOC_STAT }; FixedText FT_PARA { - Pos = MAP_APPFONT ( 6 , 70 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Anzahl Abstze: : Anzahl Abstze: */ + Pos = MAP_APPFONT ( 6 , 54 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Abstze:" ; Text [ ENGLISH ] = "Number of paragraphs:" ; Text [ norwegian ] = "Number of paragraphs:" ; @@ -216,9 +215,8 @@ TabPage TP_DOC_STAT }; FixedText FT_WORD { - Pos = MAP_APPFONT ( 6 , 86 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Anzahl Wrter: : Anzahl Wrter: */ + Pos = MAP_APPFONT ( 6 , 68 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Wrter:" ; Text [ ENGLISH ] = "Number of words:" ; Text [ norwegian ] = "Number of words:" ; @@ -246,8 +244,8 @@ TabPage TP_DOC_STAT }; FixedText FT_WORD_DELIM { - Pos = MAP_APPFONT ( 144 , 86 ) ; - Size = MAP_APPFONT ( 57 , 10 ) ; + Pos = MAP_APPFONT ( 144 , 68 ) ; + Size = MAP_APPFONT ( 57 , 8 ) ; Text = "~Trenner" ; Text [ ENGLISH ] = "Delimiter" ; Left = TRUE ; @@ -274,14 +272,14 @@ TabPage TP_DOC_STAT Edit ED_WORD_DELIM { Border = TRUE ; - Pos = MAP_APPFONT ( 204 , 85 ) ; + Pos = MAP_APPFONT ( 204 , 66 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; }; FixedText FT_CHAR { - Pos = MAP_APPFONT ( 6 , 102 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 82 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Zeichen:" ; Text [ ENGLISH ] = "Number of chars:" ; Text [ norwegian ] = "Number of chars:" ; @@ -309,8 +307,8 @@ TabPage TP_DOC_STAT }; FixedText FT_LINE { - Pos = MAP_APPFONT ( 6 , 118 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 96 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "Anzahl Zeilen:" ; Text [ ENGLISH ] = "Number of lines:" ; Text [ portuguese ] = "Nmero de linhas:" ; @@ -336,55 +334,55 @@ TabPage TP_DOC_STAT FixedText FT_PAGE_COUNT { Pos = MAP_APPFONT ( 114 , 6 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_TABLE_COUNT { - Pos = MAP_APPFONT ( 114 , 22 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 18 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_GRF_COUNT { - Pos = MAP_APPFONT ( 114 , 38 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 30 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_OLE_COUNT { - Pos = MAP_APPFONT ( 114 , 54 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 42 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_PARA_COUNT { - Pos = MAP_APPFONT ( 114 , 70 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 54 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_WORD_COUNT { - Pos = MAP_APPFONT ( 114 , 86 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 68 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_CHAR_COUNT { - Pos = MAP_APPFONT ( 114 , 102 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 82 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; FixedText FT_LINE_COUNT { - Pos = MAP_APPFONT ( 114 , 118 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 114 , 96 ) ; + Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; Text = "..." ; }; PushButton PB_PDATE { - Pos = MAP_APPFONT ( 204 , 116 ) ; + Pos = MAP_APPFONT ( 204 , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text = "~Aktualisieren" ; Text [ ENGLISH ] = "~Update" ; diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk index e9d132965c17..15e82b4dc236 100644 --- a/sw/source/ui/dialog/makefile.mk +++ b/sw/source/ui/dialog/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $ +# last change: $Author: os $ $Date: 2001-02-09 07:57:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -95,7 +95,6 @@ SRCFILES = \ ascfldlg.src \ dialog.src \ docstdlg.src \ - macassgn.src \ ltmpdlg.src \ regionsw.src diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index 4dbe234041e5..a577f3513948 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -2,9 +2,9 @@ * * $RCSfile: regionsw.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:38:48 $ + * last change: $Author: os $ $Date: 2001-02-09 07:57:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -582,25 +582,6 @@ ModalDialog MD_EDIT_REGION Size = MAP_APPFONT ( 99 , 127 ) ; TabStop = TRUE ; }; - /* FixedText FT_CONDITION - { - Pos = MAP_APPFONT( 97, 48 ); - Size = MAP_APPFONT( 40, 10 ); - Text = "Bedingung"; - Text[ English ] = "Condition"; - Text[norwegian] = "Vilkr"; - Text[italian] = "Condizione"; - Text[portuguese_brazilian] = "condio"; - Text[portuguese] = "Condio"; - Text[finnish] = "Ehto"; - Text[danish] = "Betingelse"; - Text[french] = "Condition"; - Text[swedish] = "Villkor"; - Text[dutch] = "Voorwaarde"; - Text[spanish] = "Condicin"; - Text[english_us] = "Condition"; - Disable = TRUE; - };*/ GroupBox GB_EDIT_OPTIONS { OutputSize = TRUE ; @@ -940,12 +921,12 @@ TabPage TP_INSERT_SECTION HelpID = HID_INSERT_SECTION_PAGE; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; ComboBox ED_RNAME { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 66 , 104 ) ; + Size = MAP_APPFONT ( 66 , 115 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; SORT = TRUE ; @@ -978,8 +959,8 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_PROTECT { - Pos = MAP_APPFONT ( 96 , 17 ) ; - Size = MAP_APPFONT ( 100 , 12 ) ; + Pos = MAP_APPFONT ( 96 , 14 ) ; + Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; Text = "~Geschtzt" ; Text [ English ] = "Pro~tected" ; @@ -1007,7 +988,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_HIDE { - Pos = MAP_APPFONT ( 96 , 31 ) ; + Pos = MAP_APPFONT ( 96 , 30 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; CB_HIDE_TEXT }; @@ -1021,8 +1002,8 @@ TabPage TP_INSERT_SECTION Edit ED_CONDITION { Border = TRUE ; - Pos = MAP_APPFONT ( 185 , 43 ) ; - Size = MAP_APPFONT ( 68 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 57 ) ; + Size = MAP_APPFONT ( 148 , 12 ) ; Disable = TRUE ; TabStop = TRUE ; }; @@ -1042,14 +1023,14 @@ TabPage TP_INSERT_SECTION }; FixedText FT_DDE { - Pos = MAP_APPFONT ( 111 , 85 ) ; + Pos = MAP_APPFONT ( 102 , 87 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Hide = TRUE ; FT_DDE_TEXT }; FixedText FT_FILE { - Pos = MAP_APPFONT ( 111 , 85 ) ; + Pos = MAP_APPFONT ( 102 , 87 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Disable = TRUE ; FT_FILE_TEXT @@ -1057,14 +1038,14 @@ TabPage TP_INSERT_SECTION Edit ED_FILE { Border = TRUE ; - Pos = MAP_APPFONT ( 111 , 97 ) ; - Size = MAP_APPFONT ( 84 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 100 ) ; + Size = MAP_APPFONT ( 95 , 12 ) ; Disable = TRUE ; TabStop = TRUE ; }; PushButton PB_FILE { - Pos = MAP_APPFONT ( 204 , 97 ) ; + Pos = MAP_APPFONT ( 200 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; TabStop = TRUE ; @@ -1072,14 +1053,14 @@ TabPage TP_INSERT_SECTION }; FixedText FT_SUBREG { - Pos = MAP_APPFONT ( 111 , 113 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 102 , 116 ) ; + Size = MAP_APPFONT ( 35 , 10 ) ; Disable = TRUE ; FT_SUBREG_TEXT }; ComboBox LB_SUBREG { - Pos = MAP_APPFONT ( 142 , 112 ) ; + Pos = MAP_APPFONT ( 142 , 116 ) ; Size = MAP_APPFONT ( 53 , 50 ) ; DropDown = TRUE ; Disable = TRUE ; @@ -1091,7 +1072,7 @@ TabPage TP_INSERT_SECTION { OutputSize = TRUE ; Pos = MAP_APPFONT ( 90 , 3 ) ; - Size = MAP_APPFONT ( 167 , 129 ) ; + Size = MAP_APPFONT ( 163 , 129 ) ; GB_OPTIONS_TEXT }; }; @@ -1216,13 +1197,13 @@ TabPage TP_SECTION_FTNENDNOTES HelpID = HID_SECTION_FTNENDNOTES_PAGE; SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_FTN { OutputSize = TRUE ; Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 59 ) ; + Size = MAP_APPFONT ( 248 , 55 ) ; Text = "Funoten" ; Text [ English ] = "Footnotes" ; Text[ english_us ] = "Footnotes"; @@ -1325,7 +1306,7 @@ TabPage TP_SECTION_FTNENDNOTES }; NumericField FLD_FTN_OFFSET { - Pos = MAP_APPFONT ( 136 , 29 ) ; + Pos = MAP_APPFONT ( 136 , 27 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; Minimum = 1 ; @@ -1337,7 +1318,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_FTN_NUM_FMT { - Pos = MAP_APPFONT ( 12 , 44 ) ; + Pos = MAP_APPFONT ( 12 , 45 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; Text = "eigenes ~Format" ; @@ -1363,7 +1344,7 @@ TabPage TP_SECTION_FTNENDNOTES }; FixedText FT_FTN_PREFIX { - Pos = MAP_APPFONT ( 85 , 44 ) ; + Pos = MAP_APPFONT ( 85 , 45 ) ; Size = MAP_APPFONT ( 25 , 10 ) ; Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; @@ -1392,7 +1373,7 @@ TabPage TP_SECTION_FTNENDNOTES Edit ED_FTN_PREFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 113 , 44 ) ; + Pos = MAP_APPFONT ( 113 , 43 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1401,7 +1382,7 @@ TabPage TP_SECTION_FTNENDNOTES ListBox LB_FTN_NUMVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( 136 , 44 ) ; + Pos = MAP_APPFONT ( 136 , 43 ) ; Size = MAP_APPFONT ( 62 , 50 ) ; TabStop = TRUE ; Group = TRUE ; @@ -1420,7 +1401,7 @@ TabPage TP_SECTION_FTNENDNOTES }; FixedText FT_FTN_SUFFIX { - Pos = MAP_APPFONT ( 201 , 44 ) ; + Pos = MAP_APPFONT ( 201 , 45 ) ; Size = MAP_APPFONT ( 25 , 10 ) ; Text = "Dah~inter" ; Text [ ENGLISH ] = "Behind" ; @@ -1449,7 +1430,7 @@ TabPage TP_SECTION_FTNENDNOTES Edit ED_FTN_SUFFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 229 , 44 ) ; + Pos = MAP_APPFONT ( 229 , 43 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1460,7 +1441,7 @@ TabPage TP_SECTION_FTNENDNOTES GroupBox GB_END { OutputSize = TRUE ; - Pos = MAP_APPFONT ( 6 , 65 ) ; + Pos = MAP_APPFONT ( 6 , 61 ) ; Size = MAP_APPFONT ( 248 , 59 ) ; Text = "Endnoten" ; Text [ English ] = "Endnotes" ; @@ -1485,7 +1466,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_AT_TXTEND { - Pos = MAP_APPFONT ( 12 , 76 ) ; + Pos = MAP_APPFONT ( 12 , 72 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; Text = "~am Bereichsende sammeln" ; @@ -1511,7 +1492,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_NUM { - Pos = MAP_APPFONT ( 12 , 91 ) ; + Pos = MAP_APPFONT ( 12 , 88 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; Text = "Nummer neu ~starten" ; @@ -1537,7 +1518,7 @@ TabPage TP_SECTION_FTNENDNOTES }; FixedText FT_END_OFFSET { - Pos = MAP_APPFONT ( 85 , 91 ) ; + Pos = MAP_APPFONT ( 85 , 88 ) ; Size = MAP_APPFONT ( 36 , 8 ) ; Text = "Be~ginn bei" ; Text [ ENGLISH ] = "~Start at" ; @@ -1563,7 +1544,7 @@ TabPage TP_SECTION_FTNENDNOTES }; NumericField FLD_END_OFFSET { - Pos = MAP_APPFONT ( 136 , 91 ) ; + Pos = MAP_APPFONT ( 136 , 86 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; Minimum = 1 ; @@ -1575,7 +1556,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_NUM_FMT { - Pos = MAP_APPFONT ( 12 , 106 ) ; + Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; Text = "~eigenes Format" ; @@ -1602,7 +1583,7 @@ TabPage TP_SECTION_FTNENDNOTES FixedText FT_END_PREFIX { - Pos = MAP_APPFONT ( 85 , 106 ) ; + Pos = MAP_APPFONT ( 85 , 104 ) ; Size = MAP_APPFONT ( 25 , 10 ) ; Text = "Da~vor" ; Text [ ENGLISH ] = "Before" ; @@ -1631,7 +1612,7 @@ TabPage TP_SECTION_FTNENDNOTES Edit ED_END_PREFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 113 , 106 ) ; + Pos = MAP_APPFONT ( 113 , 102 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1640,7 +1621,7 @@ TabPage TP_SECTION_FTNENDNOTES ListBox LB_END_NUMVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( 136 , 106 ) ; + Pos = MAP_APPFONT ( 136 , 102 ) ; Size = MAP_APPFONT ( 62 , 50 ) ; TabStop = TRUE ; Group = TRUE ; @@ -1659,7 +1640,7 @@ TabPage TP_SECTION_FTNENDNOTES }; FixedText FT_END_SUFFIX { - Pos = MAP_APPFONT ( 201 , 106 ) ; + Pos = MAP_APPFONT ( 201 , 104 ) ; Size = MAP_APPFONT ( 25 , 10 ) ; Text = "Dahinte~r" ; Text [ ENGLISH ] = "Behind" ; @@ -1688,7 +1669,7 @@ TabPage TP_SECTION_FTNENDNOTES Edit ED_END_SUFFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 229 , 106 ) ; + Pos = MAP_APPFONT ( 229 , 102 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; Left = TRUE ; diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 4834f6f3f765..c37c4168d90e 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-11-03 10:41:41 $ + * last change: $Author: os $ $Date: 2001-02-09 07:58:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,14 +114,17 @@ class SwFrmPage: public SfxTabPage CheckBox aRelHeightCB; CheckBox aFixedRatioCB; CheckBox aAutoHeightCB; + PushButton aRealSizeBT; GroupBox aSizeGB; BOOL bWidthLastChanged; // Anker - RadioButton aAnchorTypeRB; - RadioButton aAnchorAsCharRB; - ListBox aAnchorTypeLB; GroupBox aTypeGB; + RadioButton aAnchorAtPageRB; + RadioButton aAnchorAtParaRB; + RadioButton aAnchorAtCharRB; + RadioButton aAnchorAsCharRB; + RadioButton aAnchorAtFrameRB; // Position FixedText aHorizontalFT; @@ -141,8 +144,6 @@ class SwFrmPage: public SfxTabPage BOOL bAtHorzPosModified; BOOL bAtVertPosModified; - PushButton aRealSizeBT; - // Example SwFrmPagePreview aExampleWN; @@ -168,7 +169,7 @@ class SwFrmPage: public SfxTabPage DECL_LINK( RangeModifyHdl, Edit * ); - DECL_LINK( TypHdl, ListBox *pLB = 0 ); + DECL_LINK( AnchorTypeHdl, RadioButton * ); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); void InitPos(USHORT nId, USHORT nH, USHORT nHRel, @@ -212,22 +213,19 @@ public: class SwGrfExtPage: public SfxTabPage { - BmpWindow aBmpWin; - - GroupBox aConnectGB; - FixedText aConnectFT; - Edit aConnectED; - PushButton aBrowseBT; - // Spiegeln GroupBox aMirrorFrm; - CheckBox aMirrorHorzBox; CheckBox aMirrorVertBox; -// ListBox aMirrorPagesLB; + CheckBox aMirrorHorzBox; RadioButton aAllPagesRB; RadioButton aLeftPagesRB; RadioButton aRightPagesRB; -// FixedText aMirrorPagesFT; + BmpWindow aBmpWin; + + GroupBox aConnectGB; + FixedText aConnectFT; + Edit aConnectED; + PushButton aBrowseBT; String aFilterName; String aGrfName, aNewGrfName; diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 710b359ebda0..705b4ad1f51c 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -2,9 +2,9 @@ * * $RCSfile: num.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: os $ $Date: 2001-02-09 07:58:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,15 +151,15 @@ class SwNumPositionTabPage : public SfxTabPage MultiListBox aLevelLB; GroupBox aPositionGB; - FixedText aAlignFT; - ListBox aAlignLB; FixedText aDistBorderFT; - CheckBox aRelativeCB; MetricField aDistBorderMF; + CheckBox aRelativeCB; FixedText aIndentFT; MetricField aIndentMF; FixedText aDistNumFT; MetricField aDistNumMF; + FixedText aAlignFT; + ListBox aAlignLB; PushButton aStandardPB; GroupBox aPreviewGB; diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 87942b306da8..f5075726316d 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: optpage.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $ + * last change: $Author: os $ $Date: 2001-02-09 07:58:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -216,12 +216,11 @@ class SwAddPrinterTabPage : public SfxTabPage RadioButton aEndRB; RadioButton aEndPageRB; GroupBox aGroup3; - CheckBox aSingleJobsCB; GroupBox aGroup4; - ListBox aFaxLB; - GroupBox aFaxGB; + CheckBox aSingleJobsCB; CheckBox aPaperFromSetupCB; - GroupBox aGroup5; + FixedText aFaxFT; + ListBox aFaxLB; BOOL bAttrModified; BOOL bPreview; diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index a350a774545d..1d3a19fb09b6 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pgfnote.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $ + * last change: $Author: os $ $Date: 2001-02-09 07:58:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,11 +113,7 @@ private: FixedText aLinePosLbl; ListBox aLinePosBox; FixedText aLineTypeLbl; -#ifdef VCL LineListBox aLineTypeBox; -#else - SwLineBox aLineTypeBox; -#endif FixedText aLineWidthLbl; MetricField aLineWidthEdit; FixedText aLineDistLbl; diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 08276b7580c8..620f3b11a000 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,39 +192,38 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN, const SfxItemSet &rSet ) : SfxTabPage( pParent, SW_RES(bEN ? TP_ENDNOTEOPTION : TP_FOOTNOTEOPTION), rSet ), - aPosPageBox (this, SW_RES( RB_POS_PAGE )), - aPosChapterBox (this, SW_RES( RB_POS_CHAPTER)), - aPosGrp (this, SW_RES( GB_POS )), - - aNumViewBox (this, SW_RES( LB_NUMVIEW )), - aOffsetLbl (this, SW_RES( FT_OFFSET )), - aOffsetFld (this, SW_RES( FLD_OFFSET )), - aNumCountBox (this, SW_RES( LB_NUMCOUNT )), - aPrefixFT (this, SW_RES( FT_PREFIX )), - aPrefixED (this, SW_RES( ED_PREFIX )), - aSuffixFT (this, SW_RES( FT_SUFFIX )), - aSuffixED (this, SW_RES( ED_SUFFIX )), - - - aNumGrp (this, SW_RES( GB_NUM )), - - aParaTemplLbl (this, SW_RES( FT_PARA_TEMPL)), - aParaTemplBox (this, SW_RES( LB_PARA_TEMPL)), - aPageTemplLbl (this, SW_RES( FT_PAGE_TEMPL)), - aPageTemplBox (this, SW_RES( LB_PAGE_TEMPL)), - aTemplGrp (this, SW_RES( GB_TEMPL )), - - aFtnCharTextTemplLbl( this, SW_RES( FT_TEXT_CHARFMT)), - aFtnCharTextTemplBox( this, SW_RES( LB_TEXT_CHARFMT)), - aFtnCharAnchorTemplLbl( this, SW_RES( FT_ANCHR_CHARFMT)), - aFtnCharAnchorTemplBox( this, SW_RES( LB_ANCHR_CHARFMT)), - aCharTemplGrp( this, SW_RES(GB_CHAR_TEMPL)), - - aContLbl (this, SW_RES( FT_CONT )), - aContEdit (this, SW_RES( ED_CONT )), - aContFromLbl (this, SW_RES( FT_CONT_FROM )), - aContFromEdit (this, SW_RES( ED_CONT_FROM )), - aContGrp (this, SW_RES( GB_CONT )), + aNumTypeFT (this, ResId( FT_NUMTYPE )), + aNumViewBox (this, ResId( LB_NUMVIEW )), + aOffsetLbl (this, ResId( FT_OFFSET )), + aOffsetFld (this, ResId( FLD_OFFSET )), + aNumCountFT (this, ResId( FT_NUMCOUNT )), + aNumCountBox (this, ResId( LB_NUMCOUNT )), + aPrefixFT (this, ResId( FT_PREFIX )), + aPrefixED (this, ResId( ED_PREFIX )), + aSuffixFT (this, ResId( FT_SUFFIX )), + aSuffixED (this, ResId( ED_SUFFIX )), + aPosFT (this, ResId( FT_POS )), + aPosPageBox (this, ResId( RB_POS_PAGE )), + aPosChapterBox (this, ResId( RB_POS_CHAPTER)), + aNumGrp (this, ResId( GB_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 )), + + 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)), + + 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 )), aNumPage(aNumCountBox.GetEntry(FTNNUM_PAGE)), pSh( 0 ), @@ -256,42 +255,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) aFtnCharAnchorTemplBox.Hide(); aCharTemplGrp .Hide(); aTemplGrp .Hide(); - if(!bEndNote) - { - // die unteren Controls sollen nach oben verschoben werden - long nYDiff = aPosGrp.GetPosPixel().Y() - aTemplGrp.GetPosPixel().Y(); - Point aTmpPos(aPosGrp.GetPosPixel()); - aTmpPos.Y() -= nYDiff; - aPosGrp.SetPosPixel(aTmpPos); - aTmpPos = aPosPageBox.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aPosPageBox.SetPosPixel(aTmpPos); - aTmpPos = aPosChapterBox.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aPosChapterBox.SetPosPixel(aTmpPos); - aTmpPos = aNumCountBox.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aNumCountBox.SetPosPixel(aTmpPos); - aTmpPos = aContLbl.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aContLbl.SetPosPixel(aTmpPos); - aTmpPos = aContEdit.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aContEdit.SetPosPixel(aTmpPos); - aTmpPos = aContFromLbl.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aContFromLbl.SetPosPixel(aTmpPos); - aTmpPos = aContFromEdit.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aContFromEdit.SetPosPixel(aTmpPos); - aTmpPos = aContGrp.GetPosPixel(); - aTmpPos.Y() -= nYDiff; - aContGrp.SetPosPixel(aTmpPos); - } } if ( bEndNote ) { - aPosGrp.Hide(); aPosPageBox.Hide(); aPosChapterBox.Hide(); aNumCountBox.Hide(); @@ -588,6 +554,9 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:44 hr + initial import + Revision 1.72 2000/09/18 16:05:56 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/misc/docfnote.hrc b/sw/source/ui/misc/docfnote.hrc index 80a428249b16..3532cd387dab 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,9 @@ ************************************************************************/ #define RB_POS_PAGE 1 #define RB_POS_CHAPTER 2 -#define GB_POS 3 +#define FT_POS 3 +#define FT_NUMTYPE 4 +#define FT_NUMCOUNT 5 #define LB_NUMVIEW 10 #define LB_NUMCOUNT 11 diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index 91a074660bd4..366ec48da402 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.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:46:22 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,11 +158,11 @@ TabPage TP_FOOTNOTEOPTION Hide = TRUE; HelpID = HID_FOOTNOTE_OPTIONS ; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; GroupBox GB_NUM { - Pos = MAP_APPFONT ( 6 , 2 ) ; - Size = MAP_APPFONT ( 248 , 42 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 248 , 83 ) ; Text = "Automatische Nummerierung" ; Text [ ENGLISH ] = "Automatic numbering" ; Text [ norwegian ] = "Auto. nummerering" ; @@ -188,11 +188,18 @@ TabPage TP_FOOTNOTEOPTION Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; }; + FixedText FT_NUMTYPE + { + Pos = MAP_APPFONT ( 12 , 16 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; + Text = "Nu~mmerierung" ; + Text [ ENGLISH ] = "Numbering" ; + }; ListBox LB_NUMVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 62 , 50 ) ; + Pos = MAP_APPFONT ( 65 , 14 ) ; + Size = MAP_APPFONT ( 59 , 50 ) ; TabStop = TRUE ; Group = TRUE ; DropDown = TRUE ; @@ -210,8 +217,8 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_OFFSET { - Pos = MAP_APPFONT ( 82 , 14 ) ; - Size = MAP_APPFONT ( 36 , 8 ) ; + Pos = MAP_APPFONT ( 130 , 16 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Be~ginn bei" ; Text [ ENGLISH ] = "~Start at" ; Left = TRUE ; @@ -237,7 +244,7 @@ TabPage TP_FOOTNOTEOPTION }; NumericField FLD_OFFSET { - Pos = MAP_APPFONT ( 133 , 12 ) ; + Pos = MAP_APPFONT ( 189 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; Minimum = 1 ; @@ -247,11 +254,18 @@ TabPage TP_FOOTNOTEOPTION TabStop = TRUE ; Border = TRUE ; }; + FixedText FT_NUMCOUNT + { + Pos = MAP_APPFONT ( 12 , 30 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; + Text = "~Zhlung" ; + Text [ ENGLISH ] = "Counting" ; + }; ListBox LB_NUMCOUNT { Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 27 ) ; - Size = MAP_APPFONT ( 62 , 50 ) ; + Pos = MAP_APPFONT ( 65 , 28 ) ; + Size = MAP_APPFONT ( 59 , 50 ) ; TabStop = TRUE ; Group = TRUE ; DropDown = TRUE ; @@ -397,8 +411,8 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_PREFIX { - Pos = MAP_APPFONT ( 82 , 27 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 44 ) ; + Size = MAP_APPFONT ( 48 , 8 ) ; Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "Fr" ; @@ -427,16 +441,16 @@ TabPage TP_FOOTNOTEOPTION Edit ED_PREFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 133 , 27 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; + Pos = MAP_APPFONT ( 65 , 42 ) ; + Size = MAP_APPFONT ( 59 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 50 ; }; FixedText FT_SUFFIX { - Pos = MAP_APPFONT ( 166 , 27 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 130 , 44 ) ; + Size = MAP_APPFONT ( 48 , 10 ) ; Text = "Dahin~ter" ; Text [ ENGLISH ] = "Behind" ; Text [ norwegian ] = "Bak" ; @@ -465,15 +479,99 @@ TabPage TP_FOOTNOTEOPTION Edit ED_SUFFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 221 , 27 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; + Pos = MAP_APPFONT ( 189 , 42 ) ; + Size = MAP_APPFONT ( 59 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 50 ; }; + FixedText FT_POS + { + Pos = MAP_APPFONT ( 12 , 59 ) ; + Size = MAP_APPFONT ( 36 , 8 ) ; + Text = "Position" ; + Text [ English ] = "Position" ; + Text [ english_us ] = "Position" ; + Text [ portuguese_brazilian ] = "Position" ; + Text [ swedish ] = "Position" ; + Text [ danish ] = "Placering" ; + Text [ italian ] = "Posizione" ; + Text [ spanish ] = "Posicin" ; + Text [ french ] = "Position" ; + Text [ dutch ] = "Positie" ; + Text [ portuguese ] = "Posio" ; + Text[ chinese_simplified ] = "λ"; + Text[ russian ] = ""; + Text[ polish ] = "Pozycja"; + Text[ japanese ] = "ʒu"; + Text[ chinese_traditional ] = "m"; + Text[ arabic ] = ""; + Text[ greek ] = ""; + Text[ korean ] = "ġ"; + Text[ turkish ] = "Konum"; + Text[ language_user1 ] = " "; + }; + RadioButton RB_POS_PAGE + { + Pos = MAP_APPFONT ( 65 , 59 ) ; + Size = MAP_APPFONT ( 150 , 10 ) ; + Text = "Seiten~ende" ; + Text [ ENGLISH ] = "End of ~page" ; + Text [ norwegian ] = "End of ~page" ; + Text [ italian ] = "Fine ~pagina" ; + Text [ portuguese_brazilian ] = "Final de ~pgina" ; + Text [ portuguese ] = "Fim de ~pgina" ; + Text [ finnish ] = "~Sivun loppu" ; + Text [ danish ] = "Sidens slutning" ; + Text [ french ] = "Fin de ~page" ; + Text [ swedish ] = "S~idslut" ; + Text [ dutch ] = "Pag~ina-einde" ; + Text [ spanish ] = "Fin de ~pgina" ; + Text [ english_us ] = "~End of page" ; + TabStop = TRUE ; + Group = TRUE ; + Text[ chinese_simplified ] = "ҳβ(~O)"; + Text[ russian ] = " "; + Text[ polish ] = "Koniec strony"; + Text[ japanese ] = "߰ޖ(~O)"; + Text[ chinese_traditional ] = "(~O)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = " (~E)"; + Text[ turkish ] = "Sayfa so~nu"; + Text[ language_user1 ] = " "; + }; + RadioButton RB_POS_CHAPTER + { + Pos = MAP_APPFONT ( 65 , 73 ) ; + Size = MAP_APPFONT ( 150 , 10 ) ; + Text = "Do~kumentende" ; + Text [ ENGLISH ] = "End of ~doc." ; + Text [ norwegian ] = "Slutt p ~dok." ; + Text [ italian ] = "Fine ~documento" ; + Text [ portuguese_brazilian ] = "Final de~doc." ; + Text [ portuguese ] = "Fim do ~documento" ; + Text [ finnish ] = "~Asiakirjan loppu" ; + Text [ danish ] = "Dokumentets slutn." ; + Text [ french ] = "Fin de ~document" ; + Text [ swedish ] = "Do~kumentslut" ; + Text [ dutch ] = "~Documenteinde" ; + Text [ spanish ] = "F~in del documento" ; + Text [ english_us ] = "En~d of document" ; + Text[ chinese_simplified ] = "ĵβ(~D)"; + Text[ russian ] = " "; + Text[ polish ] = "Koniec dokumentu"; + Text[ japanese ] = "(~D)"; + Text[ chinese_traditional ] = "(~D)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = " (~D)"; + Text[ turkish ] = "~Belge sonunda"; + Text[ language_user1 ] = " "; + }; GroupBox GB_TEMPL { - Pos = MAP_APPFONT ( 6 , 46 ) ; + Pos = MAP_APPFONT ( 6 , 89 ) ; Size = MAP_APPFONT ( 115 , 42 ) ; Text = "Vorlagen" ; Text [ ENGLISH ] = "Styles" ; @@ -501,7 +599,7 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_PARA_TEMPL { - Pos = MAP_APPFONT ( 12 , 58 ) ; + Pos = MAP_APPFONT ( 12 , 102 ) ; Size = MAP_APPFONT ( 38 , 8 ) ; Text = "~Absatz" ; Text [ ENGLISH ] = "~Paragraph" ; @@ -531,8 +629,8 @@ TabPage TP_FOOTNOTEOPTION ListBox LB_PARA_TEMPL { Border = TRUE ; - Pos = MAP_APPFONT ( 51 , 56 ) ; - Size = MAP_APPFONT ( 67 , 54 ) ; + Pos = MAP_APPFONT ( 51 , 100 ) ; + Size = MAP_APPFONT ( 67 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; @@ -540,7 +638,7 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_PAGE_TEMPL { - Pos = MAP_APPFONT ( 12 , 73 ) ; + Pos = MAP_APPFONT ( 12 , 118 ) ; Size = MAP_APPFONT ( 38 , 8 ) ; Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; @@ -570,14 +668,14 @@ TabPage TP_FOOTNOTEOPTION ListBox LB_PAGE_TEMPL { Border = TRUE ; - Pos = MAP_APPFONT ( 51 , 71 ) ; - Size = MAP_APPFONT ( 67 , 54 ) ; + Pos = MAP_APPFONT ( 51 , 116) ; + Size = MAP_APPFONT ( 67 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; }; GroupBox GB_CHAR_TEMPL { - Pos = MAP_APPFONT ( 125 , 46 ) ; + Pos = MAP_APPFONT ( 125 , 89 ) ; Size = MAP_APPFONT ( 129 , 42 ) ; Text = "Zeichenvorlagen" ; Text [ ENGLISH ] = "Character styles" ; @@ -604,7 +702,7 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_ANCHR_CHARFMT { - Pos = MAP_APPFONT ( 129 , 58 ) ; + Pos = MAP_APPFONT ( 129 , 102 ) ; Size = MAP_APPFONT ( 55 , 8 ) ; Text = "Te~xtbereich" ; Text [ ENGLISH ] = "Text" ; @@ -632,7 +730,7 @@ TabPage TP_FOOTNOTEOPTION ListBox LB_ANCHR_CHARFMT { Border = TRUE ; - Pos = MAP_APPFONT ( 186 , 56 ) ; + Pos = MAP_APPFONT ( 186 , 100 ) ; Size = MAP_APPFONT ( 65 , 54 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -640,7 +738,7 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_TEXT_CHARFMT { - Pos = MAP_APPFONT ( 129 , 73 ) ; + Pos = MAP_APPFONT ( 129 , 118 ) ; Size = MAP_APPFONT ( 55 , 8 ) ; Text = "~Funotenbereich" ; Text [ ENGLISH ] = "~Footnote text" ; @@ -668,102 +766,16 @@ TabPage TP_FOOTNOTEOPTION ListBox LB_TEXT_CHARFMT { Border = TRUE ; - Pos = MAP_APPFONT ( 186 , 71 ) ; + Pos = MAP_APPFONT ( 186 , 116 ) ; Size = MAP_APPFONT ( 65 , 54 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; }; - GroupBox GB_POS - { - Pos = MAP_APPFONT ( 6 , 91 ) ; - Size = MAP_APPFONT ( 71 , 42 ) ; - Text = "Position" ; - Text [ English ] = "Position" ; - Group = TRUE ; - Text [ english_us ] = "Position" ; - Text [ portuguese_brazilian ] = "Position" ; - Text [ swedish ] = "Position" ; - Text [ danish ] = "Placering" ; - Text [ italian ] = "Posizione" ; - Text [ spanish ] = "Posicin" ; - Text [ french ] = "Position" ; - Text [ dutch ] = "Positie" ; - Text [ portuguese ] = "Posio" ; - Text[ chinese_simplified ] = "λ"; - Text[ russian ] = ""; - Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu"; - Text[ chinese_traditional ] = "m"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "ġ"; - Text[ turkish ] = "Konum"; - Text[ language_user1 ] = " "; - }; - RadioButton RB_POS_PAGE - { - Pos = MAP_APPFONT ( 12 , 104 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Seiten~ende" ; - Text [ ENGLISH ] = "End of ~page" ; - Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; - Text [ portuguese_brazilian ] = "Final de ~pgina" ; - Text [ portuguese ] = "Fim de ~pgina" ; - Text [ finnish ] = "~Sivun loppu" ; - Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; - Text [ swedish ] = "S~idslut" ; - Text [ dutch ] = "Pag~ina-einde" ; - Text [ spanish ] = "Fin de ~pgina" ; - Text [ english_us ] = "~End of page" ; - TabStop = TRUE ; - Group = TRUE ; - Text[ chinese_simplified ] = "ҳβ(~O)"; - Text[ russian ] = " "; - Text[ polish ] = "Koniec strony"; - Text[ japanese ] = "߰ޖ(~O)"; - Text[ chinese_traditional ] = "(~O)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " (~E)"; - Text[ turkish ] = "Sayfa so~nu"; - Text[ language_user1 ] = " "; - }; - RadioButton RB_POS_CHAPTER - { - Pos = MAP_APPFONT ( 12 , 118 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Do~kumentende" ; - Text [ ENGLISH ] = "End of ~doc." ; - Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; - Text [ portuguese_brazilian ] = "Final de~doc." ; - Text [ portuguese ] = "Fim do ~documento" ; - Text [ finnish ] = "~Asiakirjan loppu" ; - Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; - Text [ swedish ] = "Do~kumentslut" ; - Text [ dutch ] = "~Documenteinde" ; - Text [ spanish ] = "F~in del documento" ; - Text [ english_us ] = "En~d of document" ; - Text[ chinese_simplified ] = "ĵβ(~D)"; - Text[ russian ] = " "; - Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "(~D)"; - Text[ chinese_traditional ] = "(~D)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " (~D)"; - Text[ turkish ] = "~Belge sonunda"; - Text[ language_user1 ] = " "; - }; GroupBox GB_CONT { - Pos = MAP_APPFONT ( 80 , 91 ) ; - Size = MAP_APPFONT ( 174 , 42 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Hinweistext mehrseitige Funoten : Hinweistext mehrseitige Funoten */ + Pos = MAP_APPFONT ( 6 , 134 ) ; + Size = MAP_APPFONT ( 248 , 42 ) ; Text = "Hinweistext mehrseitige Funoten" ; Text [ ENGLISH ] = "Continuation notice" ; Text [ norwegian ] = "+++Continuation notice" ; @@ -790,7 +802,7 @@ TabPage TP_FOOTNOTEOPTION }; FixedText FT_CONT { - Pos = MAP_APPFONT ( 86 , 103 ) ; + Pos = MAP_APPFONT ( 12 , 148 ) ; Size = MAP_APPFONT ( 58 , 8 ) ; Text = "Am Fun~otenende" ; Text [ ENGLISH ] = "~Continued" ; @@ -820,15 +832,15 @@ TabPage TP_FOOTNOTEOPTION Edit ED_CONT { Border = TRUE ; - Pos = MAP_APPFONT ( 147 , 101 ) ; - Size = MAP_APPFONT ( 104 , 12 ) ; + Pos = MAP_APPFONT ( 78, 145 ) ; + Size = MAP_APPFONT ( 170 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 30 ; }; FixedText FT_CONT_FROM { - Pos = MAP_APPFONT ( 86 , 118 ) ; + Pos = MAP_APPFONT ( 12 , 163 ) ; Size = MAP_APPFONT ( 58 , 8 ) ; Text = "A~uf Folgeseite" ; Text [ ENGLISH ] = "~Started" ; @@ -858,8 +870,8 @@ TabPage TP_FOOTNOTEOPTION Edit ED_CONT_FROM { Border = TRUE ; - Pos = MAP_APPFONT ( 147 , 116 ) ; - Size = MAP_APPFONT ( 104 , 12 ) ; + Pos = MAP_APPFONT ( 78 , 161 ) ; + Size = MAP_APPFONT ( 170 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 30 ; @@ -871,7 +883,7 @@ TabPage TP_ENDNOTEOPTION Hide = TRUE; HelpID = HID_ENDNOTE_OPTIONS ; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; GroupBox GB_NUM { Pos = MAP_APPFONT ( 6 , 2 ) ; @@ -901,11 +913,18 @@ TabPage TP_ENDNOTEOPTION Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; }; + FixedText FT_NUMTYPE + { + Pos = MAP_APPFONT ( 12 , 16 ) ; + Size = MAP_APPFONT ( 51 , 8 ) ; + Text = "Nu~mmerierung" ; + Text [ ENGLISH ] = "Numbering" ; + }; ListBox LB_NUMVIEW { Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 62 , 50 ) ; + Pos = MAP_APPFONT ( 65 , 14 ) ; + Size = MAP_APPFONT ( 59 , 50 ) ; TabStop = TRUE ; Group = TRUE ; DropDown = TRUE ; @@ -923,8 +942,8 @@ TabPage TP_ENDNOTEOPTION }; FixedText FT_OFFSET { - Pos = MAP_APPFONT ( 82 , 14 ) ; - Size = MAP_APPFONT ( 36 , 8 ) ; + Pos = MAP_APPFONT ( 130 , 16 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Be~ginn bei" ; Text [ ENGLISH ] = "~Start at" ; Left = TRUE ; @@ -950,7 +969,7 @@ TabPage TP_ENDNOTEOPTION }; NumericField FLD_OFFSET { - Pos = MAP_APPFONT ( 133 , 12 ) ; + Pos = MAP_APPFONT ( 189 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; Minimum = 1 ; @@ -960,158 +979,24 @@ TabPage TP_ENDNOTEOPTION TabStop = TRUE ; Border = TRUE ; }; + FixedText FT_NUMCOUNT + { + Pos = MAP_APPFONT ( 82 , 14 ) ; + Size = MAP_APPFONT ( 36 , 8 ) ; + Hide = TRUE; + }; ListBox LB_NUMCOUNT { Border = TRUE ; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 62 , 50 ) ; - TabStop = TRUE ; - Group = TRUE ; - DropDown = TRUE ; - CurPos = 0 ; - StringList = - { - < "Pro Seite" ; > ; - < "Pro Kapitel" ; > ; - < "Pro Dokument" ; > ; - }; - StringList [ ENGLISH ] = - { - < "Pro Seite" ; > ; - < "Pro Kapitel" ; > ; - < "Pro Dokument" ; > ; - }; - StringList [ norwegian ] = - { - < "Pro Seite" ; > ; - < "Pro Kapitel" ; > ; - < "Pro Dokument" ; > ; - }; - StringList [ italian ] = - { - < "Per pagina" ; > ; - < "Per capitolo" ; > ; - < "Per documento" ; > ; - }; - StringList [ portuguese_brazilian ] = - { - < "Por pgina" ; > ; - < "Por captulo" ; > ; - < "Por documento" ; > ; - }; - StringList [ portuguese ] = - { - < "Por pgina" ; > ; - < "Por captulo" ; > ; - < "Por documento" ; > ; - }; - StringList [ finnish ] = - { - < "Pro Seite" ; > ; - < "Pro Kapitel" ; > ; - < "Pro Dokument" ; > ; - }; - StringList [ danish ] = - { - < "Per side" ; > ; - < "Per kapitel" ; > ; - < "Per dokument" ; > ; - }; - StringList [ french ] = - { - < "Par page" ; > ; - < "Par chapitre" ; > ; - < "Par document" ; > ; - }; - StringList [ swedish ] = - { - < "Per sida" ; > ; - < "Per kapitel" ; > ; - < "Per dokument" ; > ; - }; - StringList [ dutch ] = - { - < "Per pagina" ; > ; - < "Per hoofdstuk" ; > ; - < "Per document" ; > ; - }; - StringList [ spanish ] = - { - < "Por pgina" ; > ; - < "Por captulo" ; > ; - < "Por documento" ; > ; - }; - StringList [ english_us ] = - { - < "Per page" ; > ; - < "Per chapter" ; > ; - < "Per document" ; > ; - }; - StringList [ chinese_simplified ] = - { - < "ÿҳ" ; > ; - < "ÿ" ; > ; - < "ÿĵ" ; > ; - }; - StringList [ russian ] = - { - < " " ; > ; - < " " ; > ; - < " " ; > ; - }; - StringList [ polish ] = - { - < "Na stron" ; > ; - < "Na rozdzia" ; > ; - < "Na dokument" ; > ; - }; - StringList [ japanese ] = - { - < "߰ނ" ; > ; - < "͂" ; > ; - < "" ; > ; - }; - StringList [ chinese_traditional ] = - { - < "C" ; > ; - < "C" ; > ; - < "CӤ" ; > ; - }; - StringList [ arabic ] = - { - < " " ; > ; - < " " ; > ; - < " " ; > ; - }; - StringList [ greek ] = - { - < " " ; > ; - < " " ; > ; - < " " ; > ; - }; - StringList [ korean ] = - { - < " " ; > ; - < " " ; > ; - < " " ; > ; - }; - StringList [ turkish ] = - { - < "Beher sayfa" ; > ; - < "Beher blm" ; > ; - < "Beher belge" ; > ; - }; - StringList [ language_user1 ] = - { - < " " ; > ; - < " " ; > ; - < " " ; > ; - }; + Hide = TRUE; }; FixedText FT_PREFIX { - Pos = MAP_APPFONT ( 82 , 27 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 28 ) ; + Size = MAP_APPFONT ( 48 , 8 ) ; + Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "Fr" ; @@ -1139,17 +1024,17 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_PREFIX { + Pos = MAP_APPFONT ( 65 , 26 ) ; + Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; - Pos = MAP_APPFONT ( 133 , 27 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 50 ; }; FixedText FT_SUFFIX { - Pos = MAP_APPFONT ( 166 , 27 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 130 , 28 ) ; + Size = MAP_APPFONT ( 48 , 10 ) ; Text = "Dahin~ter" ; Text [ ENGLISH ] = "Behind" ; Text [ norwegian ] = "Bak" ; @@ -1177,13 +1062,77 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_SUFFIX { + Pos = MAP_APPFONT ( 189 , 26 ) ; + Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; - Pos = MAP_APPFONT ( 221 , 27 ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Left = TRUE ; MaxTextLength = 50 ; }; + FixedText FT_POS + { + Pos = MAP_APPFONT ( 82 , 14 ) ; + Size = MAP_APPFONT ( 36 , 8 ) ; + Hide = TRUE; + }; + RadioButton RB_POS_PAGE + { + Pos = MAP_APPFONT ( 12 , 104 ) ; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text = "Seiten~ende" ; + Text [ ENGLISH ] = "End of ~page" ; + Text [ norwegian ] = "End of ~page" ; + Text [ italian ] = "Fine ~pagina" ; + Text [ portuguese_brazilian ] = "Final de ~pgina" ; + Text [ portuguese ] = "Fim de ~pgina" ; + Text [ finnish ] = "~Sivun loppu" ; + Text [ danish ] = "Sidens slutning" ; + Text [ french ] = "Fin de ~page" ; + Text [ swedish ] = "~Sidslut" ; + Text [ dutch ] = "Pag~ina-einde" ; + Text [ spanish ] = "Fin de ~pgina" ; + Text [ english_us ] = "End ~of page" ; + TabStop = TRUE ; + Group = TRUE ; + Text[ chinese_simplified ] = "ҳβ(~O)"; + Text[ russian ] = " "; + Text[ polish ] = "Koniec strony"; + Text[ japanese ] = "߰ޖ(~O)"; + Text[ chinese_traditional ] = "(~O)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = " (~O)"; + Text[ turkish ] = "Sayfa so~nu"; + Text[ language_user1 ] = " "; + }; + RadioButton RB_POS_CHAPTER + { + Pos = MAP_APPFONT ( 12 , 118 ) ; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text = "~Dokumentende" ; + Text [ ENGLISH ] = "End of ~doc." ; + Text [ norwegian ] = "Slutt p ~dok." ; + Text [ italian ] = "Fine ~documento" ; + Text [ portuguese_brazilian ] = "Final de~doc." ; + Text [ portuguese ] = "Fim do ~documento" ; + Text [ finnish ] = "~Asiakirjan loppu" ; + Text [ danish ] = "Dokumentets slutn." ; + Text [ french ] = "Fin de ~document" ; + Text [ swedish ] = "~Dokumentslut" ; + Text [ dutch ] = "~Documenteinde" ; + Text [ spanish ] = "Fin del ~documento" ; + Text [ english_us ] = "End of ~document" ; + Text[ chinese_simplified ] = "ĵβ(~D)"; + Text[ russian ] = " "; + Text[ polish ] = "Koniec dokumentu"; + Text[ japanese ] = "(~D)"; + Text[ chinese_traditional ] = "(~D)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = " (~D)"; + Text[ turkish ] = "~Belge sonunda"; + Text[ language_user1 ] = " "; + }; GroupBox GB_TEMPL { Pos = MAP_APPFONT ( 6 , 46 ) ; @@ -1384,91 +1333,6 @@ TabPage TP_ENDNOTEOPTION DropDown = TRUE ; Sort = TRUE ; }; - GroupBox GB_POS - { - Pos = MAP_APPFONT ( 6 , 91 ) ; - Size = MAP_APPFONT ( 71 , 42 ) ; - Text = "Position" ; - Text [ English ] = "Position" ; - Group = TRUE ; - Text [ english_us ] = "Position" ; - Text [ portuguese_brazilian ] = "Position" ; - Text [ swedish ] = "Position" ; - Text [ danish ] = "Placering" ; - Text [ italian ] = "Posizione" ; - Text [ spanish ] = "Posicin" ; - Text [ french ] = "Position" ; - Text [ dutch ] = "Positie" ; - Text [ portuguese ] = "Posio" ; - Text[ chinese_simplified ] = "λ"; - Text[ russian ] = ""; - Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu"; - Text[ chinese_traditional ] = "m"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "ġ"; - Text[ turkish ] = "Konum"; - Text[ language_user1 ] = " "; - }; - RadioButton RB_POS_PAGE - { - Pos = MAP_APPFONT ( 12 , 104 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Seiten~ende" ; - Text [ ENGLISH ] = "End of ~page" ; - Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; - Text [ portuguese_brazilian ] = "Final de ~pgina" ; - Text [ portuguese ] = "Fim de ~pgina" ; - Text [ finnish ] = "~Sivun loppu" ; - Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; - Text [ swedish ] = "~Sidslut" ; - Text [ dutch ] = "Pag~ina-einde" ; - Text [ spanish ] = "Fin de ~pgina" ; - Text [ english_us ] = "End ~of page" ; - TabStop = TRUE ; - Group = TRUE ; - Text[ chinese_simplified ] = "ҳβ(~O)"; - Text[ russian ] = " "; - Text[ polish ] = "Koniec strony"; - Text[ japanese ] = "߰ޖ(~O)"; - Text[ chinese_traditional ] = "(~O)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " (~O)"; - Text[ turkish ] = "Sayfa so~nu"; - Text[ language_user1 ] = " "; - }; - RadioButton RB_POS_CHAPTER - { - Pos = MAP_APPFONT ( 12 , 118 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "~Dokumentende" ; - Text [ ENGLISH ] = "End of ~doc." ; - Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; - Text [ portuguese_brazilian ] = "Final de~doc." ; - Text [ portuguese ] = "Fim do ~documento" ; - Text [ finnish ] = "~Asiakirjan loppu" ; - Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; - Text [ swedish ] = "~Dokumentslut" ; - Text [ dutch ] = "~Documenteinde" ; - Text [ spanish ] = "Fin del ~documento" ; - Text [ english_us ] = "End of ~document" ; - Text[ chinese_simplified ] = "ĵβ(~D)"; - Text[ russian ] = " "; - Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "(~D)"; - Text[ chinese_traditional ] = "(~D)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " (~D)"; - Text[ turkish ] = "~Belge sonunda"; - Text[ language_user1 ] = " "; - }; GroupBox GB_CONT { Pos = MAP_APPFONT ( 80 , 91 ) ; diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index a60e2842a621..faf27aef3d9b 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,18 +84,19 @@ class SwWrtShell; class SwEndNoteOptionPage : public SfxTabPage { - RadioButton aPosPageBox; - RadioButton aPosChapterBox; - GroupBox aPosGrp; - + FixedText aNumTypeFT; ListBox aNumViewBox; FixedText aOffsetLbl; NumericField aOffsetFld; + FixedText aNumCountFT; ListBox aNumCountBox; FixedText aPrefixFT; Edit aPrefixED; FixedText aSuffixFT; Edit aSuffixED; + FixedText aPosFT; + RadioButton aPosPageBox; + RadioButton aPosChapterBox; GroupBox aNumGrp; FixedText aParaTemplLbl; diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index 3f3b3f49d5d9..b2158b9f3955 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.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2000-12-08 18:27:18 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,13 +78,13 @@ TabPage TP_LINENUMBERING HelpID = HID_LINENUMBERING ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Zeilennummerierung" ; Text [ ENGLISH ] = "Line Numbering" ; CheckBox CB_NUMBERING_ON { Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 248 , 10 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "~Nummerierung einschalten" ; Text [ ENGLISH ] = "~Turn line numbering on" ; TabStop = TRUE ; @@ -110,8 +110,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_CHAR_STYLE { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 30 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "~Zeichenvorlage" ; Text [ English ] = "~Char style" ; Text [ english_us ] = "~Character Style" ; @@ -136,16 +136,16 @@ TabPage TP_LINENUMBERING }; ListBox LB_CHAR_STYLE { - Pos = MAP_APPFONT ( 65 , 30 ) ; - Size = MAP_APPFONT ( 75 , 60 ) ; + Pos = MAP_APPFONT ( 100 , 30 ) ; + Size = MAP_APPFONT ( 148 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE ; }; FixedText FT_FORMAT { - Pos = MAP_APPFONT ( 12 , 50 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 46 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "~Format" ; Text [ English ] = "~Format" ; Text [ english_us ] = "F~ormat" ; @@ -170,15 +170,15 @@ TabPage TP_LINENUMBERING }; ListBox LB_FORMAT { - Pos = MAP_APPFONT ( 65 , 48 ) ; - Size = MAP_APPFONT ( 75 , 60 ) ; + Pos = MAP_APPFONT ( 100 , 44 ) ; + Size = MAP_APPFONT ( 148 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; }; FixedText FT_POS { - Pos = MAP_APPFONT ( 12 , 68 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 62 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "~Position" ; Text [ English ] = "~Position" ; Text [ english_us ] = "Position" ; @@ -203,8 +203,8 @@ TabPage TP_LINENUMBERING }; ListBox LB_POS { - Pos = MAP_APPFONT ( 65 , 66 ) ; - Size = MAP_APPFONT ( 75 , 60 ) ; + Pos = MAP_APPFONT ( 100 , 60 ) ; + Size = MAP_APPFONT ( 148 , 60 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList = @@ -357,8 +357,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_OFFSET { - Pos = MAP_APPFONT ( 12 , 86 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 78 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "~Abstand" ; Text [ English ] = "~Offset" ; Text [ english_us ] = "Spacing" ; @@ -383,7 +383,7 @@ TabPage TP_LINENUMBERING }; MetricField MF_OFFSET { - Pos = MAP_APPFONT ( 65 , 84 ) ; + Pos = MAP_APPFONT ( 100 , 76 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -400,8 +400,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_NUM_INVERVAL { - Pos = MAP_APPFONT ( 12 , 104 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 94 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "~Intervall" ; Text [ English ] = "~Interval" ; Text [ english_us ] = "Interval" ; @@ -426,7 +426,7 @@ TabPage TP_LINENUMBERING }; NumericField NF_NUM_INVERVAL { - Pos = MAP_APPFONT ( 65 , 102 ) ; + Pos = MAP_APPFONT ( 100 , 92 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -441,8 +441,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_NUM_ROWS { - Pos = MAP_APPFONT ( 100 , 104 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 136 , 94 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; Text = "Zeilen" ; Text [ English ] = "Rows" ; Text [ english_us ] = "lines" ; @@ -467,8 +467,8 @@ TabPage TP_LINENUMBERING }; GroupBox GB_DISPLAY { - Pos = MAP_APPFONT ( 6 , 19 ) ; - Size = MAP_APPFONT ( 140 , 103 ) ; + Pos = MAP_APPFONT ( 6 , 17 ) ; + Size = MAP_APPFONT ( 248 , 90 ) ; Text = "Anzeige" ; Text [ English ] = "Display" ; Text [ english_us ] = "View" ; @@ -493,8 +493,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_DIVISOR { - Pos = MAP_APPFONT ( 158 , 32 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 123 ) ; + Size = MAP_APPFONT ( 30 , 8 ) ; Text = "~Text" ; Text [ English ] = "~Text" ; Text [ portuguese ] = "~Texto" ; @@ -519,15 +519,15 @@ TabPage TP_LINENUMBERING }; Edit ED_DIVISOR { - Pos = MAP_APPFONT ( 186 , 31 ) ; - Size = MAP_APPFONT ( 62 , 12 ) ; + Pos = MAP_APPFONT ( 45 , 121 ) ; + Size = MAP_APPFONT ( 76 , 12 ) ; Left = TRUE ; Border = TRUE ; }; FixedText FT_DIV_INTERVAL { - Pos = MAP_APPFONT ( 158 , 46 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 139 ) ; + Size = MAP_APPFONT ( 30 , 8 ) ; Text = "A~lle" ; Text [ English ] = "A~ll" ; // Disable = TRUE ; @@ -553,7 +553,7 @@ TabPage TP_LINENUMBERING }; NumericField NF_DIV_INTERVAL { - Pos = MAP_APPFONT ( 186 , 44 ) ; + Pos = MAP_APPFONT ( 45 , 137 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -569,8 +569,8 @@ TabPage TP_LINENUMBERING }; FixedText FT_DIV_ROWS { - Pos = MAP_APPFONT ( 221 , 46 ) ; - Size = MAP_APPFONT ( 27 , 10 ) ; + Pos = MAP_APPFONT ( 78 , 139 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Zeilen" ; Text [ English ] = "Rows" ; Text [ english_us ] = "Lines" ; @@ -595,8 +595,8 @@ TabPage TP_LINENUMBERING }; GroupBox GB_DIVISOR { - Pos = MAP_APPFONT ( 152 , 19 ) ; - Size = MAP_APPFONT ( 102 , 44 ) ; + Pos = MAP_APPFONT ( 6 , 110 ) ; + Size = MAP_APPFONT ( 121 , 53 ) ; Text = "Teiler" ; Text [ English ] = "Divisor" ; Text [ english_us ] = "Separator" ; @@ -621,8 +621,8 @@ TabPage TP_LINENUMBERING }; CheckBox CB_COUNT_EMPTYLINES { - Pos = MAP_APPFONT ( 158 , 80 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 139 , 121 ) ; + Size = MAP_APPFONT ( 110 , 10 ) ; Text = "L~eerzeilen" ; Text [ ENGLISH ] = "~Empty lines" ; TabStop = TRUE ; @@ -648,8 +648,8 @@ TabPage TP_LINENUMBERING }; CheckBox CB_COUNT_FRAMELINES { - Pos = MAP_APPFONT ( 158 , 93 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 139 , 135 ) ; + Size = MAP_APPFONT ( 110 , 10 ) ; Text = "Zeilen in Te~xtrahmen" ; Text [ ENGLISH ] = "Text frame l~ines" ; TabStop = TRUE ; @@ -675,8 +675,8 @@ TabPage TP_LINENUMBERING }; CheckBox CB_RESTART_PAGE { - Pos = MAP_APPFONT ( 158 , 106 ); - Size = MAP_APPFONT ( 90 , 10 ); + Pos = MAP_APPFONT ( 139 , 149 ); + Size = MAP_APPFONT ( 110 , 10 ); Text = "~Neustart am Seitenanfang"; Text [ ENGLISH ] = "~Restart each new page"; TabStop = TRUE; @@ -701,8 +701,8 @@ TabPage TP_LINENUMBERING }; GroupBox GB_COUNT { - Pos = MAP_APPFONT ( 152 , 67 ) ; - Size = MAP_APPFONT ( 102 , 55 ) ; + Pos = MAP_APPFONT ( 133 , 110 ) ; + Size = MAP_APPFONT ( 121 , 53 ) ; Text = "Zhlen" ; Text [ English ] = "Count" ; Text [ english_us ] = "Count" ; diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index 562ca716ff74..dd25d72a9e5d 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.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2001-02-02 16:55:31 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,12 +77,12 @@ TabPage TP_NUM_POSITION { HelpID = HID_NUM_POSITION ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; GroupBox GB_LEVEL { - Pos = MAP_APPFONT ( 6 , 1 ) ; - Size = MAP_APPFONT ( 38 , 130 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 38 , 179 ) ; Text = "Ebene" ; Text [ ENGLISH ] = "Level" ; Text [ norwegian ] = "Level" ; @@ -110,7 +110,7 @@ TabPage TP_NUM_POSITION MultiListBox LB_LEVEL { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 26 , 114 ) ; + Size = MAP_APPFONT ( 26 , 163 ) ; TabStop = TRUE ; DropDown = FALSE ; Border = TRUE ; @@ -118,8 +118,8 @@ TabPage TP_NUM_POSITION }; GroupBox GB_POSITION { - Pos = MAP_APPFONT ( 47 , 1 ) ; - Size = MAP_APPFONT ( 207 , 77 ) ; + Pos = MAP_APPFONT ( 47 , 3 ) ; + Size = MAP_APPFONT ( 207 , 92 ) ; Text = "Position und Abstand" ; Text [ ENGLISH ] = "Position and distance" ; Group = TRUE ; @@ -145,10 +145,9 @@ TabPage TP_NUM_POSITION }; FixedText FT_BORDERDIST { - Pos = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 50 , 16 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text = "Ein~rckung"; -// Text = "Abstand Text <-> Rand" ; Text [ ENGLISH ] = "Distance text <-> border" ; Text [ english_us ] = "Indent" ; Text [ swedish ] = "Indrag" ; @@ -172,7 +171,7 @@ TabPage TP_NUM_POSITION }; CheckBox CB_RELATIVE { - Pos = MAP_APPFONT ( 201 , 14 ) ; + Pos = MAP_APPFONT ( 201 , 16 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; Text = "Relati~v" ; Text [ ENGLISH ] = "Relati~ve" ; @@ -198,7 +197,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_BORDERDIST { - Pos = MAP_APPFONT ( 158 , 12 ) ; + Pos = MAP_APPFONT ( 158 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -216,10 +215,9 @@ TabPage TP_NUM_POSITION }; FixedText FT_INDENT { - Pos = MAP_APPFONT ( 50 , 29 ) ; + Pos = MAP_APPFONT ( 50 , 32 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text = "Abstand zum Te~xt" ; -// Text = "Einr~ckung" ; Text [ ENGLISH ] = "Indent" ; Text [ english_us ] = "Space to Te~xt" ; Text [ swedish ] = "Avstnd till text" ; @@ -243,7 +241,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_INDENT { - Pos = MAP_APPFONT ( 158 , 27 ) ; + Pos = MAP_APPFONT ( 158 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -261,10 +259,9 @@ TabPage TP_NUM_POSITION }; FixedText FT_NUMDIST { - Pos = MAP_APPFONT ( 50 , 44 ) ; + Pos = MAP_APPFONT ( 50 , 48 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; - Text = "Mindestabstand Nummer <-> Text" ; -// Text = "Abstand Te~xt <-> Numerierung" ; + Text = "~Mindestabstand Nummer <-> Text" ; Text [ ENGLISH ] = "Distance text <-> numbering" ; Text [ english_us ] = "Minimum space numbering <-> text" ; Text [ swedish ] = "Minsta avstnd nummer <-> text" ; @@ -288,7 +285,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_NUMDIST { - Pos = MAP_APPFONT ( 158 , 42 ) ; + Pos = MAP_APPFONT ( 158 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -306,11 +303,10 @@ TabPage TP_NUM_POSITION }; FixedText FT_ALIGN { - Pos = MAP_APPFONT ( 50 , 59 ) ; + Pos = MAP_APPFONT ( 50 , 64 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text = "Ausri~chtung der Nummerierung" ; Text [ ENGLISH ] = "Alignment of the numbering" ; - //??? Text [ english_us ] = "Numbering ~alignment" ; Text [ swedish ] = "~Placering av numrering" ; Text [ danish ] = "Justering af nummerering" ; @@ -333,7 +329,7 @@ TabPage TP_NUM_POSITION }; ListBox LB_ALIGN { - Pos = MAP_APPFONT ( 158 , 57 ) ; + Pos = MAP_APPFONT ( 158 , 62 ) ; Size = MAP_APPFONT ( 40 , 40 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -466,8 +462,8 @@ TabPage TP_NUM_POSITION }; PushButton PB_STANDARD { - Pos = MAP_APPFONT ( 201 , 63 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 201 , 78 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; Text = "~Standard" ; Text [ ENGLISH ] = "~Standard" ; Text [ english_us ] = "~Default" ; @@ -492,8 +488,8 @@ TabPage TP_NUM_POSITION }; GroupBox GB_PREVIEW { - Pos = MAP_APPFONT ( 47 , 81 ) ; - Size = MAP_APPFONT ( 207 , 50 ) ; + Pos = MAP_APPFONT ( 47 , 98 ) ; + Size = MAP_APPFONT ( 207 , 84 ) ; Text = "Vorschau" ; Text [ ENGLISH ] = "Preview" ; Text [ english_us ] = "Preview" ; @@ -518,8 +514,8 @@ TabPage TP_NUM_POSITION }; Window WIN_PREVIEW { - Pos = MAP_APPFONT ( 50 , 92 ) ; - Size = MAP_APPFONT ( 201 , 34 ) ; + Pos = MAP_APPFONT ( 50 , 109 ) ; + Size = MAP_APPFONT ( 201 , 70 ) ; }; }; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1acdd387ada7..5b3e4bfaa615 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.4 $ + * $Revision: 1.5 $ * - * last change: $Author: csaba $ $Date: 2000-12-07 18:35:30 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -633,6 +633,7 @@ void SwOutlineSettingsTabPage::Update() else aCharFmtLB.SetNoSelection(); + aAllLevelFT.Enable(TRUE); aAllLevelNF.Enable(TRUE); aAllLevelNF.SetMax(MAXLEVEL); if(bSameComplete) @@ -664,6 +665,7 @@ void SwOutlineSettingsTabPage::Update() if(nTmpLevel) { + aAllLevelFT.Enable(TRUE); aAllLevelNF.Enable(TRUE); aAllLevelNF.SetMax(nTmpLevel + 1); aAllLevelNF.SetValue(rFmt.GetUpperLevel()); @@ -672,6 +674,7 @@ void SwOutlineSettingsTabPage::Update() { aAllLevelNF.SetText(aEmptyStr); aAllLevelNF.Enable(FALSE); + aAllLevelFT.Enable(FALSE); } aStartEdit.SetValue( rFmt.GetStartValue() ); @@ -1223,6 +1226,9 @@ NumberingPreview::~NumberingPreview() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.4 2000/12/07 18:35:30 csaba + 79541 Branding/Configuration Change + Revision 1.3 2000/11/09 10:10:34 obo Without string include diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index 320e314d6371..3d80e6753a38 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.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2001-02-02 16:56:40 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -820,20 +820,20 @@ TabPage TP_OUTLINE_NUM { HelpID = HID_TP_OUTLINE_NUM ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; ListBox LB_LEVEL { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 21 , 114 ) ; + Size = MAP_APPFONT ( 21 , 129 ) ; TabStop = TRUE ; DropDown = FALSE ; Border = TRUE ; }; GroupBox GB_LEVEL { - Pos = MAP_APPFONT ( 6 , 1 ) ; - Size = MAP_APPFONT ( 33 , 131 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 33 , 143 ) ; Text = "Ebene" ; Text [ ENGLISH ] = "Level" ; Text [ norwegian ] = "Level" ; @@ -860,7 +860,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_COLL { - Pos = MAP_APPFONT ( 48 , 10 ) ; + Pos = MAP_APPFONT ( 48 , 14 ) ; Size = MAP_APPFONT ( 81 , 8 ) ; Text = "~Absatzvorlage" ; Text [ ENGLISH ] = "~Paragraph style" ; @@ -891,7 +891,7 @@ TabPage TP_OUTLINE_NUM ListBox LB_COLL { Border = TRUE ; - Pos = MAP_APPFONT ( 48 , 20 ) ; + Pos = MAP_APPFONT ( 48 , 25 ) ; Size = MAP_APPFONT ( 122 , 75 ) ; TabStop = TRUE ; Group = TRUE ; @@ -901,7 +901,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_NUMBER { - Pos = MAP_APPFONT ( 48 , 40 ) ; + Pos = MAP_APPFONT ( 48 , 43 ) ; Size = MAP_APPFONT ( 35 , 8 ) ; Text = "~Nummer" ; Text [ ENGLISH ] = "~Number" ; @@ -930,7 +930,7 @@ TabPage TP_OUTLINE_NUM }; ListBox LB_NUMBER { - Pos = MAP_APPFONT ( 97 , 38 ) ; + Pos = MAP_APPFONT ( 97 , 41 ) ; Size = MAP_APPFONT ( 73 , 65 ) ; TabStop = TRUE ; Group = TRUE ; @@ -1192,7 +1192,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_CHARFMT { - Pos = MAP_APPFONT ( 48 , 58 ) ; + Pos = MAP_APPFONT ( 48 , 59 ) ; Size = MAP_APPFONT ( 45 , 8 ) ; Text = "Zeichenv~orlage" ; Text [ ENGLISH ] = "Character style" ; @@ -1220,12 +1220,12 @@ TabPage TP_OUTLINE_NUM { TabStop = TRUE ; DropDown = TRUE ; - Pos = MAP_APPFONT ( 97 , 56 ) ; + Pos = MAP_APPFONT ( 97 , 57 ) ; Size = MAP_APPFONT ( 73 , 65 ) ; }; FixedText FT_ALL_LEVEL { - Pos = MAP_APPFONT ( 48 , 76 ) ; + Pos = MAP_APPFONT ( 48 , 75 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; Text = "~Vollstndig" ; Text [ ENGLISH ] = "~Complete" ; @@ -1254,7 +1254,7 @@ TabPage TP_OUTLINE_NUM NumericField NF_ALL_LEVEL { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 74 ) ; + Pos = MAP_APPFONT ( 97 , 73 ) ; Size = MAP_APPFONT ( 73 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1268,7 +1268,7 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_DELIM { - Pos = MAP_APPFONT ( 48 , 90 ) ; + Pos = MAP_APPFONT ( 48 , 89 ) ; Size = MAP_APPFONT ( 40 , 8 ) ; Text = "Trennzeichen" ; Text [ ENGLISH ] = "Delimiter" ; @@ -1297,8 +1297,8 @@ TabPage TP_OUTLINE_NUM }; FixedText FT_PREFIX { - Pos = MAP_APPFONT ( 97 , 90 ) ; - Size = MAP_APPFONT ( 21 , 8 ) ; + Pos = MAP_APPFONT ( 54 , 102 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "~davor" ; Text [ ENGLISH ] = "before" ; Text [ norwegian ] = "fr" ; @@ -1327,17 +1327,16 @@ TabPage TP_OUTLINE_NUM Edit ED_PREFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 101 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 97 , 100 ) ; + Size = MAP_APPFONT ( 73 , 12 ) ; TabStop = TRUE ; Group = TRUE ; Left = TRUE ; }; FixedText FT_SUFFIX { - Pos = MAP_APPFONT ( 134 , 90 ) ; - Size = MAP_APPFONT ( 30 , 8 ) ; - // ### ACHTUNG: Neuer Text in Resource? dah~inter : da~hinter + Pos = MAP_APPFONT ( 54 , 117 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "dah~inter" ; Text [ ENGLISH ] = "behind" ; Text [ norwegian ] = "bak" ; @@ -1366,15 +1365,15 @@ TabPage TP_OUTLINE_NUM Edit ED_SUFFIX { Border = TRUE ; - Pos = MAP_APPFONT ( 134 , 101 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 97 , 115 ) ; + Size = MAP_APPFONT ( 73 , 12 ) ; TabStop = TRUE ; Group = TRUE ; Left = TRUE ; }; FixedText FT_START { - Pos = MAP_APPFONT ( 48 , 119 ) ; + Pos = MAP_APPFONT ( 48 , 133 ) ; Size = MAP_APPFONT ( 43 , 8 ) ; Text = "~Beginn bei" ; Text [ English ] = "~Start at" ; @@ -1404,7 +1403,7 @@ TabPage TP_OUTLINE_NUM NumericField ED_START { Border = TRUE ; - Pos = MAP_APPFONT ( 97 , 117 ) ; + Pos = MAP_APPFONT ( 97 , 131 ) ; Size = MAP_APPFONT ( 73 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1418,8 +1417,8 @@ TabPage TP_OUTLINE_NUM }; GroupBox GB_NUMBER { - Pos = MAP_APPFONT ( 42 , 1 ) ; - Size = MAP_APPFONT ( 131 , 131 ) ; + Pos = MAP_APPFONT ( 42 , 3 ) ; + Size = MAP_APPFONT ( 131 , 143 ) ; Text = "Nummerierung" ; Text [ ENGLISH ] = "Numbering" ; Text [ norwegian ] = "Nummering" ; @@ -1447,13 +1446,13 @@ TabPage TP_OUTLINE_NUM }; Window WIN_PREVIEW { - Pos = MAP_APPFONT ( 179 , 12 ) ; - Size = MAP_APPFONT ( 72 , 114 ) ; + Pos = MAP_APPFONT ( 179 , 14 ) ; + Size = MAP_APPFONT ( 72 , 129 ) ; }; GroupBox GB_PREVIEW { - Pos = MAP_APPFONT ( 176 , 1 ) ; - Size = MAP_APPFONT ( 78 , 130 ) ; + Pos = MAP_APPFONT ( 176 , 3 ) ; + Size = MAP_APPFONT ( 78 , 143 ) ; Text = "Vorschau" ; Text [ ENGLISH ] = "Preview" ; Text [ english_us ] = "Preview" ; diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 5e287d9877d5..f8969429a6d1 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: pgfnote.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2001-02-02 16:57:47 $ + * last change: $Author: os $ $Date: 2001-02-09 08:01:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,47 +61,16 @@ #include "globals.hrc" #include "pgfnote.hrc" #include "helpid.h" - // #define TP_FOOTNOTE_PAGE 256 TabPage TP_FOOTNOTE_PAGE { HelpID = HID_FOOTNOTE_PAGE ; Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; - RadioButton RB_MAXHEIGHT - { - Pos = MAP_APPFONT ( 14 , 31 ) ; - Size = MAP_APPFONT ( 95 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Ma~x. Hhe der Funote : Ma~x. Hhe der Funote */ - Text = "Ma~x. Hhe der Funote" ; - Text [ ENGLISH ] = "Max. ~Height of Footnote" ; - Text [ norwegian ] = "Maks. ~Hyde p Fotnote" ; - Text [ italian ] = "Altezza massima nota a pi pagina" ; - Text [ portuguese_brazilian ] = "Max. ~Height of Footnote" ; - Text [ portuguese ] = "~Altura mxima da nota de rodap" ; - Text [ finnish ] = "Max. ~Height of Footnote" ; - Text [ danish ] = "Maks. hjde fodnote" ; - Text [ french ] = "Hauteur max. du ~pied de page" ; - Text [ swedish ] = "Fotnotens ma~x hjd" ; - Text [ dutch ] = "~Maximum hoogte" ; - Text [ spanish ] = "Altura mx. de ~nota al pie" ; - Text [ english_us ] = "Maximum footnote ~height" ; - Text[ chinese_simplified ] = "עŵ߶(~H)"; - Text[ russian ] = ". "; - Text[ polish ] = "~Maks. wysoko przypisw doln."; - Text[ japanese ] = "r̍ō̍(~H)"; - Text[ chinese_traditional ] = "}̰(~H)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " ִ (~H)"; - Text[ turkish ] = "Azami dipnot ykseklii"; - Text[ language_user1 ] = " "; - }; RadioButton RB_MAXHEIGHT_PAGE { - Pos = MAP_APPFONT ( 14 , 16 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 95 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Hhe maximal wie ~Seite : Hhe maximal wie ~Seite */ Text = "Hhe maximal wie ~Seite" ; Text [ ENGLISH ] = "Page height at maximum" ; Text [ norwegian ] = "Maksimum Sidehyde" ; @@ -128,10 +97,38 @@ TabPage TP_FOOTNOTE_PAGE Text[ turkish ] = "En fazla sayfa yksekliinde"; Text[ language_user1 ] = " "; }; + RadioButton RB_MAXHEIGHT + { + Pos = MAP_APPFONT ( 12 , 28 ) ; + Size = MAP_APPFONT ( 95 , 10 ) ; + Text = "Ma~x. Hhe der Funote" ; + Text [ ENGLISH ] = "Max. ~Height of Footnote" ; + Text [ norwegian ] = "Maks. ~Hyde p Fotnote" ; + Text [ italian ] = "Altezza massima nota a pi pagina" ; + Text [ portuguese_brazilian ] = "Max. ~Height of Footnote" ; + Text [ portuguese ] = "~Altura mxima da nota de rodap" ; + Text [ finnish ] = "Max. ~Height of Footnote" ; + Text [ danish ] = "Maks. hjde fodnote" ; + Text [ french ] = "Hauteur max. du ~pied de page" ; + Text [ swedish ] = "Fotnotens ma~x hjd" ; + Text [ dutch ] = "~Maximum hoogte" ; + Text [ spanish ] = "Altura mx. de ~nota al pie" ; + Text [ english_us ] = "Maximum footnote ~height" ; + Text[ chinese_simplified ] = "עŵ߶(~H)"; + Text[ russian ] = ". "; + Text[ polish ] = "~Maks. wysoko przypisw doln."; + Text[ japanese ] = "r̍ō̍(~H)"; + Text[ chinese_traditional ] = "}̰(~H)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = " ִ (~H)"; + Text[ turkish ] = "Azami dipnot ykseklii"; + Text[ language_user1 ] = " "; + }; MetricField ED_MAXHEIGHT { Border = TRUE ; - Pos = MAP_APPFONT ( 115 , 30 ) ; + Pos = MAP_APPFONT ( 118 , 27 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; TabStop = TRUE ; Group = TRUE ; @@ -149,9 +146,8 @@ TabPage TP_FOOTNOTE_PAGE }; FixedText FT_DIST { - Pos = MAP_APPFONT ( 25 , 51 ) ; - Size = MAP_APPFONT ( 85 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Abstand zum Textkrper : ~Abstand zum Textkrper */ + Pos = MAP_APPFONT ( 12 , 43 ) ; + Size = MAP_APPFONT ( 95 , 8 ) ; Text = "~Abstand zum Textkrper" ; Text [ ENGLISH ] = "~Distance from Bodytext" ; Text [ norwegian ] = "~Avstand fra Hovedtekst" ; @@ -180,7 +176,7 @@ TabPage TP_FOOTNOTE_PAGE MetricField ED_DIST { Border = TRUE ; - Pos = MAP_APPFONT ( 115 , 50 ) ; + Pos = MAP_APPFONT ( 118 , 41 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -196,9 +192,8 @@ TabPage TP_FOOTNOTE_PAGE }; GroupBox GB_FOOTNOTE_SIZE { - Pos = MAP_APPFONT ( 6 , 2 ) ; - Size = MAP_APPFONT ( 157 , 67 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Funotenbereich : Funotenbereich */ + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 157 , 53 ) ; Text = "Funotenbereich" ; Text [ ENGLISH ] = "Footnote range" ; Text [ norwegian ] = "+++Footnote range" ; @@ -223,10 +218,44 @@ TabPage TP_FOOTNOTE_PAGE Text[ turkish ] = "Dipnot blm"; Text[ language_user1 ] = " "; }; + Window WN_BSP + { + Pos = MAP_APPFONT ( 175 , 20 ) ; + Size = MAP_APPFONT ( 72 , 33 ) ; + Text = "Window" ; + }; + GroupBox GB_BSP + { + Pos = MAP_APPFONT ( 169 , 3 ) ; + Size = MAP_APPFONT ( 84 , 53 ) ; + Text = "Vorschau" ; + Text [ ENGLISH ] = "Example" ; + Text [ norwegian ] = "Eksempel" ; + Text [ italian ] = "Anteprima" ; + Text [ portuguese_brazilian ] = "Exemplo" ; + Text [ portuguese ] = "Previsualizar" ; + Text [ finnish ] = "Malli" ; + Text [ danish ] = "Eksempel" ; + Text [ french ] = "Aperu" ; + Text [ swedish ] = "Frhandsvisning" ; + Text [ dutch ] = "Voorbeeld" ; + Text [ spanish ] = "Previsualizacin" ; + Text [ english_us ] = "Preview" ; + 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 ] = " "; + }; FixedText FT_LINEPOS { - Pos = MAP_APPFONT ( 12 , 87 ) ; - Size = MAP_APPFONT ( 26 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 72 ) ; + Size = MAP_APPFONT ( 26 , 8 ) ; Text = "~Position" ; Text [ English ] = "~Position" ; Left = TRUE ; @@ -252,7 +281,7 @@ TabPage TP_FOOTNOTE_PAGE }; ListBox DLB_LINEPOS { - Pos = MAP_APPFONT ( 40 , 85 ) ; + Pos = MAP_APPFONT ( 40 , 70 ) ; Size = MAP_APPFONT ( 57 , 40 ) ; TabStop = TRUE ; Group = TRUE ; @@ -399,9 +428,8 @@ TabPage TP_FOOTNOTE_PAGE }; FixedText FT_LINETYPE { - Pos = MAP_APPFONT ( 12 , 107 ) ; - Size = MAP_APPFONT ( 26 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Str~ke : A~rt */ + Pos = MAP_APPFONT ( 12 , 88 ) ; + Size = MAP_APPFONT ( 26 , 8 ) ; Text = "Str~ke" ; Text [ ENGLISH ] = "~Thickness" ; Group = TRUE ; @@ -428,7 +456,7 @@ TabPage TP_FOOTNOTE_PAGE }; ListBox DLB_LINETYPE { - Pos = MAP_APPFONT ( 40 , 105 ) ; + Pos = MAP_APPFONT ( 40 , 86 ) ; Size = MAP_APPFONT ( 57 , 50 ) ; TabStop = TRUE ; Group = TRUE ; @@ -437,9 +465,8 @@ TabPage TP_FOOTNOTE_PAGE }; FixedText FT_LINEWIDTH { - Pos = MAP_APPFONT ( 99 , 87 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Ln~ge : Br~eite */ + Pos = MAP_APPFONT ( 100 , 72 ) ; + Size = MAP_APPFONT ( 105 , 8 ) ; Text = "Ln~ge" ; Text [ ENGLISH ] = "~Length" ; Left = TRUE ; @@ -466,7 +493,7 @@ TabPage TP_FOOTNOTE_PAGE MetricField ED_LINEWIDTH { Border = TRUE ; - Pos = MAP_APPFONT ( 208 , 84 ) ; + Pos = MAP_APPFONT ( 208 , 70 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -481,7 +508,7 @@ TabPage TP_FOOTNOTE_PAGE }; FixedText FT_LINEDIST { - Pos = MAP_APPFONT ( 99 , 107 ) ; + Pos = MAP_APPFONT ( 100 , 88 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text = "Abstan~d zum Funoteninhalt" ; Text [ ENGLISH ] = "Distan~ce" ; @@ -511,7 +538,7 @@ TabPage TP_FOOTNOTE_PAGE MetricField ED_LINEDIST { Border = TRUE ; - Pos = MAP_APPFONT ( 208 , 104 ) ; + Pos = MAP_APPFONT ( 208 , 86 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -527,8 +554,8 @@ TabPage TP_FOOTNOTE_PAGE }; GroupBox GB_LINE { - Pos = MAP_APPFONT ( 6 , 72 ) ; - Size = MAP_APPFONT ( 247 , 57 ) ; + Pos = MAP_APPFONT ( 6 , 59 ) ; + Size = MAP_APPFONT ( 247 , 42 ) ; Text = "Trennlinie" ; Text [ ENGLISH ] = "Line" ; Text [ norwegian ] = "Linje" ; @@ -553,38 +580,4 @@ TabPage TP_FOOTNOTE_PAGE Text[ turkish ] = "Ayrma izgisi"; Text[ language_user1 ] = " "; }; - Window WN_BSP - { - Pos = MAP_APPFONT ( 175 , 12 ) ; - Size = MAP_APPFONT ( 72 , 52 ) ; - Text = "Window" ; - }; - GroupBox GB_BSP - { - Pos = MAP_APPFONT ( 169 , 2 ) ; - Size = MAP_APPFONT ( 84 , 67 ) ; - Text = "Vorschau" ; - Text [ ENGLISH ] = "Example" ; - Text [ norwegian ] = "Eksempel" ; - Text [ italian ] = "Anteprima" ; - Text [ portuguese_brazilian ] = "Exemplo" ; - Text [ portuguese ] = "Previsualizar" ; - Text [ finnish ] = "Malli" ; - Text [ danish ] = "Eksempel" ; - Text [ french ] = "Aperu" ; - Text [ swedish ] = "Frhandsvisning" ; - Text [ dutch ] = "Voorbeeld" ; - Text [ spanish ] = "Previsualizacin" ; - Text [ english_us ] = "Preview" ; - 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 ] = " "; - }; }; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 7ad0e010a849..d3867fc38edb 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2000-11-09 15:49:34 $ + * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -905,7 +905,6 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent, SfxTabPage(pParent, SW_RES( TP_TABLE_COLUMN ), rSet ), aModifyTableCB(this, SW_RES(CB_MOD_TBL)), aProportionalCB(this, SW_RES(CB_PROP)), - aInverseCB(this, SW_RES(CB_INV)), aSpaceFT(this, SW_RES(FT_SPACE)), aSpaceED(this, SW_RES(ED_SPACE)), aFT1(this, SW_RES(COL_FT_1)), @@ -948,7 +947,6 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent, pTextArr[4] = &aFT5; pTextArr[5] = &aFT6; - aInverseCB.Hide(); const SfxPoolItem* pItem; Init((SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, FALSE,&pItem ) && ((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)); @@ -1042,7 +1040,6 @@ void SwTableColumnPage::Init(BOOL bWeb) aLk = LINK( this, SwTableColumnPage, ModeHdl ); aModifyTableCB .SetClickHdl( aLk ); aProportionalCB.SetClickHdl( aLk ); - aInverseCB .SetClickHdl( aLk ); }; /*------------------------------------------------------------------------ @@ -1122,18 +1119,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) if(bCheck) aModifyTableCB.Check(); aModifyTableCB.Enable(!bCheck && bModifyTbl); - aInverseCB.Enable(!bCheck); } - else if(pBox == &aInverseCB) - { - if(bCheck) - aModifyTableCB.Check(FALSE); - aModifyTableCB.Enable(!bCheck && bModifyTbl); - aProportionalCB.Enable(!bCheck); - } - else - aInverseCB.Enable(!bCheck); - return 0; }; @@ -1186,9 +1172,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) BOOL bModifyTbl = aModifyTableCB.IsChecked(); BOOL bProp = aProportionalCB.IsChecked(); - BOOL bInverse = aInverseCB .IsChecked(); - if(!bModifyTbl && !bProp &&!bInverse) + if(!bModifyTbl && !bProp ) { // Tabellenbreite bleibt, Differenz wird mit der/den // naechsten Zellen ausgeglichen @@ -1222,7 +1207,7 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) } } } - else if(bModifyTbl && !bProp &&!bInverse) + else if(bModifyTbl && !bProp) { // Differenz wird ueber die Tabellenbreite ausgeglichen, // andere Spalten bleiben unveraendert @@ -1335,10 +1320,8 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& rSet ) bModifyTbl = FALSE; if(bPercentMode) { - aInverseCB .Enable(FALSE); aModifyTableCB .Check(FALSE); aProportionalCB .Check(FALSE); - aInverseCB .Check(FALSE); } else if( !bModifyTbl ) { @@ -1894,6 +1877,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) aPgBrkCB.Check(); aPageCollCB.Enable(FALSE); aPageCollLB.Enable(FALSE); + aPageNoFT.Enable(FALSE); aPageNoNF.Enable(FALSE); } switch ( eBreak ) @@ -2007,7 +1991,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) aPageCollLB.GetEntryCount(); aPageCollLB.Enable(bEnable); if(!bHtmlMode) + { + aPageNoFT.Enable(bEnable); aPageNoNF.Enable(bEnable); + } } } else @@ -2015,6 +2002,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG ) aPageCollCB.Check( FALSE ); aPageCollCB.Enable(FALSE); aPageCollLB.Enable(FALSE); + aPageNoFT.Enable(FALSE); aPageNoNF.Enable(FALSE); aPgBrkRB. Enable(FALSE); aColBrkRB. Enable(FALSE); @@ -2041,7 +2029,10 @@ IMPL_LINK( SwTextFlowPage, ApplyCollClickHdl_Impl, CheckBox*, EMPTYARG ) } aPageCollLB.Enable(bEnable); if(!bHtmlMode) + { + aPageNoFT.Enable(bEnable); aPageNoNF.Enable(bEnable); + } return 0; } @@ -2060,13 +2051,17 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) aPageCollLB.Enable(bEnable); if(!bHtmlMode) + { + aPageNoFT.Enable(bEnable); aPageNoNF.Enable(bEnable); + } } else if ( pBtn == &aPgBrkAfterRB ) { aPageCollCB .Check( FALSE ); aPageCollCB .Enable(FALSE); aPageCollLB .Enable(FALSE); + aPageNoFT .Enable(FALSE); aPageNoNF .Enable(FALSE); } } @@ -2082,6 +2077,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) aPageCollCB .Check(FALSE); aPageCollCB .Enable(FALSE); aPageCollLB .Enable(FALSE); + aPageNoFT .Enable(FALSE); aPageNoNF .Enable(FALSE); } else if ( aPgBrkBeforeRB.IsChecked() ) @@ -2106,226 +2102,5 @@ void SwTextFlowPage::DisablePageBreak() aPageNoNF .Disable(); } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.3 2000/11/09 15:22:28 hr - #65293#: std::min()/max() - - Revision 1.2 2000/11/07 12:48:38 hjs - use min/max from stl - - Revision 1.1.1.1 2000/09/18 17:14:48 hr - initial import - - Revision 1.169 2000/09/18 16:06:09 willem.vandorp - OpenOffice header added. - - Revision 1.168 2000/08/24 15:21:38 os - tables with negative LRSpace - - Revision 1.167 2000/07/27 21:16:28 jp - opt: get template names direct from the doc and don't load it from the resource - - Revision 1.166 2000/06/16 09:51:28 os - #73123# disable manual table alignment in HTML - - Revision 1.165 2000/05/26 07:21:33 os - old SW Basic API Slots removed - - Revision 1.164 2000/05/23 19:31:24 jp - Bugfixes for Unicode - - Revision 1.163 2000/04/19 11:22:11 os - UNICODE - - Revision 1.162 1999/08/23 07:48:32 OS - #61218# correct handling of left_and_width oriented tables - - - Rev 1.161 23 Aug 1999 09:48:32 OS - #61218# correct handling of left_and_width oriented tables - - Rev 1.160 28 May 1999 10:28:32 OS - #54824# HoriOrientation_LEFT_AND_WIDTH fuer von links ausgerichtete Tabellen - - Rev 1.159 08 Feb 1999 14:56:32 OS - #61545# Break-Attribut nur noch bei fehlendem oder leeren PageDesc mitschicken - - Rev 1.158 08 Feb 1999 10:23:22 JP - Task #61467#/#61014#: neu FindPageDescByName - - Rev 1.157 04 Jan 1999 14:15:00 OS - #60366# Umbruch-Buttons in HTML-Docs ebenfalls disablen - - Rev 1.156 27 Nov 1998 14:56:48 AMA - Fix #59951#59825#: Unterscheiden zwischen Rahmen-,Seiten- und Bereichsspalten - - Rev 1.155 27 Nov 1998 14:02:44 MH - add: header - - Rev 1.154 08 Sep 1998 17:04:00 OS - #56134# Metric fuer Text und HTML getrennt - - Rev 1.153 29 May 1998 19:08:00 JP - SS vom SwTableReq geaendert - - Rev 1.152 28 Apr 1998 09:10:12 OS - Background: ShowSelector mit HTML-Beruecksichtigung #49862# - - Rev 1.151 21 Apr 1998 08:44:36 OS - TableNameEdit verschoben - - Rev 1.150 17 Apr 1998 16:30:50 OS - Printing extensions fuer HTML - - Rev 1.149 16 Apr 1998 15:57:28 OS - Printing extensions fuer HTML - - Rev 1.148 02 Mar 1998 09:15:52 OS - Minimalbreite spaltenabhaengig, Fokushilfe fuer Edit#47641##47658# - - Rev 1.147 29 Nov 1997 14:28:10 MA - includes - - Rev 1.146 24 Nov 1997 15:52:22 MA - includes - - Rev 1.145 19 Nov 1997 16:54:54 OS - Hintergrund: zuerst ShowTblCtrl rufen #45654# - - Rev 1.144 03 Nov 1997 13:56:50 MA - precomp entfernt - - Rev 1.143 30 Oct 1997 11:19:20 AMA - Chg: Kein AutoFlag mehr an Break bzw. PageDesc-Attributen - - Rev 1.142 30 Sep 1997 16:51:36 TJ - include - - Rev 1.141 25 Aug 1997 14:26:28 OS - Leerzeichen im Tabellennamen vor dem Verlassen der Page ueberpruefen #42643# - - Rev 1.140 15 Aug 1997 12:18:20 OS - chartar/frmatr/txtatr aufgeteilt - - Rev 1.139 11 Aug 1997 10:12:42 OS - paraitem/frmitems/textitem aufgeteilt - - Rev 1.138 03 Jul 1997 12:53:40 OS - SwSwMode jetzt mit BYTE #41255# - - Rev 1.137 18 Jun 1997 17:27:42 OS - Breite im TableRep nie auf IVALID_TWIP setzen #40808# - - Rev 1.136 11 Jun 1997 10:54:40 OS - Behandlung relativer Tabellen berichtigt; restore nach automatisch funktioniert jetzt #40590# - - Rev 1.135 03 Jun 1997 16:39:58 MA - chg: neue Tabellenfeatures hiden - - Rev 1.134 30 May 1997 08:44:50 OS - kein Umbruch ausserbalb des Bodies #40306# - - Rev 1.133 14 Apr 1997 19:15:58 MA - eigendes Headerfile fuer die Pages - - Rev 1.132 11 Apr 1997 15:55:26 MA - chg: kein Keep und split fuer Web - - Rev 1.131 11 Apr 1997 13:36:26 MA - split richtig - - Rev 1.130 11 Apr 1997 13:07:08 MA - new: Layout-Split - - Rev 1.129 10 Apr 1997 18:26:48 MA - Keep besser (?), Keep fuer Tables - - Rev 1.128 13 Mar 1997 11:37:52 OS - enable/disble fuer manuell/zentriert berichtigt - - Rev 1.127 10 Mar 1997 16:20:48 OS - Right an den TabCols darf niemals groesser als RightMax sein - - Rev 1.126 20 Feb 1997 17:49:36 OS - Abstand oben/unten nicht im HTML - - Rev 1.125 13 Feb 1997 13:49:44 OS - Tabellen im HTML auch manuell - - Rev 1.124 12 Feb 1997 14:28:38 OS - wird der Umbruch abgeschaltet, muss auch der Offeset auf NULL gesetzt werden - - Rev 1.123 10 Feb 1997 16:36:02 OS - autom. Ausrichtung: rechter Rand darf nicht eingestellt werden - - Rev 1.122 05 Feb 1997 10:04:22 OS - keine Leerzeichen und Punkte im Tabellennamen; FillItemSet aus DeactivatePage aufrufen - - Rev 1.121 03 Feb 1997 12:12:44 OS - Im HtmlMode kein Name und keine manuelle Ausrichtung - - Rev 1.120 30 Jan 1997 15:33:00 OS - ...PARA_PAGENUM ueberfluessig - - Rev 1.119 22 Jan 1997 11:38:16 MA - Umstellung Put - - Rev 1.118 08 Jan 1997 11:57:30 OS - Umbruch-CheckBox nicht setzen fuer SVX_BREAK_NONE - - Rev 1.117 20 Dec 1996 12:13:48 OS - vertikale Ausrichtung jetzt mit FN_TABLE_SET_VERT_ALIGN - - Rev 1.116 19 Dec 1996 12:00:42 OS - V-Alignment auswerten - - Rev 1.115 18 Dec 1996 14:58:40 OS - Vorbereitung BoxAlign - - Rev 1.114 16 Dec 1996 16:23:22 OS - versteckte Trenner an der alten Position wieder einsortieren - - Rev 1.113 13 Dec 1996 15:48:38 HJS - header name - - Rev 1.112 13 Dec 1996 08:34:14 OS - vorlaeufig vollstaendig - - Rev 1.111 12 Dec 1996 16:58:12 OS - Textfluss fuer Tabelle - - Rev 1.110 10 Dec 1996 18:23:32 OS - FillTabCols: rechten Rand aus der Summe der Spalten und dem linken Rand ermitteln #34303# - - Rev 1.109 04 Dec 1996 16:04:44 OS - rechter Rand darf auch wieder fuer die manuelle Einstellung benutzt werden - - Rev 1.108 02 Dec 1996 10:35:24 OS - erst SetRefValue, dann ShowPercent - - Rev 1.107 30 Nov 1996 11:24:18 OS - Rel. Breite: Raender werden mitgesetzt - - Rev 1.106 11 Nov 1996 11:20:32 MA - ResMgr - - Rev 1.105 05 Nov 1996 07:01:28 OS - bModified auf TRUE setzen - - Rev 1.104 04 Nov 1996 12:00:10 OS - kein Handler fuer HeadlineRepeat - - Rev 1.103 16 Oct 1996 16:25:22 OS - letzte Probleme mit autom. Breite behoben - - Rev 1.102 14 Oct 1996 14:01:40 OS - keine Breitenaenderung in der Spalten-Page fuer automatische Ausrichtung - - Rev 1.101 14 Oct 1996 13:52:48 OS - bei automatischer Ausrichtung muss TableSpace statt TableWidth benutzt werden - -------------------------------------------------------------------------*/ diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc index c498c3a97401..c2699e5ba9c5 100644 --- a/sw/source/ui/table/tabledlg.hrc +++ b/sw/source/ui/table/tabledlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,7 +112,7 @@ #define COL_BTN_DOWN 121 #define CB_MOD_TBL 122 #define CB_PROP 123 -#define CB_INV 124 + #define FT_SPACE 125 #define ED_SPACE 126 diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 62a21ecd0272..112b5f70f896 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:52:21 $ + * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,12 +254,12 @@ TabPage TP_FORMAT_TABLE { HelpID = HID_FORMAT_TABLE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; FixedText FT_NAME { - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 22 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 16 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "~Name" ; Text [ English ] = "~Name" ; Text [ italian ] = "~Nome" ; @@ -285,14 +285,14 @@ TabPage TP_FORMAT_TABLE Edit ED_NAME { Border = TRUE ; - Pos = MAP_APPFONT ( 58 , 14 ) ; - Size = MAP_APPFONT ( 79 , 12 ) ; + Pos = MAP_APPFONT ( 75 , 14 ) ; + Size = MAP_APPFONT ( 112 , 12 ) ; TabStop = TRUE ; }; FixedText FT_WIDTH { - Pos = MAP_APPFONT ( 12 , 33 ) ; - Size = MAP_APPFONT ( 22 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 60 , 10 ) ; Text = "Br~eite" ; Text [ ENGLISH ] = "W~idth" ; Text [ norwegian ] = "B~redde" ; @@ -320,7 +320,7 @@ TabPage TP_FORMAT_TABLE MetricField ED_WIDTH { Border = TRUE ; - Pos = MAP_APPFONT ( 58 , 32 ) ; + Pos = MAP_APPFONT ( 75 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -337,8 +337,8 @@ TabPage TP_FORMAT_TABLE }; CheckBox CB_REL_WIDTH { - Pos = MAP_APPFONT ( 101 , 34 ) ; - Size = MAP_APPFONT ( 35 , 10 ) ; + Pos = MAP_APPFONT ( 118 , 32 ) ; + Size = MAP_APPFONT ( 69 , 10 ) ; Text = "Relati~v" ; Text [ ENGLISH ] = "Relati~ve" ; TabStop = TRUE ; @@ -365,7 +365,7 @@ TabPage TP_FORMAT_TABLE GroupBox GB_OPTIONS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 184 , 73 ) ; + Size = MAP_APPFONT ( 184 , 42 ) ; Text = "Eigenschaften" ; Text [ ENGLISH ] = "Options" ; Text [ norwegian ] = "Options" ; @@ -392,8 +392,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FULL { - Pos = MAP_APPFONT ( 199 , 15 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 14 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; Text = "~Automatisch" ; Text [ ENGLISH ] = "~Automatic" ; @@ -420,8 +420,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_LEFT { - Pos = MAP_APPFONT ( 199 , 29 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 28 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Links" ; Text [ ENGLISH ] = "~Left" ; Text [ norwegian ] = "~Left" ; @@ -449,8 +449,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FROM_LEFT { - Pos = MAP_APPFONT ( 199 , 43 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 42 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "Von l~inks" ; Text [ ENGLISH ] = "~From left" ; TabStop = TRUE ; @@ -475,8 +475,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_RIGHT { - Pos = MAP_APPFONT ( 199 , 57 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 56 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Rechts" ; Text [ ENGLISH ] = "~Right" ; Text [ norwegian ] = "~Right" ; @@ -504,8 +504,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_CENTER { - Pos = MAP_APPFONT ( 199 , 71 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 70 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "Zen~triert" ; Text [ ENGLISH ] = "~Centered" ; Text [ norwegian ] = "~Centered" ; @@ -533,8 +533,8 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FREE { - Pos = MAP_APPFONT ( 199 , 85 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; + Pos = MAP_APPFONT ( 199 , 84 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Manuell" ; Text [ ENGLISH ] = "~Manual" ; TabStop = TRUE ; @@ -561,7 +561,7 @@ TabPage TP_FORMAT_TABLE GroupBox GB_POS { Pos = MAP_APPFONT ( 193 , 3 ) ; - Size = MAP_APPFONT ( 61 , 129 ) ; + Size = MAP_APPFONT ( 61 , 119 ) ; Text = "Ausrichtung" ; Text [ ENGLISH ] = "Position" ; Text [ norwegian ] = "Posisjon" ; @@ -588,8 +588,8 @@ TabPage TP_FORMAT_TABLE }; GroupBox GB_DIST { - Pos = MAP_APPFONT ( 6 , 82 ) ; - Size = MAP_APPFONT ( 184 , 50 ) ; + Pos = MAP_APPFONT ( 6 , 48 ) ; + Size = MAP_APPFONT ( 184 , 74 ) ; Text = "Abstnde" ; Text [ ENGLISH ] = "Distance" ; Text [ norwegian ] = "Avstand" ; @@ -614,100 +614,10 @@ TabPage TP_FORMAT_TABLE Text[ turkish ] = "Aralk"; Text[ language_user1 ] = " "; }; - FixedText FT_TOP_DIST - { - Pos = MAP_APPFONT ( 102 , 94 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "Nach ~oben" ; - Text [ ENGLISH ] = "To t~op" ; - Text [ norwegian ] = "Til t~oppen" ; - Text [ italian ] = "Verso l'~alto" ; - Text [ portuguese_brazilian ] = "Para o t~opo" ; - Text [ portuguese ] = "Para ~cima" ; - Text [ finnish ] = "~Yls" ; - Text [ danish ] = "Foroven" ; - Text [ french ] = "Vers le ~haut" ; - Text [ swedish ] = "~Uppe" ; - Text [ dutch ] = "Naar bo~ven" ; - Text [ spanish ] = "Hacia ~arriba" ; - Text [ english_us ] = "~Above" ; - Text[ chinese_simplified ] = "(~A)"; - Text[ russian ] = ""; - Text[ polish ] = "Do gry"; - Text[ japanese ] = "(~A)"; - Text[ chinese_traditional ] = "VW(~A)"; - Text[ arabic ] = " "; - Text[ greek ] = "~ "; - Text[ korean ] = "(~A)"; - Text[ turkish ] = "n~ce"; - Text[ language_user1 ] = " "; - }; - MetricField ED_TOP_DIST - { - Pos = MAP_APPFONT ( 145 , 93 ) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 0 ; - Maximum = 9999 ; - DecimalDigits = 2 ; - Unit = FUNIT_CM ; - First = 0 ; - Last = 9999 ; - SpinSize = 5 ; - }; - FixedText FT_BOTTOM_DIST - { - Pos = MAP_APPFONT ( 102 , 112 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "Nach ~unten" ; - Text [ ENGLISH ] = "To ~bottom" ; - Text [ norwegian ] = "Til ~bunn" ; - Text [ italian ] = "In basso" ; - Text [ portuguese_brazilian ] = "Para a ~base" ; - Text [ portuguese ] = "Para ~baixo" ; - Text [ finnish ] = "~Alhaalta" ; - Text [ danish ] = "Forneden" ; - Text [ french ] = "Vers le ~bas" ; - Text [ swedish ] = "N~ere" ; - Text [ dutch ] = "Naar ~beneden" ; - Text [ spanish ] = "Hacia a~bajo" ; - Text [ english_us ] = "~Below" ; - Text[ chinese_simplified ] = "(~B)"; - Text[ russian ] = ""; - Text[ polish ] = "Na d"; - Text[ japanese ] = "(~B)"; - Text[ chinese_traditional ] = "VU(~B)"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = "Ʒ(~B)"; - Text[ turkish ] = "So~nra"; - Text[ language_user1 ] = " "; - }; - MetricField ED_BOTTOM_DIST - { - Border = TRUE ; - Pos = MAP_APPFONT ( 145 , 111 ) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 0 ; - Maximum = 1000 ; - DecimalDigits = 2 ; - Unit = FUNIT_CM ; - First = 0 ; - Last = 9999 ; - SpinSize = 5 ; - }; FixedText FT_LEFT_DIST { - Pos = MAP_APPFONT ( 12 , 94 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 61 ) ; + Size = MAP_APPFONT ( 130 , 8 ) ; Text = "Nach lin~ks" ; Text [ ENGLISH ] = "To lef~t" ; Text [ norwegian ] = "Til venstr~e" ; @@ -734,7 +644,7 @@ TabPage TP_FORMAT_TABLE }; MetricField ED_LEFT_DIST { - Pos = MAP_APPFONT ( 58 , 93 ) ; + Pos = MAP_APPFONT ( 147 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -751,8 +661,8 @@ TabPage TP_FORMAT_TABLE }; FixedText FT_RIGHT_DIST { - Pos = MAP_APPFONT ( 12 , 112 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 77 ) ; + Size = MAP_APPFONT ( 130 , 8 ) ; Text = "Nach recht~s" ; Text [ ENGLISH ] = "To ri~ght" ; Text [ norwegian ] = "Til hy~re" ; @@ -777,9 +687,10 @@ TabPage TP_FORMAT_TABLE Text[ turkish ] = "Sa~a"; Text[ language_user1 ] = " "; }; + MetricField ED_RIGHT_DIST { - Pos = MAP_APPFONT ( 58 , 111 ) ; + Pos = MAP_APPFONT ( 147 , 75 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -794,6 +705,96 @@ TabPage TP_FORMAT_TABLE Last = 9999 ; SpinSize = 5 ; }; + FixedText FT_TOP_DIST + { + Pos = MAP_APPFONT ( 12 , 93 ) ; + Size = MAP_APPFONT ( 130 , 8 ) ; + Text = "Nach ~oben" ; + Text [ ENGLISH ] = "To t~op" ; + Text [ norwegian ] = "Til t~oppen" ; + Text [ italian ] = "Verso l'~alto" ; + Text [ portuguese_brazilian ] = "Para o t~opo" ; + Text [ portuguese ] = "Para ~cima" ; + Text [ finnish ] = "~Yls" ; + Text [ danish ] = "Foroven" ; + Text [ french ] = "Vers le ~haut" ; + Text [ swedish ] = "~Uppe" ; + Text [ dutch ] = "Naar bo~ven" ; + Text [ spanish ] = "Hacia ~arriba" ; + Text [ english_us ] = "~Above" ; + Text[ chinese_simplified ] = "(~A)"; + Text[ russian ] = ""; + Text[ polish ] = "Do gry"; + Text[ japanese ] = "(~A)"; + Text[ chinese_traditional ] = "VW(~A)"; + Text[ arabic ] = " "; + Text[ greek ] = "~ "; + Text[ korean ] = "(~A)"; + Text[ turkish ] = "n~ce"; + Text[ language_user1 ] = " "; + }; + MetricField ED_TOP_DIST + { + Pos = MAP_APPFONT ( 147 , 91 ) ; + Size = MAP_APPFONT ( 40 , 12 ) ; + Border = TRUE ; + TabStop = TRUE ; + Left = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 0 ; + Maximum = 9999 ; + DecimalDigits = 2 ; + Unit = FUNIT_CM ; + First = 0 ; + Last = 9999 ; + SpinSize = 5 ; + }; + FixedText FT_BOTTOM_DIST + { + Pos = MAP_APPFONT ( 12 , 109 ) ; + Size = MAP_APPFONT ( 130 , 8 ) ; + Text = "Nach ~unten" ; + Text [ ENGLISH ] = "To ~bottom" ; + Text [ norwegian ] = "Til ~bunn" ; + Text [ italian ] = "In basso" ; + Text [ portuguese_brazilian ] = "Para a ~base" ; + Text [ portuguese ] = "Para ~baixo" ; + Text [ finnish ] = "~Alhaalta" ; + Text [ danish ] = "Forneden" ; + Text [ french ] = "Vers le ~bas" ; + Text [ swedish ] = "N~ere" ; + Text [ dutch ] = "Naar ~beneden" ; + Text [ spanish ] = "Hacia a~bajo" ; + Text [ english_us ] = "~Below" ; + Text[ chinese_simplified ] = "(~B)"; + Text[ russian ] = ""; + Text[ polish ] = "Na d"; + Text[ japanese ] = "(~B)"; + Text[ chinese_traditional ] = "VU(~B)"; + Text[ arabic ] = " "; + Text[ greek ] = " "; + Text[ korean ] = "Ʒ(~B)"; + Text[ turkish ] = "So~nra"; + Text[ language_user1 ] = " "; + }; + MetricField ED_BOTTOM_DIST + { + Border = TRUE ; + Pos = MAP_APPFONT ( 147 , 107 ) ; + Size = MAP_APPFONT ( 40 , 12 ) ; + TabStop = TRUE ; + Left = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 0 ; + Maximum = 1000 ; + DecimalDigits = 2 ; + Unit = FUNIT_CM ; + First = 0 ; + Last = 9999 ; + SpinSize = 5 ; + }; }; /**************************************************************************/ /* */ @@ -804,20 +805,13 @@ TabPage TP_TABLE_COLUMN { HelpID = HID_TABLE_COLUMN ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE; - FixedText FT_NAME - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "~Name" ; - }; CheckBox CB_MOD_TBL { - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 180 , 12 ) ; - Text = "Tabellenbreite anpassen" ; - Text [ ENGLISH ] = "" ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 180 , 10 ) ; + Text = "~Tabellenbreite anpassen" ; TabStop = TRUE ; Text [ italian ] = "Adatta larghezza tabella" ; Text [ spanish ] = "Ajustar al ancho de la tabla" ; @@ -841,9 +835,9 @@ TabPage TP_TABLE_COLUMN }; CheckBox CB_PROP { - Pos = MAP_APPFONT ( 12 , 25 ) ; - Size = MAP_APPFONT ( 180 , 12 ) ; - Text = "Spalten gleichmig ndern" ; + Pos = MAP_APPFONT ( 6 , 20 ) ; + Size = MAP_APPFONT ( 180 , 10 ) ; + Text = "~Spalten gleichmig ndern" ; Text [ ENGLISH ] = "Adjust columns equally" ; TabStop = TRUE ; Text [ english_us ] = "Adjust columns proportionally" ; @@ -866,37 +860,10 @@ TabPage TP_TABLE_COLUMN Text[ turkish ] = "Stunlar orantl deitir"; Text[ language_user1 ] = " "; }; - CheckBox CB_INV - { - Pos = MAP_APPFONT ( 12 , 38 ) ; - Size = MAP_APPFONT ( 180 , 12 ) ; - Text = "Spalten umgekehrt proportional ndern" ; - Text [ ENGLISH ] = "" ; - TabStop = TRUE ; - Text [ dutch ] = "Kolommen omgekeerd proportioneel wijzigen" ; - Text [ italian ] = "Modifica colonne in modo inversamente proporzionale" ; - Text [ spanish ] = "Modificar columnas proporcionalmente inversas" ; - Text [ french ] = "Modifier les colonnes de manire inversement proportionnelle" ; - Text [ english_us ] = "Reverse columns proportionally" ; - Text [ swedish ] = "ndra kolumnerna omvnt proportionellt" ; - Text [ danish ] = "Modificer kolonner omvendt proportional" ; - Text [ portuguese ] = "Alterar colunas em proporo inversa" ; - Text [ portuguese_brazilian ] = "Spalten umgekehrt proportional ndern" ; - Text[ chinese_simplified ] = "п"; - Text[ russian ] = " "; - Text[ polish ] = "Zmie kolumny odwrotnie proporcjonalnie"; - Text[ japanese ] = "ɕύX"; - Text[ chinese_traditional ] = "Ϭܧe"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " ݺʷ"; - Text[ turkish ] = "Stunlar ters orantl deitir"; - Text[ language_user1 ] = " "; - }; FixedText FT_SPACE { - Pos = MAP_APPFONT ( 12 , 53 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; + Pos = MAP_APPFONT ( 6 , 36 ) ; + Size = MAP_APPFONT ( 85 , 8 ) ; Text = "Noch verfgbarer Platz" ; Text [ English ] = "Available space" ; Text [ english_us ] = "Remaining space" ; @@ -923,7 +890,7 @@ TabPage TP_TABLE_COLUMN { ReadOnly = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 95 , 51 ) ; + Pos = MAP_APPFONT ( 95 , 34 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -938,7 +905,7 @@ TabPage TP_TABLE_COLUMN ImageButton COL_BTN_DOWN { Disable = TRUE ; - Pos = MAP_APPFONT ( 12 , 95 ) ; + Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; SYMBOL = IMAGEBUTTON_ARROW_LEFT ; @@ -946,14 +913,15 @@ TabPage TP_TABLE_COLUMN ImageButton COL_BTN_UP { Disable = TRUE ; - Pos = MAP_APPFONT ( 234 , 95 ) ; + Pos = MAP_APPFONT ( 234 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; SYMBOL = IMAGEBUTTON_ARROW_RIGHT ; }; FixedText COL_FT_1 { - Pos = MAP_APPFONT ( 30 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 30 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~1" ; Left = TRUE ; @@ -964,7 +932,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 13 , 111 ) ; + Pos = MAP_APPFONT ( 13 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -980,7 +948,8 @@ TabPage TP_TABLE_COLUMN }; FixedText COL_FT_2 { - Pos = MAP_APPFONT ( 68 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 68 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~2" ; Left = TRUE ; @@ -990,7 +959,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 52 , 111 ) ; + Pos = MAP_APPFONT ( 52 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1006,7 +975,8 @@ TabPage TP_TABLE_COLUMN }; FixedText COL_FT_3 { - Pos = MAP_APPFONT ( 107 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 107 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~3" ; Left = TRUE ; @@ -1016,7 +986,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 91 , 111 ) ; + Pos = MAP_APPFONT ( 91 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1032,7 +1002,8 @@ TabPage TP_TABLE_COLUMN }; FixedText COL_FT_4 { - Pos = MAP_APPFONT ( 146 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 146 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~4" ; Left = TRUE ; @@ -1042,7 +1013,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 130 , 111 ) ; + Pos = MAP_APPFONT ( 130 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1058,7 +1029,8 @@ TabPage TP_TABLE_COLUMN }; FixedText COL_FT_5 { - Pos = MAP_APPFONT ( 185 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 185 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~5" ; Left = TRUE ; @@ -1068,7 +1040,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 169 , 111 ) ; + Pos = MAP_APPFONT ( 169 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1084,7 +1056,8 @@ TabPage TP_TABLE_COLUMN }; FixedText COL_FT_6 { - Pos = MAP_APPFONT ( 224 , 95 ) ; + Disable = TRUE ; + Pos = MAP_APPFONT ( 204 , 65 ) ; Size = MAP_APPFONT ( 9 , 8 ) ; Text = "~6" ; Left = TRUE ; @@ -1094,7 +1067,7 @@ TabPage TP_TABLE_COLUMN { Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 208 , 111 ) ; + Pos = MAP_APPFONT ( 208 , 81 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1110,7 +1083,7 @@ TabPage TP_TABLE_COLUMN }; GroupBox COL_GB_LAYOUT { - Pos = MAP_APPFONT ( 6 , 80 ) ; + Pos = MAP_APPFONT ( 6 , 50 ) ; Size = MAP_APPFONT ( 240 , 49 ) ; Text = "Spaltenbreite" ; Text [ ENGLISH ] = "Column width" ; @@ -1145,20 +1118,20 @@ TabPage TP_TABLE_COLUMN TabPage TP_TABLE_TEXTFLOW { HelpId = HID_TABLE_TEXTFLOW ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; TEXT_TEXTFLOW Hide = TRUE; GroupBox GB_FLOW { - Pos = MAP_APPFONT ( 3 , 6 ) ; - Size = MAP_APPFONT ( 251 , 64 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 251 , 96 ) ; TEXT_TEXTFLOW }; CheckBox CB_PAGEBREAK { // Disable = TRUE; - Pos = MAP_APPFONT ( 12 , 17 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 90 , 8 ) ; Text = "~Umbruch" ; Text [ ENGLISH ] = "~Break" ; Text [ norwegian ] = "~Skift" ; @@ -1187,9 +1160,8 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_BREAKPAGE { - // Disable = TRUE; - Pos = MAP_APPFONT ( 105 , 16 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; + Pos = MAP_APPFONT ( 105 , 14 ) ; + Size = MAP_APPFONT ( 65 , 10 ) ; Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; Text [ norwegian ] = "~Page" ; @@ -1219,8 +1191,8 @@ TabPage TP_TABLE_TEXTFLOW RadioButton RB_BREAKCOLUMN { // Disable = TRUE; - Pos = MAP_APPFONT ( 141 , 16 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; + Pos = MAP_APPFONT ( 176 , 14 ) ; + Size = MAP_APPFONT ( 65 , 10 ) ; // ### ACHTUNG: Neuer Text in Resource? S~palte : ~Spalte Text = "S~palte" ; Text [ ENGLISH ] = "~Column" ; @@ -1249,8 +1221,8 @@ TabPage TP_TABLE_TEXTFLOW RadioButton RB_PAGEBREAKBEFORE { // Disable = TRUE; - Pos = MAP_APPFONT ( 176 , 16 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; + Pos = MAP_APPFONT ( 105 , 28 ) ; + Size = MAP_APPFONT ( 65 , 10 ) ; Text = "~davor" ; Text [ ENGLISH ] = "be~fore" ; Text [ norwegian ] = "f~r" ; @@ -1280,8 +1252,8 @@ TabPage TP_TABLE_TEXTFLOW RadioButton RB_PAGEBREAKAFTER { // Disable = TRUE; - Pos = MAP_APPFONT ( 211 , 16 ) ; - Size = MAP_APPFONT ( 37 , 10 ) ; + Pos = MAP_APPFONT ( 176 , 28 ) ; + Size = MAP_APPFONT ( 65 , 10 ) ; Text = "da~nach" ; Text [ ENGLISH ] = "aft~er" ; Text [ norwegian ] = "ett~er" ; @@ -1309,7 +1281,7 @@ TabPage TP_TABLE_TEXTFLOW CheckBox CB_PAGECOLL { // Disable = TRUE; - Pos = MAP_APPFONT ( 12 , 30 ) ; + Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text = "mit Seitenvor~lage" ; Text [ ENGLISH ] = "With temp~late" ; @@ -1339,15 +1311,14 @@ TabPage TP_TABLE_TEXTFLOW }; ListBox LB_PAGECOLL { - // Disable = TRUE; - Pos = MAP_APPFONT ( 105 , 28 ) ; + Pos = MAP_APPFONT ( 105 , 42 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; TabStop = TRUE ; DropDown = TRUE ; }; FixedText FT_PAGENUM { - Pos = MAP_APPFONT ( 171 , 30 ) ; + Pos = MAP_APPFONT ( 171 , 44 ) ; Size = MAP_APPFONT ( 47 , 10 ) ; Text = "Se~itennummer" ; Text [ ENGLISH ] = "Page number" ; @@ -1374,7 +1345,7 @@ TabPage TP_TABLE_TEXTFLOW NumericField NF_PAGENUM { Border = TRUE ; - Pos = MAP_APPFONT ( 223 , 28 ) ; + Pos = MAP_APPFONT ( 223 , 42 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -1388,8 +1359,8 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_SPLIT { - Pos = MAP_APPFONT ( 12 , 43 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 58 ) ; + Size = MAP_APPFONT ( 200 , 10 ) ; Text = "Tabelle nicht ~trennen" ; Text [ ENGLISH ] = "dont split" ; TabStop = TRUE ; @@ -1415,8 +1386,8 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_KEEP { - Pos = MAP_APPFONT ( 105 , 43 ) ; - Size = MAP_APPFONT ( 140 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 72 ) ; + Size = MAP_APPFONT ( 200 , 10 ) ; Text = "Mit folgendem Absatz ~zusammenhalten" ; Text [ ENGLISH ] = "~keep with next" ; TabStop = TRUE ; @@ -1442,8 +1413,8 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_HEADLINE { - Pos = MAP_APPFONT ( 12 , 55 ) ; - Size = MAP_APPFONT ( 106 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 86 ) ; + Size = MAP_APPFONT ( 200 , 10 ) ; Text = "berschrift ~wiederholen" ; Text [ ENGLISH ] = "R~epeat Headline" ; Text [ norwegian ] = "G~jenta Overskrift" ; @@ -1471,7 +1442,7 @@ TabPage TP_TABLE_TEXTFLOW }; GroupBox GB_VERT_ORIENT { - Pos = MAP_APPFONT ( 3 , 76 ) ; + Pos = MAP_APPFONT ( 6 , 102 ) ; Size = MAP_APPFONT ( 251 , 52 ) ; Text = "Vertikale Ausrichtung" ; Text [ ENGLISH ] = "Vertical Alignment" ; @@ -1497,9 +1468,9 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_VERT_TOP { - Pos = MAP_APPFONT ( 12 , 86 ) ; + Pos = MAP_APPFONT ( 12 , 113 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Oben" ; + Text = "~Oben" ; Text [ ENGLISH ] = "Top" ; Text [ english_us ] = "Top" ; Text [ swedish ] = "Uppe" ; @@ -1523,9 +1494,9 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_VERT_CENTER { - Pos = MAP_APPFONT ( 12 , 98 ) ; + Pos = MAP_APPFONT ( 12 , 127 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Mitte" ; + Text = "~Mitte" ; Text [ ENGLISH ] = "Middle" ; Text [ english_us ] = "~Centered" ; Text [ swedish ] = "Mitten" ; @@ -1549,9 +1520,9 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_VERT_BOTTOM { - Pos = MAP_APPFONT ( 12 , 110 ) ; + Pos = MAP_APPFONT ( 12 , 141 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - Text = "Unten" ; + Text = "Unt~en" ; Text [ ENGLISH ] = "Bottom" ; Text [ english_us ] = "Bottom" ; Text [ swedish ] = "Nere" ; diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 9274a9c54f21..484e4cf6f04c 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tablepg.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,7 +156,6 @@ class SwTableColumnPage : public SfxTabPage { CheckBox aModifyTableCB; CheckBox aProportionalCB; - CheckBox aInverseCB; FixedText aSpaceFT; MetricField aSpaceED; @@ -226,8 +225,8 @@ class SwTextFlowPage : public SfxTabPage ListBox aPageCollLB; FixedText aPageNoFT; NumericField aPageNoNF; - CheckBox aKeepCB; CheckBox aSplitCB; + CheckBox aKeepCB; CheckBox aHeadLineCB; GroupBox aVertOrientGB; |