[extpascal] r811 committed - More some updates for Ext JS 4.2

[extp...@googlecode.com]

Revision: 811
Author: wanderl...@gmail.com
Date: Tue Apr 2 10:52:37 2013
Log: More some updates for Ext JS 4.2
http://code.google.com/p/extpascal/source/detail?r=811

Modified:
/trunk/ExtJSWrapper/Ext.pas
/trunk/ExtJSWrapper/ExtFixes.txt
/trunk/ExtJSWrapper/ExtToPascal.dpr
/trunk/ExtJSWrapper/ExtToPascal.dsk
/trunk/ExtPascal.pas

=======================================
--- /trunk/ExtJSWrapper/Ext.pas Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/Ext.pas Tue Apr 2 10:52:37 2013
File is too large to display a diff.
=======================================
--- /trunk/ExtJSWrapper/ExtFixes.txt Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/ExtFixes.txt Tue Apr 2 10:52:37 2013
@@ -87,9 +87,6 @@
ExtProgressWaitConfig, fn, ExtFunction, false, true,
ExtProgressWaitConfig, scope, ExtObject, false, true,

-*ExtTabPanel, beforetabchange, Event, tabPanel, ExtTabPanel, newCard,
ExtPanel, oldCard, ExtPanel
-*ExtTabPanel, tabchange, Event, tabPanel, ExtTabPanel, newCard, ExtPanel,
oldCard, ExtPanel
-
*ExtComponent, xtype, (xtBox, xtButton, xtButtonGroup, xtColorPalette,
xtComponent, xtContainer, xtCycle, xtDataView, xtDatePicker, xtEditor,
xtEditorGrid, xtFlash, xtGrid, xtListView, xtPaging, xtPanel, xtProgress,
xtPropertyGrid, xtSlider, xtSpacer, xtSplitButton, xtStatusBar, xtTabPanel,
xtTreePanel, xtViewPort, xtWindow, xtToolbar, xtTBButton, xtTBFill,
xtTBItem, xtTBSeparator, xtTBSpacer, xtTBSplit, xtTBText, xtMenu,
xtColorMenu, xtDateMenu, xtMenuBaseItem, xtMenuCheckItem, xtMenuItem,
xtMenuSeparator, xtMenuTextItem, xtForm, xtCheckBox, xtCheckBoxGroup,
xtCombo, xtDateField, xtDisplayField, xtField, xtFieldSet, xtHidden,
xtHTMLEditor, xtLabel, xtNumberField, xtRadio, xtRadioGroup, xtTextArea,
xtTextField, xtTimeField, xtTrigger, xtChart, xtBarChart, xtCartesianChart,
xtColumnChart, xtLineChart, xtPieChart)
*ExtContainer, defaultType, (ExtComponentXType)
*ExtDomElement, defaultUnit, (CSSUnit)
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dpr Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dpr Tue Apr 2 10:52:37 2013
@@ -498,7 +498,6 @@
CurProp : TProp;
PropTypes : TStringList;
begin
- // To do Extract(['@property ', ' ', '@type ', ' '], Line, Matches)
PropName = Matches[0]; PropType = Matches[2]
PropName := Matches[1];
Static := false;
I := pos('=', PropName);
@@ -554,6 +553,7 @@
ParseField(False)
else
Delete(Line, 1, pos('@property', Line) + 10);
+ // To do Extract(['@property ', ' ', '@type ', ' '], Line, Matches)
PropName = Matches[0]; PropType = Matches[2]
end;

procedure SetArraysAndObjects;
@@ -597,7 +597,7 @@
end
else
Abort;
- if not Between('extend:', '/*', '*/', Line, false) then
+ if not Before('/**', 'extend:', Line) and not
Between('extend:', '/*', '*/', Line, false) then
if Extract(['extend:', AP, AP], Line, Matches) then
CurClass.Parent := FixIdent(Matches[1], true);
if Extract(['mixins: {', '}'], Line, Matches) then
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dsk Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dsk Tue Apr 2 10:52:37 2013
@@ -1,68 +1,52 @@
[Closed Files]
-File_0=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22052,1,22073,0,0,,
-File_1=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Surface.js',0,1,211,16,216,0,0,,
-File_2=TSourceModule,'E:\extpascal\ext-4.2.0\src\tab\Panel.js',0,1,413,47,415,0,0,,
-File_3=TSourceModule,'E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js',0,1,5,46,9,0,0,,
-File_4=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Component.js',0,1,261,60,262,0,0,,
-File_5=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\CompositeSprite.js',0,1,69,70,70,0,0,,
-File_6=TSourceModule,'E:\extpascal\ext-4.2.0\docs\resources\prettify\prettify.css',0,1,1,59,2,0,0,,
-File_7=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-access\lib\prettify\prettify.css',0,1,16,5,35,0,0,,
-File_8=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-access\resources\KitchenSink-example.css',0,1,15618,24,15641,0,0,,
-File_9=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-classic\lib\prettify\prettify.css',0,1,1,54,3,0,0,,
-File_10=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-neptune\lib\prettify\prettify.css',0,1,1,5,35,0,0,,
-File_11=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-classic\resources\KitchenSink-example.css',0,1,15925,50,15948,0,0,,
-File_12=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-gray\resources\KitchenSink-example.css',0,1,15925,50,15948,0,0,,
-File_13=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-neptune\resources\KitchenSink-example.css',0,1,18972,50,18995,0,0,,
-File_14=TSourceModule,'E:\extpascal\ext-4.2.0\examples\kitchensink\app\view\CodePreview.js',0,1,1,28,6,0,0,,
-File_15=TSourceModule,'E:\extpascal\ext-4.2.0\examples\kitchensink\sass\example\bootstrap.js',0,1,91,21,114,0,0,,
+File_0=TSourceModule,'E:\extpascal\ext-4.2.0\src\window\MessageBox.js',0,1,353,1,148,0,0,,
+File_1=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\reader\Reader.js',0,1,280,23,302,0,0,,
+File_2=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Sprite.js',0,1,133,25,160,0,0,,
+File_3=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js',0,1,145,16,180,0,0,,
+File_4=TSourceModule,'E:\extpascal\ext-4.2.0\src\view\View.js',0,1,389,27,390,0,0,,
+File_5=TSourceModule,'E:\extpascal\ext-4.2.0\src\selection\Model.js',0,1,76,16,89,0,0,,
+File_6=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\SortTypes.js',0,1,44,24,65,0,0,,
+File_7=TSourceModule,'E:\extpascal\ext-4.2.0\src\Ext.js',0,1,1,14,6,0,0,,
+File_8=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\Model.js',0,1,692,12,689,0,0,,
+File_9=TSourceModule,'E:\extpascal\ext-4.2.0\src\util\History.js',0,1,22,8,51,0,0,,
+File_10=TSourceModule,'E:\extpascal\ext-4.2.0\src\form\action\Action.js',0,1,269,12,292,0,0,,
+File_11=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22052,1,22073,0,0,,
+File_12=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Surface.js',0,1,211,16,216,0,0,,
+File_13=TSourceModule,'E:\extpascal\ext-4.2.0\src\tab\Panel.js',0,1,413,47,415,0,0,,
+File_14=TSourceModule,'E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js',0,1,5,46,9,0,0,,
+File_15=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Component.js',0,1,261,60,262,0,0,,
+File_16=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\CompositeSprite.js',0,1,69,70,70,0,0,,
+File_17=TSourceModule,'E:\extpascal\ext-4.2.0\docs\resources\prettify\prettify.css',0,1,1,59,2,0,0,,
+File_18=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-access\lib\prettify\prettify.css',0,1,16,5,35,0,0,,
+File_19=TSourceModule,'E:\extpascal\ext-4.2.0\examples\build\KitchenSink\ext-theme-access\resources\KitchenSink-example.css',0,1,15618,24,15641,0,0,,

[Modules]
-Module0=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
-Module1=E:\extpascal\ExtPascalUtils.pas
-Module2=E:\extpascal\ext-4.2.0\src\view\View.js
-Module3=E:\extpascal\ext-4.2.0\src\selection\Model.js
-Module4=E:\extpascal\ExtJSWrapper\Ext.pas
-Module5=E:\extpascal\ext-4.2.0\src\draw\Sprite.js
-Module6=E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js
-Module7=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-Module8=E:\extpascal\ext-4.2.0\src\data\reader\Reader.js
-Module9=E:\extpascal\ExtPascal.pas
-Module10=E:\extpascal\ExtJSWrapper\ExtOld.pas
-Count=11
+Module0=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+Module1=E:\extpascal\ExtJSWrapper\Ext.pas
+Module2=E:\extpascal\ExtPascal.pas
+Module3=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
+Module4=E:\extpascal\ExtPascalUtils.pas
+Module5=E:\extpascal\ExtJSWrapper\ExtOld.pas
+Count=6
EditWindowCount=1

-[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
-ModuleType=TBaseProject
+[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
+ModuleType=TSourceModule

-[E:\extpascal\ExtPascalUtils.pas]
+[E:\extpascal\ExtJSWrapper\Ext.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0

-[E:\extpascal\ext-4.2.0\src\view\View.js]
+[E:\extpascal\ExtPascal.pas]
ModuleType=TSourceModule
-
-[E:\extpascal\ext-4.2.0\src\selection\Model.js]
-ModuleType=TSourceModule
-
-[E:\extpascal\ExtJSWrapper\Ext.pas]
-ModuleType=TSourceModule
FormState=0
FormOnTop=0

-[E:\extpascal\ext-4.2.0\src\draw\Sprite.js]
-ModuleType=TSourceModule
-
-[E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js]
-ModuleType=TSourceModule
-
-[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
-ModuleType=TSourceModule
-
-[E:\extpascal\ext-4.2.0\src\data\reader\Reader.js]
-ModuleType=TSourceModule
+[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
+ModuleType=TBaseProject

-[E:\extpascal\ExtPascal.pas]
+[E:\extpascal\ExtPascalUtils.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
@@ -73,19 +57,14 @@
FormOnTop=0

[EditWindow0]
-ViewCount=11
-CurrentEditView=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+ViewCount=6
+CurrentEditView=E:\extpascal\ExtJSWrapper\ExtFixes.txt
View0=0
View1=1
View2=2
View3=3
View4=4
View5=5
-View6=6
-View7=7
-View8=8
-View9=9
-View10=10
PercentageSizes=1
Create=1
Visible=1
@@ -102,127 +81,73 @@
DockedToMainForm=1
BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0
TopPanelSize=0
-LeftPanelSize=0
+LeftPanelSize=1648
+LeftPanelClients=DockSite2
+LeftPanelData=00000800010100000000C11D00000000000001700600000000000001000000003125000009000000446F636B5369746532FFFFFFFF
RightPanelSize=0
BottomPanelSize=0
BottomPanelClients=DockSite1

BottomPanelData=0000080001000100000009000000446F636B5369746531D430000000000000002406000000000000FFFFFFFF
BottomMiddlePanelSize=1348
BottomMiddlePanelClients=DockSite0,GraphDrawingModel,MessageView
-BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577F32F0000000000000244050000000000000100000000F32F00000F0000004D65737361676556696577466F726DFFFFFFFF
-TabDockLeftClients=DockSite2=0
+BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577AA280000000000000244050000000000000100000000AA2800000F0000004D65737361676556696577466F726DFFFFFFFF

[View0]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtJSWrapper\Ext.pas
-CursorX=21
-CursorY=10999
-TopLine=610
+CursorX=19
+CursorY=6052
+TopLine=5913
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\extpascal\ExtJSWrapper\Ext.pas

[View1]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\selection\Model.js
-CursorX=16
-CursorY=89
-TopLine=61
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\selection\Model.js
-
-[View2]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
-CursorX=10
-CursorY=613
-TopLine=586
+CursorX=1
+CursorY=15
+TopLine=1
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr

-[View3]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\view\View.js
-CursorX=16
-CursorY=397
-TopLine=296
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\view\View.js
-
-[View4]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js
-CursorX=16
-CursorY=180
-TopLine=181
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js
-
-[View5]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\draw\Sprite.js
-CursorX=16
-CursorY=313
-TopLine=551
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\draw\Sprite.js
-
-[View6]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\data\reader\Reader.js
-CursorX=66
-CursorY=306
-TopLine=273
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\data\reader\Reader.js
-
-[View7]
+[View2]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtPascal.pas
-CursorX=1
-CursorY=814
-TopLine=1
+CursorX=27
+CursorY=239
+TopLine=1896
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\extpascal\ExtPascal.pas

-[View8]
+[View3]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-CursorX=2
-CursorY=91
-TopLine=58
+CursorX=1
+CursorY=35
+TopLine=16
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\extpascal\ExtJSWrapper\ExtFixes.txt

-[View9]
+[View4]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtPascalUtils.pas
-CursorX=75
-CursorY=461
-TopLine=440
+CursorX=1
+CursorY=318
+TopLine=297
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\extpascal\ExtPascalUtils.pas

-[View10]
+[View5]
CustomEditViewType=TEditView
Module=E:\extpascal\ExtJSWrapper\ExtOld.pas
CursorX=52
@@ -263,9 +188,7 @@
StayOnTop=0

[Breakpoints]
-Count=2
-Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',762,'',0,1,'',1,0,0,'',1,'','','',0,''
-Breakpoint1='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',617,'',0,1,'',1,0,0,'',1,'','','',0,''
+Count=0

[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
@@ -302,11 +225,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=9053
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=9053
TBDockHeight=5898
LRDockWidth=2352
Dockable=1
@@ -320,11 +243,11 @@
State=0
Left=0
Top=23
-Width=9820
+Width=8328
Height=1123
MaxLeft=-1
MaxTop=-1
-ClientWidth=9820
+ClientWidth=8328
ClientHeight=1123
TBDockHeight=1123
LRDockWidth=2766
@@ -340,11 +263,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=7109
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=7109
TBDockHeight=7158
LRDockWidth=2000
Dockable=1
@@ -356,8 +279,8 @@
Visible=0
Docked=1
State=0
-Left=-1280
-Top=314
+Left=0
+Top=291
Width=273
Height=361
MaxLeft=-1
@@ -461,11 +384,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=7109
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=7109
TBDockHeight=4883
LRDockWidth=7148
Dockable=1
@@ -480,11 +403,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=7109
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=7109
TBDockHeight=9014
LRDockWidth=1891
Dockable=1
@@ -497,8 +420,8 @@
Visible=0
Docked=1
State=0
-Left=-1202
-Top=38
+Left=78
+Top=15
Width=2844
Height=6201
MaxLeft=-1
@@ -603,11 +526,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=7109
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=7109
TBDockHeight=4883
LRDockWidth=5305
Dockable=1
@@ -619,8 +542,8 @@
Visible=0
Docked=1
State=0
-Left=-1280
-Top=-49
+Left=0
+Top=-72
Width=1844
Height=3145
MaxLeft=-1
@@ -705,11 +628,11 @@
Left=0
Top=0
Width=1648
-Height=8770
+Height=7109
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=8770
+ClientHeight=7109
TBDockHeight=3672
LRDockWidth=1891
Dockable=1
@@ -786,21 +709,21 @@

TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow

[DockSite2]
-HostDockSite=LeftDockTabSet
+HostDockSite=DockLeftPanel
DockSiteType=1
PercentageSizes=1
Create=1
-Visible=0
+Visible=1
Docked=1
State=0
-Left=1280
-Top=49
+Left=0
+Top=23
Width=1648
-Height=9014
+Height=9297
MaxLeft=-1
MaxTop=-1
ClientWidth=1648
-ClientHeight=9014
+ClientHeight=9297
TBDockHeight=9014
LRDockWidth=1648
Dockable=1
=======================================
--- /trunk/ExtPascal.pas Thu Mar 21 13:55:17 2013
+++ /trunk/ExtPascal.pas Tue Apr 2 10:52:37 2013
@@ -234,8 +234,9 @@
THTMLElement = class(TExtObject);
TRegExp = type string;
TEvent = class(TExtObject);
- TCSSStyleSheet = class(TExtObject);
+ TCSSStyleSheet = type string;
TTextNode = class(TExtObject);
+ TXMLHttpRequest = string;
//DOM-IGNORE-END*)

const
@@ -1903,6 +1904,6 @@
end;

begin
- ExtUtilTextMetrics := TExtUtilTextMetrics.Create;
+ ExtUtilTextMetrics := TExtUtilTextMetrics.Create('body');
ExtUtilTextMetrics.FJSName := 'TextMetrics';
end.