From 216e7ca9796addac44646ab81ab8e5642e5553ff Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 20 Sep 2010 19:48:24 +0000 Subject: [PATCH] * New version (td tag) from Alexei git-svn-id: trunk@27423 - --- .gitattributes | 2 + components/fpweb/fpwebnewhtmlinputunit.lfm | 124 +++--- components/fpweb/fpwebnewhtmltagtdunit.lfm | 353 ++++++++++++++++++ components/fpweb/fpwebnewhtmltagtdunit.pas | 123 ++++++ components/fpweb/fpwebnewhtmltagtrunit.lfm | 71 ++-- components/fpweb/fpwebnewhtmltagtrunit.pas | 7 + components/fpweb/fpwebstrconsts.pas | 2 + components/fpweb/fpwebtoolsunit.pas | 19 +- components/fpweb/languages/fpwebstrconsts.po | 4 + .../fpweb/languages/fpwebstrconsts.ru.po | 4 + components/fpweb/lazwebextra.lpk | 10 +- 11 files changed, 617 insertions(+), 102 deletions(-) create mode 100644 components/fpweb/fpwebnewhtmltagtdunit.lfm create mode 100644 components/fpweb/fpwebnewhtmltagtdunit.pas diff --git a/.gitattributes b/.gitattributes index e285e15c5a..0f15f764e1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -923,6 +923,8 @@ components/fpweb/fpwebnewhtmltableunit.lfm svneol=native#text/plain components/fpweb/fpwebnewhtmltableunit.pas svneol=native#text/plain components/fpweb/fpwebnewhtmltagpreunit.lfm svneol=native#text/plain components/fpweb/fpwebnewhtmltagpreunit.pas svneol=native#text/plain +components/fpweb/fpwebnewhtmltagtdunit.lfm svneol=native#text/plain +components/fpweb/fpwebnewhtmltagtdunit.pas svneol=native#text/plain components/fpweb/fpwebnewhtmltagtrunit.lfm svneol=native#text/plain components/fpweb/fpwebnewhtmltagtrunit.pas svneol=native#text/plain components/fpweb/fpwebselectoptionsunit.lfm svneol=native#text/plain diff --git a/components/fpweb/fpwebnewhtmlinputunit.lfm b/components/fpweb/fpwebnewhtmlinputunit.lfm index 4217bbe79c..c25dda5b90 100644 --- a/components/fpweb/fpwebnewhtmlinputunit.lfm +++ b/components/fpweb/fpwebnewhtmlinputunit.lfm @@ -12,8 +12,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm LCLVersion = '0.9.29' object ButtonPanel1: TButtonPanel Left = 6 - Height = 34 - Top = 436 + Height = 42 + Top = 428 Width = 616 OKButton.Name = 'OKButton' OKButton.Caption = '&ОК' @@ -29,7 +29,7 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm end object PageControl1: TPageControl Left = 0 - Height = 430 + Height = 422 Top = 0 Width = 628 ActivePage = TabSheet1 @@ -38,15 +38,15 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm TabOrder = 1 object TabSheet1: TTabSheet Caption = 'Main' - ClientHeight = 402 + ClientHeight = 391 ClientWidth = 624 object Label1: TLabel AnchorSideLeft.Control = TabSheet1 AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 + Height = 18 Top = 10 - Width = 26 + Width = 29 BorderSpacing.Around = 6 Caption = 'T&ype' FocusControl = cbType @@ -58,9 +58,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = cgOptions Left = 12 - Height = 23 - Top = 31 - Width = 506 + Height = 29 + Top = 34 + Width = 499 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 @@ -83,9 +83,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = cbType AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 60 - Width = 34 + Height = 18 + Top = 69 + Width = 40 BorderSpacing.Around = 6 Caption = '&Name' FocusControl = edtName @@ -96,8 +96,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = Label2 AnchorSideTop.Side = asrBottom Left = 12 - Height = 22 - Top = 81 + Height = 27 + Top = 93 Width = 233 BorderSpacing.Around = 6 TabOrder = 1 @@ -108,9 +108,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = cbType AnchorSideTop.Side = asrBottom Left = 251 - Height = 15 - Top = 60 - Width = 31 + Height = 18 + Top = 69 + Width = 36 BorderSpacing.Around = 6 Caption = 'Val&ue' FocusControl = edtValue @@ -121,9 +121,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtName AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 109 - Width = 24 + Height = 18 + Top = 126 + Width = 28 BorderSpacing.Around = 6 Caption = 'Si&ze' FocusControl = edtSize @@ -135,9 +135,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtName AnchorSideTop.Side = asrBottom Left = 251 - Height = 15 - Top = 109 - Width = 62 + Height = 18 + Top = 126 + Width = 71 BorderSpacing.Around = 6 Caption = '&Max length' FocusControl = edtMaxLen @@ -149,9 +149,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = cgOptions Left = 257 - Height = 22 - Top = 81 - Width = 261 + Height = 27 + Top = 93 + Width = 254 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 TabOrder = 2 @@ -161,9 +161,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtSize AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 158 - Width = 15 + Height = 18 + Top = 183 + Width = 18 BorderSpacing.Around = 6 Caption = 'A<' FocusControl = edtAlt @@ -176,8 +176,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 12 - Height = 22 - Top = 179 + Height = 27 + Top = 207 Width = 606 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 @@ -190,8 +190,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 257 - Height = 22 - Top = 130 + Height = 27 + Top = 150 Width = 361 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 @@ -202,9 +202,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtAlt AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 207 - Width = 58 + Height = 18 + Top = 240 + Width = 64 BorderSpacing.Around = 6 Caption = '&Image src' FocusControl = edtSrc @@ -215,9 +215,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = Label7 AnchorSideTop.Side = asrBottom Left = 12 - Height = 22 - Top = 228 - Width = 579 + Height = 27 + Top = 264 + Width = 583 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 6 @@ -232,19 +232,21 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtSrc AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 256 - Width = 54 + Height = 18 + Top = 297 + Width = 60 BorderSpacing.Around = 6 Caption = 'Tab index' FocusControl = edtTab ParentColor = False end object edtTab: TEdit + AnchorSideLeft.Control = Label8 + AnchorSideTop.Control = Label8 AnchorSideTop.Side = asrBottom Left = 12 - Height = 22 - Top = 277 + Height = 27 + Top = 321 Width = 119 BorderSpacing.Around = 6 TabOrder = 6 @@ -255,9 +257,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtSrc AnchorSideTop.Side = asrBottom Left = 137 - Height = 15 - Top = 256 - Width = 28 + Height = 18 + Top = 297 + Width = 32 BorderSpacing.Around = 6 Caption = 'A&lign' FocusControl = cbAlign @@ -268,8 +270,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = Label9 AnchorSideTop.Side = asrBottom Left = 143 - Height = 24 - Top = 277 + Height = 31 + Top = 321 Width = 180 BorderSpacing.Around = 6 ItemHeight = 0 @@ -291,9 +293,9 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = edtSrc AnchorSideTop.Side = asrBottom Left = 329 - Height = 15 - Top = 256 - Width = 64 + Height = 18 + Top = 297 + Width = 72 BorderSpacing.Around = 6 Caption = 'Access &key' FocusControl = edtKey @@ -306,8 +308,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 335 - Height = 22 - Top = 277 + Height = 27 + Top = 321 Width = 283 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 @@ -319,8 +321,8 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = Label4 AnchorSideTop.Side = asrBottom Left = 12 - Height = 22 - Top = 130 + Height = 27 + Top = 150 Width = 233 BorderSpacing.Around = 6 TabOrder = 9 @@ -329,10 +331,10 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm AnchorSideTop.Control = TabSheet1 AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom - Left = 524 - Height = 79 + Left = 517 + Height = 82 Top = 6 - Width = 94 + Width = 101 Anchors = [akTop, akRight] AutoFill = True AutoSize = True @@ -358,7 +360,7 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm end object TabSheet2: TTabSheet Caption = 'Core' - ClientHeight = 402 + ClientHeight = 391 ClientWidth = 624 object Label11: TLabel AnchorSideLeft.Control = TabSheet2 @@ -416,7 +418,7 @@ object fpwebNewHTMLInputForm: TfpwebNewHTMLInputForm end object TabSheet3: TTabSheet Caption = 'Events' - ClientHeight = 402 + ClientHeight = 391 ClientWidth = 624 object Label13: TLabel AnchorSideLeft.Control = TabSheet3 diff --git a/components/fpweb/fpwebnewhtmltagtdunit.lfm b/components/fpweb/fpwebnewhtmltagtdunit.lfm new file mode 100644 index 0000000000..88413df402 --- /dev/null +++ b/components/fpweb/fpwebnewhtmltagtdunit.lfm @@ -0,0 +1,353 @@ +object fpwebNewHtmlTagTDForm: TfpwebNewHtmlTagTDForm + Left = 510 + Height = 478 + Top = 133 + Width = 527 + ActiveControl = PageControl1 + Caption = 'fpwebNewHtmlTagTDForm' + ClientHeight = 478 + ClientWidth = 527 + OnCreate = FormCreate + Position = poScreenCenter + LCLVersion = '0.9.29' + object PageControl1: TPageControl + Left = 0 + Height = 422 + Top = 0 + Width = 527 + ActivePage = TabSheet1 + Align = alClient + TabIndex = 0 + TabOrder = 0 + object TabSheet1: TTabSheet + Caption = 'Main' + ClientHeight = 387 + ClientWidth = 521 + object Label1: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = edtHeight + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 177 + Width = 32 + BorderSpacing.Around = 6 + Caption = '&Align' + FocusControl = CBAlign + ParentColor = False + end + object Label2: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = CBAlign + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 238 + Width = 40 + BorderSpacing.Around = 6 + Caption = '&VAlign' + FocusControl = CBValign + ParentColor = False + end + object CBAlign: TComboBox + AnchorSideLeft.Control = Label1 + AnchorSideTop.Control = Label1 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 31 + Top = 201 + Width = 503 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 0 + Items.Strings = ( + '' + 'none' + 'left' + 'center' + 'right' + ) + Style = csDropDownList + TabOrder = 0 + end + object CBValign: TComboBox + AnchorSideLeft.Control = Label2 + AnchorSideTop.Control = Label2 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 31 + Top = 262 + Width = 503 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 0 + Items.Strings = ( + '' + 'none' + 'baseline' + 'bottom' + 'center' + 'top' + ) + Style = csDropDownList + TabOrder = 1 + end + object Label3: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = CBValign + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 299 + Width = 55 + BorderSpacing.Around = 6 + Caption = 'BG color' + FocusControl = CBColor + ParentColor = False + end + object CBColor: TColorBox + AnchorSideLeft.Control = Label3 + AnchorSideTop.Control = Label3 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 31 + Top = 323 + Width = 503 + Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors] + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 0 + TabOrder = 2 + end + object Label6: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = edtText + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 63 + Width = 36 + BorderSpacing.Around = 6 + Caption = 'Width' + ParentColor = False + end + object edtWidth: TSpinEdit + AnchorSideLeft.Control = Label6 + AnchorSideTop.Control = Label6 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Label7 + Left = 12 + Height = 27 + Top = 87 + Width = 213 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + TabOrder = 3 + end + object Label7: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideLeft.Side = asrCenter + AnchorSideTop.Control = edtText + AnchorSideTop.Side = asrBottom + Left = 231 + Height = 18 + Top = 63 + Width = 59 + BorderSpacing.Top = 6 + BorderSpacing.Right = 6 + Caption = 'Coll span' + ParentColor = False + end + object edtCollSpan: TSpinEdit + AnchorSideLeft.Control = Label7 + AnchorSideTop.Control = Label7 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 237 + Height = 27 + Top = 87 + Width = 278 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + TabOrder = 4 + end + object Label8: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = edtWidth + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 120 + Width = 43 + BorderSpacing.Left = 6 + BorderSpacing.Top = 6 + Caption = 'Height' + ParentColor = False + end + object Label9: TLabel + AnchorSideLeft.Control = Label7 + AnchorSideTop.Control = edtWidth + AnchorSideTop.Side = asrBottom + Left = 231 + Height = 18 + Top = 120 + Width = 60 + BorderSpacing.Top = 6 + Caption = 'Row span' + ParentColor = False + end + object edtRowSpan: TSpinEdit + AnchorSideLeft.Control = Label9 + AnchorSideTop.Control = Label9 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 237 + Height = 27 + Top = 144 + Width = 278 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + TabOrder = 5 + end + object edtHeight: TSpinEdit + AnchorSideLeft.Control = Label8 + AnchorSideTop.Control = Label8 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Label7 + Left = 12 + Height = 27 + Top = 144 + Width = 213 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + TabOrder = 6 + end + object CheckBox1: TCheckBox + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = CBColor + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 22 + Top = 360 + Width = 76 + BorderSpacing.Around = 6 + Caption = 'No wrap' + TabOrder = 7 + end + object Label10: TLabel + AnchorSideLeft.Control = TabSheet1 + AnchorSideTop.Control = TabSheet1 + Left = 6 + Height = 18 + Top = 6 + Width = 26 + BorderSpacing.Around = 6 + Caption = 'Text' + ParentColor = False + end + object edtText: TEdit + AnchorSideLeft.Control = Label10 + AnchorSideTop.Control = Label10 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet1 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 27 + Top = 30 + Width = 503 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + TabOrder = 8 + Text = 'edtText' + end + end + object TabSheet2: TTabSheet + Caption = 'Core' + ClientHeight = 387 + ClientWidth = 521 + object Label4: TLabel + AnchorSideLeft.Control = TabSheet2 + AnchorSideTop.Control = TabSheet2 + Left = 6 + Height = 18 + Top = 6 + Width = 14 + BorderSpacing.Around = 6 + Caption = '&ID' + FocusControl = CBId + ParentColor = False + end + object Label5: TLabel + AnchorSideLeft.Control = TabSheet2 + AnchorSideTop.Control = CBId + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 18 + Top = 65 + Width = 35 + BorderSpacing.Around = 6 + Caption = '&Class' + FocusControl = CBClass + ParentColor = False + end + object CBId: TComboBox + AnchorSideLeft.Control = Label4 + AnchorSideTop.Control = Label4 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet2 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 29 + Top = 30 + Width = 345 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 0 + TabOrder = 0 + end + object CBClass: TComboBox + AnchorSideLeft.Control = Label5 + AnchorSideTop.Control = Label5 + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet2 + AnchorSideRight.Side = asrBottom + Left = 12 + Height = 29 + Top = 89 + Width = 345 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 0 + TabOrder = 1 + end + end + object TabSheet3: TTabSheet + Caption = 'Events' + end + end + object ButtonPanel1: TButtonPanel + Left = 6 + Height = 44 + Top = 428 + Width = 515 + OKButton.Name = 'OKButton' + OKButton.Caption = '&ОК' + HelpButton.Name = 'HelpButton' + HelpButton.Caption = '&Help' + CloseButton.Name = 'CloseButton' + CloseButton.Caption = 'C&lose' + CloseButton.Enabled = False + CancelButton.Name = 'CancelButton' + CancelButton.Caption = '&Cancel' + TabOrder = 1 + ShowButtons = [pbOK, pbCancel, pbHelp] + end +end diff --git a/components/fpweb/fpwebnewhtmltagtdunit.pas b/components/fpweb/fpwebnewhtmltagtdunit.pas new file mode 100644 index 0000000000..ea765039ca --- /dev/null +++ b/components/fpweb/fpwebnewhtmltagtdunit.pas @@ -0,0 +1,123 @@ +{ Lazarus IDE wizard for fpweb package. + + Copyright (C) 2010 Lagunov Aleksey alexs75@hotbox.ru + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version with the following modification: + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules,and + to copy and distribute the resulting executable under terms of your choice, + provided that you also meet, for each linked independent module, the terms + and conditions of the license of that module. An independent module is a + module which is not derived from or based on this library. If you modify + this library, you may extend this exception to your version of the library, + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License + for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +} +unit fpwebNewHtmlTagTDUnit; + +{$mode objfpc}{$H+} + +interface + +uses + Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls, + StdCtrls, ColorBox, ButtonPanel, Spin; + +type + + { TfpwebNewHtmlTagTDForm } + + TfpwebNewHtmlTagTDForm = class(TForm) + ButtonPanel1: TButtonPanel; + CBAlign: TComboBox; + CBClass: TComboBox; + CBColor: TColorBox; + CBId: TComboBox; + CBValign: TComboBox; + CheckBox1: TCheckBox; + edtText: TEdit; + Label1: TLabel; + Label10: TLabel; + Label2: TLabel; + Label3: TLabel; + Label4: TLabel; + Label5: TLabel; + Label6: TLabel; + Label7: TLabel; + Label8: TLabel; + Label9: TLabel; + PageControl1: TPageControl; + edtWidth: TSpinEdit; + edtCollSpan: TSpinEdit; + edtHeight: TSpinEdit; + edtRowSpan: TSpinEdit; + TabSheet1: TTabSheet; + TabSheet2: TTabSheet; + TabSheet3: TTabSheet; + procedure FormCreate(Sender: TObject); + private + { private declarations } + public + function HtmlText:string; + end; + +var + fpwebNewHtmlTagTDForm: TfpwebNewHtmlTagTDForm; + +implementation +uses fpWebStrConsts; + +{$R *.lfm} + +{ TfpwebNewHtmlTagTDForm } + +procedure TfpwebNewHtmlTagTDForm.FormCreate(Sender: TObject); +begin + Caption:=SHTMLTagProperty + 'TD'; +end; + +function TfpwebNewHtmlTagTDForm.HtmlText: string; +begin + Result:=' 0 then + Result:=Result + Format(' width="%d"', [edtWidth.Value]); + + if edtCollSpan.Value > 0 then + Result:=Result + Format(' colspan="%d"', [edtCollSpan.Value]); + + if edtHeight.Value > 0 then + Result:=Result + Format(' height="%d"', [edtHeight.Value]); + + if edtRowSpan.Value > 0 then + Result:=Result + Format(' rowspan="%d"', [edtRowSpan.Value]); + + if CBAlign.Text<>'' then + Result:=Result + ' align="'+CBAlign.Text+'"'; + + if CBValign.Text<>'' then + Result:=Result + ' valign="'+CBValign.Text+'"'; + + if CBColor.Selected <> CBColor.NoneColorColor then + Result:=Result + ' bgcolor="#'+IntToHex(CBColor.Selected,6)+'"'; + + if CheckBox1.Checked then + Result:=Result + ' nowrap'; + Result:=Result + '>'+edtText.Text+''; +end; + +end. + diff --git a/components/fpweb/fpwebnewhtmltagtrunit.lfm b/components/fpweb/fpwebnewhtmltagtrunit.lfm index f0f88128b4..c228ddf6ba 100644 --- a/components/fpweb/fpwebnewhtmltagtrunit.lfm +++ b/components/fpweb/fpwebnewhtmltagtrunit.lfm @@ -7,12 +7,13 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm Caption = 'Tag properties: TR' ClientHeight = 312 ClientWidth = 369 + OnCreate = FormCreate Position = poScreenCenter LCLVersion = '0.9.29' object ButtonPanel1: TButtonPanel Left = 6 - Height = 34 - Top = 272 + Height = 44 + Top = 262 Width = 357 OKButton.Name = 'OKButton' OKButton.Caption = '&ОК' @@ -28,7 +29,7 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm end object PageControl1: TPageControl Left = 0 - Height = 266 + Height = 256 Top = 0 Width = 369 ActivePage = TabSheet1 @@ -37,15 +38,15 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm TabOrder = 1 object TabSheet1: TTabSheet Caption = 'Main' - ClientHeight = 238 - ClientWidth = 365 + ClientHeight = 221 + ClientWidth = 363 object Label1: TLabel AnchorSideLeft.Control = TabSheet1 AnchorSideTop.Control = TabSheet1 Left = 6 - Height = 15 + Height = 18 Top = 6 - Width = 28 + Width = 32 BorderSpacing.Around = 6 Caption = '&Align' FocusControl = CBAlign @@ -56,9 +57,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideTop.Control = CBAlign AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 57 - Width = 34 + Height = 18 + Top = 67 + Width = 40 BorderSpacing.Around = 6 Caption = '&VAlign' FocusControl = CBValign @@ -71,9 +72,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 12 - Height = 24 - Top = 27 - Width = 347 + Height = 31 + Top = 30 + Width = 345 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 @@ -95,9 +96,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 12 - Height = 24 - Top = 78 - Width = 347 + Height = 31 + Top = 91 + Width = 345 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 @@ -118,9 +119,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideTop.Control = CBValign AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 108 - Width = 50 + Height = 18 + Top = 128 + Width = 55 BorderSpacing.Around = 6 Caption = 'BG color' FocusControl = CBColor @@ -133,9 +134,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideRight.Control = TabSheet1 AnchorSideRight.Side = asrBottom Left = 12 - Height = 24 - Top = 129 - Width = 347 + Height = 31 + Top = 152 + Width = 345 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 @@ -144,15 +145,15 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm end object TabSheet2: TTabSheet Caption = 'Core' - ClientHeight = 238 - ClientWidth = 365 + ClientHeight = 221 + ClientWidth = 363 object Label4: TLabel AnchorSideLeft.Control = TabSheet2 AnchorSideTop.Control = TabSheet2 Left = 6 - Height = 15 + Height = 18 Top = 6 - Width = 12 + Width = 14 BorderSpacing.Around = 6 Caption = '&ID' FocusControl = CBId @@ -163,9 +164,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideTop.Control = CBId AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 56 - Width = 33 + Height = 18 + Top = 65 + Width = 35 BorderSpacing.Around = 6 Caption = '&Class' FocusControl = CBClass @@ -178,9 +179,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideRight.Control = TabSheet2 AnchorSideRight.Side = asrBottom Left = 12 - Height = 23 - Top = 27 - Width = 347 + Height = 29 + Top = 30 + Width = 345 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 @@ -193,9 +194,9 @@ object fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm AnchorSideRight.Control = TabSheet2 AnchorSideRight.Side = asrBottom Left = 12 - Height = 23 - Top = 77 - Width = 347 + Height = 29 + Top = 89 + Width = 345 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 ItemHeight = 0 diff --git a/components/fpweb/fpwebnewhtmltagtrunit.pas b/components/fpweb/fpwebnewhtmltagtrunit.pas index bd462a1f2c..b60c5fa999 100644 --- a/components/fpweb/fpwebnewhtmltagtrunit.pas +++ b/components/fpweb/fpwebnewhtmltagtrunit.pas @@ -57,6 +57,7 @@ type TabSheet1: TTabSheet; TabSheet2: TTabSheet; TabSheet3: TTabSheet; + procedure FormCreate(Sender: TObject); private { private declarations } public @@ -67,11 +68,17 @@ var fpwebNewHtmlTagTRForm: TfpwebNewHtmlTagTRForm; implementation +uses fpWebStrConsts; {$R *.lfm} { TfpwebNewHtmlTagTRForm } +procedure TfpwebNewHtmlTagTRForm.FormCreate(Sender: TObject); +begin + Caption:=SHTMLTagProperty + 'TR'; +end; + function TfpwebNewHtmlTagTRForm.HtmlText: string; begin Result:=''; diff --git a/components/fpweb/fpwebstrconsts.pas b/components/fpweb/fpwebstrconsts.pas index 0c507bc210..c866aad3b7 100644 --- a/components/fpweb/fpwebstrconsts.pas +++ b/components/fpweb/fpwebstrconsts.pas @@ -92,6 +92,8 @@ resourcestring SCSSFileDesc = 'Create new CSS file...'; SCSSSource = 'Enter your classes/style definitions here'; + SHTMLTagProperty = 'Tag property : '; + SHTMLTableFormCaption = 'New HTML table...'; SHTMLTableFormColumnCount = 'Column count'; SHTMLTableFormRowCount = 'Row count'; diff --git a/components/fpweb/fpwebtoolsunit.pas b/components/fpweb/fpwebtoolsunit.pas index f766f22de2..8cb39c7322 100644 --- a/components/fpweb/fpwebtoolsunit.pas +++ b/components/fpweb/fpwebtoolsunit.pas @@ -115,7 +115,7 @@ uses LResources, NewItemIntf, Forms, Controls, IDECommands, fpwebNewHTMLListUnit, fpwebNewHtmlTagTRUnit, fpwebNewHTMLFormUnit, fpwebNewHTMLInputUnit, fpwebNewHTMLImgUnit, fpWebNewHtmlTagPreUnit, fpWebHREFEditUnit, fpWebSelectOptionsUnit, fpWebSelectTagUnit, - fpWebHtmlTagLegendUnit, fpWebFieldSetTagUnit, + fpWebHtmlTagLegendUnit, fpWebFieldSetTagUnit, fpwebNewHtmlTagTDUnit, //Other fpIDEExtEditorInsertFileNameUnit; @@ -578,7 +578,15 @@ end; procedure ProcHTMLTableDataWD(Sender: TObject); begin - + If Not CheckEditor then Exit; + With TfpwebNewHtmlTagTDForm.Create(Application) do + try + edtText.Text:=SourceEditorManagerIntf.ActiveEditor.Selection; + if ShowModal = mrOk then + InsertHTMLSnippet(HtmlText); + finally + Free; + end; end; procedure ProcHTMLForm(Sender: TObject); @@ -586,7 +594,8 @@ begin If Not CheckEditor then Exit; With TfpWebNewHTMLFormForm.Create(Application) do try - InsertHTMLSnippet(HtmlText(SourceEditorManagerIntf.ActiveEditor.Selection)); + if ShowModal = mrOk then + InsertHTMLSnippet(HtmlText(SourceEditorManagerIntf.ActiveEditor.Selection)); finally Free; end; @@ -671,12 +680,12 @@ end; procedure ProcHTMLInputSubmitTag(Sender: TObject); begin - ShowEditInputTagForm('checkbox', SHTMLTagCaptionSubmit); + ShowEditInputTagForm('submit', SHTMLTagCaptionSubmit); end; procedure ProcHTMLInputResetTag(Sender: TObject); begin - ShowEditInputTagForm('checkbox', SHTMLTagCaptionReset); + ShowEditInputTagForm('reset', SHTMLTagCaptionReset); end; procedure ProcHTMLFormFieldSet(Sender: TObject); diff --git a/components/fpweb/languages/fpwebstrconsts.po b/components/fpweb/languages/fpwebstrconsts.po index 21f9d13bb2..68640041a5 100644 --- a/components/fpweb/languages/fpwebstrconsts.po +++ b/components/fpweb/languages/fpwebstrconsts.po @@ -152,6 +152,10 @@ msgctxt "fpwebstrconsts.shtmltagcaptionsubmit" msgid "Submit" msgstr "" +#: fpwebstrconsts.shtmltagproperty +msgid "Tag property : " +msgstr "" + #: fpwebstrconsts.shtmltitle msgid "Html &title - " msgstr "" diff --git a/components/fpweb/languages/fpwebstrconsts.ru.po b/components/fpweb/languages/fpwebstrconsts.ru.po index e10b8c97cf..0fa053a2eb 100644 --- a/components/fpweb/languages/fpwebstrconsts.ru.po +++ b/components/fpweb/languages/fpwebstrconsts.ru.po @@ -152,6 +152,10 @@ msgctxt "fpwebstrconsts.shtmltagcaptionsubmit" msgid "Submit" msgstr "Передать" +#: fpwebstrconsts.shtmltagproperty +msgid "Tag property : " +msgstr "" + #: fpwebstrconsts.shtmltitle msgid "Html &title - <title>" msgstr "" diff --git a/components/fpweb/lazwebextra.lpk b/components/fpweb/lazwebextra.lpk index 6b78e83f97..e13bc9abf9 100644 --- a/components/fpweb/lazwebextra.lpk +++ b/components/fpweb/lazwebextra.lpk @@ -28,7 +28,7 @@ HTML editing functionality by Alexei Lagunov"/> <License Value="LGPL"/> <Version Minor="9"/> - <Files Count="41"> + <Files Count="43"> <Item1> <Filename Value="reglazwebextra.pp"/> <HasRegisterProc Value="True"/> @@ -203,6 +203,14 @@ HTML editing functionality by Alexei Lagunov"/> <Filename Value="fpwebnewhtmltagpreunit.pas"/> <UnitName Value="fpwebnewhtmltagpreunit"/> </Item41> + <Item42> + <Filename Value="fpwebnewhtmltagtdunit.pas"/> + <UnitName Value="fpwebnewhtmltagtdunit"/> + </Item42> + <Item43> + <Filename Value="fpwebnewhtmltagtdunit.lfm"/> + <Type Value="LFM"/> + </Item43> </Files> <i18n> <EnableI18N Value="True"/>