[extpascal] r819 committed - Updating examples for Ext JS 4.2
153 views
Skip to first unread message
extp...@googlecode.com
Apr 4, 2013, 9:54:00 PM4/4/13
to extp...@googlegroups.com
Revision: 819
Author: wanderl...@gmail.com
Date: Thu Apr 4 18:53:14 2013
Log: Updating examples for Ext JS 4.2
http://code.google.com/p/extpascal/source/detail?r=819
Modified:
/trunk/ExtJSWrapper/Ext.pas
/trunk/ExtJSWrapper/ExtToPascal.dpr
/trunk/ExtJSWrapper/ExtToPascal.dproj
/trunk/ExtJSWrapper/ExtToPascal.dsk
/trunk/ExtPascal.pas
/trunk/ExtPascalSamples/ArrayGrid.pas
/trunk/ExtPascalUtils.pas
=======================================
--- /trunk/ExtJSWrapper/Ext.pas Thu Apr 4 11:42:55 2013
+++ /trunk/ExtJSWrapper/Ext.pas Thu Apr 4 18:53:14 2013
File is too large to display a diff.
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dpr Thu Apr 4 11:42:55 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dpr Thu Apr 4 18:53:14 2013
@@ -624,10 +624,16 @@
Singleton : boolean;
begin
Singleton := Before('@singleton', 'Ext.define(', Line);
- Extract(['/**', '*/'], Line, Matches);
- if Extract(['Ext.define(' + AP, AP], Line, Matches) or
+ if Before('@class', 'Ext.define(', Line) and Extract(['@class ', ' '],
Line, Matches) then
+ JSName := Matches[0]
+ else begin
+ JSName := '';
+ Extract(['/**', '*/'], Line, Matches);
+ end;
+ if (JSName <> '') or
+ Extract(['Ext.define(' + AP, AP], Line, Matches) or
Extract(['Ext.define(' + '"', '"'], Line, Matches) then begin
- JSName := Matches[0];
+ if JSName = '' then JSName := Matches[0];
if pos(JS_LIB, JSName) <> 1 then Abort;
Ci := AllClasses.IndexOf(JSName);
if Ci = -1 then
@@ -635,12 +641,16 @@
else
CurClass := TClass(AllClasses.Objects[Ci]);
if not Singleton then Singleton := Before('singleton:', '}', Line);
- if Singleton then CurClass.Name := CurClass.Name + 'Singleton';
+ if Singleton then begin
+ if CurClass.Name = 'T' + JS_LIB then
+ CurClass.Name := CurClass.Name + '_';
+ CurClass.Name := CurClass.Name + 'Singleton';
+ end;
CurClass.Singleton := Singleton;
end
else
Abort;
- if not Before('/**', 'extend:', Line) and not
Between('extend:', '/*', '*/', Line, false) then
+ if not Between('extend:', '/*', '*/', Line) then
if Extract(['extend:', AP, AP], Line, Matches) then
CurClass.Parent := FixIdent(Matches[1], true);
if Extract(['mixins: {', '}'], Line, Matches) then
@@ -657,11 +667,11 @@
try
ParseClass;
while true do
- if not(Between('@hide', '/**', '*/', Line) or
- Between('@private', '/**', '*/', Line) or
- Between('@deprecated','/**', '*/', Line) or
- Between('@protected', '/**', '*/', Line) or
- Between('@template', '/**', '*/', Line)) then
+ if not(BetweenFirst('@hide', '/**', '*/', Line) or
+ BetweenFirst('@private', '/**', '*/', Line) or
+ BetweenFirst('@deprecated','/**', '*/', Line) or
+ BetweenFirst('@protected', '/**', '*/', Line) or
+ BetweenFirst('@template', '/**', '*/', Line)) then
case First(['@cfg', '@property', '@event', ': function'], Line) of
0 : ParseCfg;
1 : ParseProperty;
@@ -669,7 +679,9 @@
3 : ParseMethod;
else
break;
- end;
+ end
+ else
+ if not Extract(['/**', '*/'], Line, Matches) then break;
SetArraysAndObjects;
finally
Matches.Free;
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dproj Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dproj Thu Apr 4 18:53:14 2013
@@ -144,9 +144,3 @@
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"
Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
<Import
Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"
Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
</Project>
-
-<!-- EurekaLog First Line
-[Exception Log]
-EurekaLog Version=7001
-DeleteMapAfterCompile=1
-EurekaLog Last Line -->
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Apr 4 12:11:50 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Apr 4 18:53:14 2013
@@ -1,58 +1,53 @@
[Closed Files]
-File_0=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6638,1,6659,0,0,,
-File_1=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,27737,1,27777,0,0,,
-File_2=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtFixes3.txt',0,1,37,1,37,0,0,,
-File_3=TSourceModule,'E:\extpascal\ext-4.2.0\src\window\MessageBox.js',0,1,353,1,148,0,0,,
-File_4=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\reader\Reader.js',0,1,280,23,302,0,0,,
-File_5=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Sprite.js',0,1,133,25,160,0,0,,
-File_6=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js',0,1,145,16,180,0,0,,
-File_7=TSourceModule,'E:\extpascal\ext-4.2.0\src\view\View.js',0,1,389,27,390,0,0,,
-File_8=TSourceModule,'E:\extpascal\ext-4.2.0\src\selection\Model.js',0,1,76,16,89,0,0,,
-File_9=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\SortTypes.js',0,1,44,24,65,0,0,,
-File_10=TSourceModule,'E:\extpascal\ext-4.2.0\src\Ext.js',0,1,1,14,6,0,0,,
-File_11=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\Model.js',0,1,692,12,689,0,0,,
-File_12=TSourceModule,'E:\extpascal\ext-4.2.0\src\util\History.js',0,1,22,8,51,0,0,,
-File_13=TSourceModule,'E:\extpascal\ext-4.2.0\src\form\action\Action.js',0,1,269,12,292,0,0,,
-File_14=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Surface.js',0,1,211,16,216,0,0,,
-File_15=TSourceModule,'E:\extpascal\ext-4.2.0\src\tab\Panel.js',0,1,413,47,415,0,0,,
-File_16=TSourceModule,'E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js',0,1,5,46,9,0,0,,
-File_17=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Component.js',0,1,261,60,262,0,0,,
-File_18=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\CompositeSprite.js',0,1,69,70,70,0,0,,
-File_19=TSourceModule,'E:\extpascal\ext-4.2.0\docs\resources\prettify\prettify.css',0,1,1,59,2,0,0,,
+File_0=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\window\MessageBox.js',0,1,28,53,62,0,0,,
+File_1=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\TextMetrics.js',0,1,1,43,24,0,0,,
+File_2=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\TaskRunner.js',0,1,7,1,7,0,0,,
+File_3=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\Observable.js',0,1,8,8,8,0,0,,
+File_4=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\view\AbstractView.js',0,1,1,4,22,0,0,,
+File_5=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\version\Version.js',0,1,28,4,62,0,0,,
+File_6=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6638,1,6659,0,0,,
+File_7=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,27737,1,27777,0,0,,
+File_8=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtFixes3.txt',0,1,37,1,37,0,0,,
+File_9=TSourceModule,'E:\extpascal\ext-4.2.0\src\window\MessageBox.js',0,1,353,1,148,0,0,,
+File_10=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\reader\Reader.js',0,1,280,23,302,0,0,,
+File_11=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Sprite.js',0,1,133,25,160,0,0,,
+File_12=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js',0,1,145,16,180,0,0,,
+File_13=TSourceModule,'E:\extpascal\ext-4.2.0\src\view\View.js',0,1,389,27,390,0,0,,
+File_14=TSourceModule,'E:\extpascal\ext-4.2.0\src\selection\Model.js',0,1,76,16,89,0,0,,
[Modules]
-Module0=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-Module1=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
-Module2=E:\extpascal\ExtJSWrapper\Ext.pas
-Module3=E:\extpascal\ExtPascalUtils.pas
-Module4=E:\extpascal\ExtPascal.pas
+Module0=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj
+Module1=A:\ExtPascal\ExtJSWrapper\Ext.pas
+Module2=A:\ExtPascal\ExtPascalUtils.pas
+Module3=A:\ExtPascal\ExtPascal.pas
+Module4=A:\ExtPascal\ext-4.2.0\src\view\Table.js
Count=5
EditWindowCount=1
-[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
-ModuleType=TSourceModule
-
-[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
+[A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj]
ModuleType=TBaseProject
-[E:\extpascal\ExtJSWrapper\Ext.pas]
+[A:\ExtPascal\ExtJSWrapper\Ext.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtPascalUtils.pas]
+[A:\ExtPascal\ExtPascalUtils.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtPascal.pas]
+[A:\ExtPascal\ExtPascal.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
+[A:\ExtPascal\ext-4.2.0\src\view\Table.js]
+ModuleType=TSourceModule
+
[EditWindow0]
ViewCount=5
-CurrentEditView=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+CurrentEditView=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
View0=0
View1=1
View2=2
@@ -66,82 +61,82 @@
Left=0
Top=0
Width=10000
-Height=9521
+Height=9456
MaxLeft=-1
MaxTop=-1
ClientWidth=10000
-ClientHeight=9521
+ClientHeight=9456
DockedToMainForm=1
BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0
TopPanelSize=0
LeftPanelSize=0
RightPanelSize=0
-BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B5369746531D430000000000000002406000000000000FFFFFFFF
-BottomMiddlePanelSize=1348
-BottomMiddlePanelClients=DockSite0,GraphDrawingModel,MessageView
-BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577F32F0000000000000244050000000000000100000000F32F00000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomPanelSize=1600
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001020100000009000000446F636B536974653172450000000000000240060000000000000100000000724500000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomMiddlePanelSize=0
+BottomMiddlePanelClients=DockSite0,GraphDrawingModel
+BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779A1D00000000000002F206000000000000FFFFFFFF
TabDockLeftClients=DockSite2=0
[View0]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+Module=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
CursorX=1
-CursorY=1533
+CursorY=15
TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
[View1]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-CursorX=1
-CursorY=45
-TopLine=25
+Module=A:\ExtPascal\ext-4.2.0\src\view\Table.js
+CursorX=16
+CursorY=54
+TopLine=22
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+EditViewName=A:\ExtPascal\ext-4.2.0\src\view\Table.js
[View2]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\Ext.pas
-CursorX=136
-CursorY=3
-TopLine=1
+Module=A:\ExtPascal\ExtPascalUtils.pas
+CursorX=10
+CursorY=484
+TopLine=478
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\Ext.pas
+EditViewName=A:\ExtPascal\ExtPascalUtils.pas
[View3]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascalUtils.pas
-CursorX=1
-CursorY=318
-TopLine=297
+Module=A:\ExtPascal\ExtJSWrapper\Ext.pas
+CursorX=5
+CursorY=61080
+TopLine=61062
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascalUtils.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\Ext.pas
[View4]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascal.pas
+Module=A:\ExtPascal\ExtPascal.pas
CursorX=1
-CursorY=815
-TopLine=794
+CursorY=1
+TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascal.pas
+EditViewName=A:\ExtPascal\ExtPascal.pas
[Watches]
Count=4
-Watch0='Matches[3]',256,0,18,1,0,'Watches',1
+Watch0='Matches[1]',256,0,18,1,0,'Watches',1
Watch1='Ident',256,0,18,1,0,'Watches',1
Watch2='M.Methods[I]',256,0,18,1,0,'Watches',1
Watch3='TMethod(M.Methods.Objects[I]).Overload',256,0,18,1,0,'Watches',1
@@ -156,20 +151,21 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
-LRDockWidth=13602
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=211
+LRDockWidth=13600
Dockable=1
StayOnTop=0
[Breakpoints]
-Count=1
-Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',827,'',0,1,'',1,0,0,'',1,'','','',0,''
+Count=2
+Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',839,'',0,1,'',1,0,0,'',1,'','','',0,''
+Breakpoint1='A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr',637,'JSNAme=''Ext.panel.AbstractPanel''',0,1,'',1,0,0,'',1,'','','',0,''
[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
@@ -183,17 +179,17 @@
Visible=1
Docked=0
State=2
-Left=141
-Top=273
-Width=8930
-Height=8525
-MaxLeft=-8
-MaxTop=-10
-MaxWidth=8930
-MaxHeight=8525
+Left=144
+Top=278
+Width=8931
+Height=8522
+MaxLeft=-6
+MaxTop=-11
+MaxWidth=8931
+MaxHeight=8522
ClientWidth=10000
-ClientHeight=9785
-BottomPanelSize=9521
+ClientHeight=9756
+BottomPanelSize=9456
BottomPanelClients=EditWindow0
BottomPanelData=0000080000000000000000000000000000000000000000000000000100000000000000000C0000004564697457696E646F775F30FFFFFFFF
@@ -205,14 +201,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2000
+Height=1422
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=5898
-LRDockWidth=2352
+ClientWidth=2000
+ClientHeight=1422
+TBDockHeight=5900
+LRDockWidth=2350
Dockable=1
StayOnTop=0
@@ -224,14 +220,14 @@
State=0
Left=0
Top=23
-Width=9820
-Height=1123
+Width=10000
+Height=1344
MaxLeft=-1
MaxTop=-1
-ClientWidth=9820
-ClientHeight=1123
-TBDockHeight=1123
-LRDockWidth=2766
+ClientWidth=10000
+ClientHeight=1344
+TBDockHeight=1344
+LRDockWidth=2769
Dockable=1
StayOnTop=0
@@ -243,13 +239,13 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=7158
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=7156
LRDockWidth=2000
Dockable=1
StayOnTop=0
@@ -260,16 +256,16 @@
Visible=0
Docked=1
State=0
-Left=-1280
-Top=314
-Width=273
-Height=361
+Left=-1600
+Top=270
+Width=275
+Height=356
MaxLeft=-1
MaxTop=-1
-ClientWidth=273
-ClientHeight=361
-TBDockHeight=361
-LRDockWidth=273
+ClientWidth=275
+ClientHeight=356
+TBDockHeight=356
+LRDockWidth=275
Dockable=1
StayOnTop=0
Name=120
@@ -284,14 +280,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=410
-LRDockWidth=4953
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=411
+LRDockWidth=4950
Dockable=1
StayOnTop=0
@@ -303,13 +299,13 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=211
LRDockWidth=7406
Dockable=1
StayOnTop=0
@@ -326,14 +322,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
+ClientWidth=3825
+ClientHeight=1067
TBDockHeight=1533
-LRDockWidth=3484
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -345,14 +341,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=2061
-LRDockWidth=3484
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=2056
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -364,14 +360,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=4883
-LRDockWidth=7148
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=2231
Dockable=1
StayOnTop=0
@@ -383,17 +379,17 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=9014
-LRDockWidth=1891
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=8878
+LRDockWidth=1894
Dockable=1
StayOnTop=0
-SplitPos=111
+SplitPos=131
[TFileExplorerForm]
PercentageSizes=1
@@ -401,15 +397,15 @@
Visible=0
Docked=1
State=0
-Left=-1202
-Top=38
+Left=-1502
+Top=27
Width=2844
-Height=6201
+Height=6200
MaxLeft=-1
MaxTop=-1
ClientWidth=2844
-ClientHeight=6201
-TBDockHeight=6201
+ClientHeight=6200
+TBDockHeight=6200
LRDockWidth=2844
Dockable=1
StayOnTop=0
@@ -422,14 +418,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=996
+Width=2338
+Height=967
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=996
-TBDockHeight=2314
-LRDockWidth=2828
+ClientWidth=2338
+ClientHeight=967
+TBDockHeight=2311
+LRDockWidth=2825
Dockable=1
StayOnTop=0
@@ -441,14 +437,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=3203
-LRDockWidth=2828
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=3200
+LRDockWidth=2825
Dockable=1
StayOnTop=0
@@ -460,14 +456,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=1152
-LRDockWidth=3672
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=1156
+LRDockWidth=3675
Dockable=1
StayOnTop=0
Column0Width=314
@@ -485,16 +481,16 @@
Visible=0
Docked=1
State=0
-Left=245
-Top=825
-Width=2859
-Height=3213
+Left=306
+Top=724
+Width=2856
+Height=3211
MaxLeft=-1
MaxTop=-1
-ClientWidth=2859
-ClientHeight=3213
-TBDockHeight=3213
-LRDockWidth=2859
+ClientWidth=2856
+ClientHeight=3211
+TBDockHeight=3211
+LRDockWidth=2856
Dockable=1
StayOnTop=0
@@ -506,14 +502,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=4883
-LRDockWidth=5305
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=5306
Dockable=1
StayOnTop=0
@@ -523,15 +519,15 @@
Visible=0
Docked=1
State=0
-Left=-1280
+Left=-1600
Top=-49
Width=1844
-Height=3145
+Height=3144
MaxLeft=-1
MaxTop=-1
ClientWidth=1844
-ClientHeight=3145
-TBDockHeight=3145
+ClientHeight=3144
+TBDockHeight=3144
LRDockWidth=1844
Dockable=1
StayOnTop=0
@@ -544,13 +540,13 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=4824
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=4833
LRDockWidth=3562
Dockable=1
StayOnTop=0
@@ -563,13 +559,13 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=4824
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=4833
LRDockWidth=3562
Dockable=1
StayOnTop=0
@@ -582,14 +578,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=1543
-LRDockWidth=8742
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=1544
+LRDockWidth=8744
Dockable=1
StayOnTop=0
Column0Width=200
@@ -608,14 +604,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=3672
-LRDockWidth=1891
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=3678
+LRDockWidth=1894
Dockable=1
StayOnTop=0
@@ -627,14 +623,14 @@
State=0
Left=0
Top=0
-Width=1828
-Height=6182
-MaxLeft=-8
-MaxTop=-10
-ClientWidth=1703
-ClientHeight=5850
-TBDockHeight=6182
-LRDockWidth=1828
+Width=1825
+Height=6178
+MaxLeft=-6
+MaxTop=-11
+ClientWidth=1725
+ClientHeight=5800
+TBDockHeight=6178
+LRDockWidth=1825
Dockable=1
StayOnTop=0
@@ -651,14 +647,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1475
+Width=2338
+Height=1478
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1475
-TBDockHeight=1475
-LRDockWidth=2336
+ClientWidth=2338
+ClientHeight=1478
+TBDockHeight=1478
+LRDockWidth=2338
Dockable=1
StayOnTop=0
TabPosition=1
@@ -675,14 +671,14 @@
State=0
Left=0
Top=23
-Width=3828
-Height=1416
+Width=3825
+Height=1344
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1416
-TBDockHeight=1416
-LRDockWidth=3828
+ClientWidth=3825
+ClientHeight=1344
+TBDockHeight=1344
+LRDockWidth=3825
Dockable=1
StayOnTop=0
TabPosition=1
@@ -697,19 +693,19 @@
Visible=0
Docked=1
State=0
-Left=1280
+Left=1600
Top=49
-Width=1648
-Height=9014
+Width=2181
+Height=8878
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9014
-TBDockHeight=9014
-LRDockWidth=1648
+ClientWidth=2181
+ClientHeight=8878
+TBDockHeight=8878
+LRDockWidth=2181
Dockable=1
StayOnTop=0
TabPosition=1
-ActiveTabID=ProjectManager
-TabDockClients=ProjectManager,ToolForm,PropertyInspector,StructureView,DataExplorerContainer,ModelViewTool,TFileExplorerForm,TemplateView,ClassBrowserTool
+ActiveTabID=ToolForm
+TabDockClients=ToolForm,PropertyInspector,ProjectManager,DataExplorerContainer,StructureView,ModelViewTool,TFileExplorerForm,TemplateView,ClassBrowserTool
=======================================
--- /trunk/ExtPascal.pas Tue Apr 2 10:52:37 2013
+++ /trunk/ExtPascal.pas Thu Apr 4 18:53:14 2013
@@ -236,7 +236,10 @@
TEvent = class(TExtObject);
TCSSStyleSheet = type string;
TTextNode = class(TExtObject);
- TXMLHttpRequest = string;
+ TXMLHttpRequest = type string;
+ TWindow = type string;
+ TNodeList = type string;
+ TMixed = TExtObjectList;
//DOM-IGNORE-END*)
const
=======================================
--- /trunk/ExtPascalSamples/ArrayGrid.pas Thu Apr 4 12:11:50 2013
+++ /trunk/ExtPascalSamples/ArrayGrid.pas Thu Apr 4 18:53:14 2013
@@ -79,34 +79,34 @@
DataIndex := Id;
end;
with TExtGridColumn.AddTo(Columns) do begin
- Text := 'Price';
+ Text := 'Price';
Width := 75;
Sortable := true;
DataIndex := 'price';
- Renderer := 'usMoney';
+ RendererString := 'usMoney';
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := 'Change';
Width := 75;
Sortable := true;
DataIndex := 'change';
- RendererExtFunction := ColorValue;
+ Renderer := ColorValue;
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := '% Change';
Width := 75;
Sortable := true;
DataIndex := 'pctchange';
- RendererExtFunction := ColorValue;
+ Renderer := ColorValue;
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := 'Last Updated';
Width := 85;
Sortable := true;
DataIndex := 'lastchange';
- RendererExtFunction := ExtUtilFormat.Date('%0', 'm/d/Y'); // %0..%9
get event parameters
+ Renderer := ExtUtilFormat.Date('%0', 'm/d/Y'); // %0..%9 get event
parameters
end;
- with TExtButton.AddTo(TBarArray) do begin
+ with TExtButton.AddTo(TBar) do begin
Text := 'Show modal dialog using Ajax';
Handler := Ajax(SelfSession.ShowLayoutWindow);
end;
=======================================
--- /trunk/ExtPascalUtils.pas Tue Apr 2 10:10:33 2013
+++ /trunk/ExtPascalUtils.pas Thu Apr 4 18:53:14 2013
@@ -148,10 +148,13 @@
Header : boolean = false) : string;
// Returns true if BeforeS string occurs before AfterS string in S string
-function Before(const BeforeS, AfterS : string; var S : string) : boolean;
+function Before(const BeforeS, AfterS, S : string) : boolean;
// Returns true if S string occurs between BeforeS and AfterS strings in T
string
-function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
+function Between(const S, BeforeS, AfterS : string; var T : string) :
boolean;
+
+// Returns true if S string occurs between the first occurrence of BeforeS
and AfterS strings in T string
+function BetweenFirst(const S, BeforeS, AfterS : string; var T : string) :
boolean;
function GetBetween(const A, B, Line : string) : string;
@@ -445,7 +448,7 @@
EnumToJSString(TypeInfo(TCSSUnit), ord(CSSUnit))])
end;
-function Before(const BeforeS, AfterS : string; var S : string) : boolean;
+function Before(const BeforeS, AfterS, S : string) : boolean;
var
I, J : integer;
begin
@@ -476,7 +479,21 @@
end;
end;
-function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
+function Between(const S, BeforeS, AfterS : string; var T : string) :
boolean;
+var
+ I, J, K : integer;
+begin
+ Result := false;
+ I := pos(S, T);
+ if I <> 0 then begin
+ J := PosEx(AfterS, T, I);
+ K := RPosEx(BeforeS, copy(T, 1, J));
+ if K <> 0 then
+ Result := K < I;
+ end;
+end;
+
+function BetweenFirst(const S, BeforeS, AfterS : string; var T : string) :
boolean;
var
I, J : integer;
begin
@@ -485,7 +502,6 @@
if I <> 0 then begin
J := PosEx(AfterS, T, I);
Result := pos(S, copy(T, I+1, J-I)) <> 0;
- if Remove and Result then delete(T, 1, J+length(AfterS));
end;
end;
Author: wanderl...@gmail.com
Date: Thu Apr 4 18:53:14 2013
Log: Updating examples for Ext JS 4.2
http://code.google.com/p/extpascal/source/detail?r=819
Modified:
/trunk/ExtJSWrapper/Ext.pas
/trunk/ExtJSWrapper/ExtToPascal.dpr
/trunk/ExtJSWrapper/ExtToPascal.dproj
/trunk/ExtJSWrapper/ExtToPascal.dsk
/trunk/ExtPascal.pas
/trunk/ExtPascalSamples/ArrayGrid.pas
/trunk/ExtPascalUtils.pas
=======================================
--- /trunk/ExtJSWrapper/Ext.pas Thu Apr 4 11:42:55 2013
+++ /trunk/ExtJSWrapper/Ext.pas Thu Apr 4 18:53:14 2013
File is too large to display a diff.
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dpr Thu Apr 4 11:42:55 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dpr Thu Apr 4 18:53:14 2013
@@ -624,10 +624,16 @@
Singleton : boolean;
begin
Singleton := Before('@singleton', 'Ext.define(', Line);
- Extract(['/**', '*/'], Line, Matches);
- if Extract(['Ext.define(' + AP, AP], Line, Matches) or
+ if Before('@class', 'Ext.define(', Line) and Extract(['@class ', ' '],
Line, Matches) then
+ JSName := Matches[0]
+ else begin
+ JSName := '';
+ Extract(['/**', '*/'], Line, Matches);
+ end;
+ if (JSName <> '') or
+ Extract(['Ext.define(' + AP, AP], Line, Matches) or
Extract(['Ext.define(' + '"', '"'], Line, Matches) then begin
- JSName := Matches[0];
+ if JSName = '' then JSName := Matches[0];
if pos(JS_LIB, JSName) <> 1 then Abort;
Ci := AllClasses.IndexOf(JSName);
if Ci = -1 then
@@ -635,12 +641,16 @@
else
CurClass := TClass(AllClasses.Objects[Ci]);
if not Singleton then Singleton := Before('singleton:', '}', Line);
- if Singleton then CurClass.Name := CurClass.Name + 'Singleton';
+ if Singleton then begin
+ if CurClass.Name = 'T' + JS_LIB then
+ CurClass.Name := CurClass.Name + '_';
+ CurClass.Name := CurClass.Name + 'Singleton';
+ end;
CurClass.Singleton := Singleton;
end
else
Abort;
- if not Before('/**', 'extend:', Line) and not
Between('extend:', '/*', '*/', Line, false) then
+ if not Between('extend:', '/*', '*/', Line) then
if Extract(['extend:', AP, AP], Line, Matches) then
CurClass.Parent := FixIdent(Matches[1], true);
if Extract(['mixins: {', '}'], Line, Matches) then
@@ -657,11 +667,11 @@
try
ParseClass;
while true do
- if not(Between('@hide', '/**', '*/', Line) or
- Between('@private', '/**', '*/', Line) or
- Between('@deprecated','/**', '*/', Line) or
- Between('@protected', '/**', '*/', Line) or
- Between('@template', '/**', '*/', Line)) then
+ if not(BetweenFirst('@hide', '/**', '*/', Line) or
+ BetweenFirst('@private', '/**', '*/', Line) or
+ BetweenFirst('@deprecated','/**', '*/', Line) or
+ BetweenFirst('@protected', '/**', '*/', Line) or
+ BetweenFirst('@template', '/**', '*/', Line)) then
case First(['@cfg', '@property', '@event', ': function'], Line) of
0 : ParseCfg;
1 : ParseProperty;
@@ -669,7 +679,9 @@
3 : ParseMethod;
else
break;
- end;
+ end
+ else
+ if not Extract(['/**', '*/'], Line, Matches) then break;
SetArraysAndObjects;
finally
Matches.Free;
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dproj Tue Apr 2 10:10:33 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dproj Thu Apr 4 18:53:14 2013
@@ -144,9 +144,3 @@
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"
Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
<Import
Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"
Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
</Project>
-
-<!-- EurekaLog First Line
-[Exception Log]
-EurekaLog Version=7001
-DeleteMapAfterCompile=1
-EurekaLog Last Line -->
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Apr 4 12:11:50 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Apr 4 18:53:14 2013
@@ -1,58 +1,53 @@
[Closed Files]
-File_0=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6638,1,6659,0,0,,
-File_1=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,27737,1,27777,0,0,,
-File_2=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtFixes3.txt',0,1,37,1,37,0,0,,
-File_3=TSourceModule,'E:\extpascal\ext-4.2.0\src\window\MessageBox.js',0,1,353,1,148,0,0,,
-File_4=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\reader\Reader.js',0,1,280,23,302,0,0,,
-File_5=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Sprite.js',0,1,133,25,160,0,0,,
-File_6=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js',0,1,145,16,180,0,0,,
-File_7=TSourceModule,'E:\extpascal\ext-4.2.0\src\view\View.js',0,1,389,27,390,0,0,,
-File_8=TSourceModule,'E:\extpascal\ext-4.2.0\src\selection\Model.js',0,1,76,16,89,0,0,,
-File_9=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\SortTypes.js',0,1,44,24,65,0,0,,
-File_10=TSourceModule,'E:\extpascal\ext-4.2.0\src\Ext.js',0,1,1,14,6,0,0,,
-File_11=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\Model.js',0,1,692,12,689,0,0,,
-File_12=TSourceModule,'E:\extpascal\ext-4.2.0\src\util\History.js',0,1,22,8,51,0,0,,
-File_13=TSourceModule,'E:\extpascal\ext-4.2.0\src\form\action\Action.js',0,1,269,12,292,0,0,,
-File_14=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Surface.js',0,1,211,16,216,0,0,,
-File_15=TSourceModule,'E:\extpascal\ext-4.2.0\src\tab\Panel.js',0,1,413,47,415,0,0,,
-File_16=TSourceModule,'E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js',0,1,5,46,9,0,0,,
-File_17=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Component.js',0,1,261,60,262,0,0,,
-File_18=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\CompositeSprite.js',0,1,69,70,70,0,0,,
-File_19=TSourceModule,'E:\extpascal\ext-4.2.0\docs\resources\prettify\prettify.css',0,1,1,59,2,0,0,,
+File_0=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\window\MessageBox.js',0,1,28,53,62,0,0,,
+File_1=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\TextMetrics.js',0,1,1,43,24,0,0,,
+File_2=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\TaskRunner.js',0,1,7,1,7,0,0,,
+File_3=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\util\Observable.js',0,1,8,8,8,0,0,,
+File_4=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\view\AbstractView.js',0,1,1,4,22,0,0,,
+File_5=TSourceModule,'A:\ExtPascal\ext-4.2.0\src\version\Version.js',0,1,28,4,62,0,0,,
+File_6=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6638,1,6659,0,0,,
+File_7=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,27737,1,27777,0,0,,
+File_8=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtFixes3.txt',0,1,37,1,37,0,0,,
+File_9=TSourceModule,'E:\extpascal\ext-4.2.0\src\window\MessageBox.js',0,1,353,1,148,0,0,,
+File_10=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\reader\Reader.js',0,1,280,23,302,0,0,,
+File_11=TSourceModule,'E:\extpascal\ext-4.2.0\src\draw\Sprite.js',0,1,133,25,160,0,0,,
+File_12=TSourceModule,'E:\extpascal\ext-4.2.0\src\data\proxy\JsonP.js',0,1,145,16,180,0,0,,
+File_13=TSourceModule,'E:\extpascal\ext-4.2.0\src\view\View.js',0,1,389,27,390,0,0,,
+File_14=TSourceModule,'E:\extpascal\ext-4.2.0\src\selection\Model.js',0,1,76,16,89,0,0,,
[Modules]
-Module0=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-Module1=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
-Module2=E:\extpascal\ExtJSWrapper\Ext.pas
-Module3=E:\extpascal\ExtPascalUtils.pas
-Module4=E:\extpascal\ExtPascal.pas
+Module0=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj
+Module1=A:\ExtPascal\ExtJSWrapper\Ext.pas
+Module2=A:\ExtPascal\ExtPascalUtils.pas
+Module3=A:\ExtPascal\ExtPascal.pas
+Module4=A:\ExtPascal\ext-4.2.0\src\view\Table.js
Count=5
EditWindowCount=1
-[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
-ModuleType=TSourceModule
-
-[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
+[A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj]
ModuleType=TBaseProject
-[E:\extpascal\ExtJSWrapper\Ext.pas]
+[A:\ExtPascal\ExtJSWrapper\Ext.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtPascalUtils.pas]
+[A:\ExtPascal\ExtPascalUtils.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtPascal.pas]
+[A:\ExtPascal\ExtPascal.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
+[A:\ExtPascal\ext-4.2.0\src\view\Table.js]
+ModuleType=TSourceModule
+
[EditWindow0]
ViewCount=5
-CurrentEditView=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+CurrentEditView=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
View0=0
View1=1
View2=2
@@ -66,82 +61,82 @@
Left=0
Top=0
Width=10000
-Height=9521
+Height=9456
MaxLeft=-1
MaxTop=-1
ClientWidth=10000
-ClientHeight=9521
+ClientHeight=9456
DockedToMainForm=1
BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0
TopPanelSize=0
LeftPanelSize=0
RightPanelSize=0
-BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B5369746531D430000000000000002406000000000000FFFFFFFF
-BottomMiddlePanelSize=1348
-BottomMiddlePanelClients=DockSite0,GraphDrawingModel,MessageView
-BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577F32F0000000000000244050000000000000100000000F32F00000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomPanelSize=1600
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001020100000009000000446F636B536974653172450000000000000240060000000000000100000000724500000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomMiddlePanelSize=0
+BottomMiddlePanelClients=DockSite0,GraphDrawingModel
+BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779A1D00000000000002F206000000000000FFFFFFFF
TabDockLeftClients=DockSite2=0
[View0]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+Module=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
CursorX=1
-CursorY=1533
+CursorY=15
TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
[View1]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-CursorX=1
-CursorY=45
-TopLine=25
+Module=A:\ExtPascal\ext-4.2.0\src\view\Table.js
+CursorX=16
+CursorY=54
+TopLine=22
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+EditViewName=A:\ExtPascal\ext-4.2.0\src\view\Table.js
[View2]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\Ext.pas
-CursorX=136
-CursorY=3
-TopLine=1
+Module=A:\ExtPascal\ExtPascalUtils.pas
+CursorX=10
+CursorY=484
+TopLine=478
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\Ext.pas
+EditViewName=A:\ExtPascal\ExtPascalUtils.pas
[View3]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascalUtils.pas
-CursorX=1
-CursorY=318
-TopLine=297
+Module=A:\ExtPascal\ExtJSWrapper\Ext.pas
+CursorX=5
+CursorY=61080
+TopLine=61062
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascalUtils.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\Ext.pas
[View4]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascal.pas
+Module=A:\ExtPascal\ExtPascal.pas
CursorX=1
-CursorY=815
-TopLine=794
+CursorY=1
+TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascal.pas
+EditViewName=A:\ExtPascal\ExtPascal.pas
[Watches]
Count=4
-Watch0='Matches[3]',256,0,18,1,0,'Watches',1
+Watch0='Matches[1]',256,0,18,1,0,'Watches',1
Watch1='Ident',256,0,18,1,0,'Watches',1
Watch2='M.Methods[I]',256,0,18,1,0,'Watches',1
Watch3='TMethod(M.Methods.Objects[I]).Overload',256,0,18,1,0,'Watches',1
@@ -156,20 +151,21 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
-LRDockWidth=13602
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=211
+LRDockWidth=13600
Dockable=1
StayOnTop=0
[Breakpoints]
-Count=1
-Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',827,'',0,1,'',1,0,0,'',1,'','','',0,''
+Count=2
+Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',839,'',0,1,'',1,0,0,'',1,'','','',0,''
+Breakpoint1='A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr',637,'JSNAme=''Ext.panel.AbstractPanel''',0,1,'',1,0,0,'',1,'','','',0,''
[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
@@ -183,17 +179,17 @@
Visible=1
Docked=0
State=2
-Left=141
-Top=273
-Width=8930
-Height=8525
-MaxLeft=-8
-MaxTop=-10
-MaxWidth=8930
-MaxHeight=8525
+Left=144
+Top=278
+Width=8931
+Height=8522
+MaxLeft=-6
+MaxTop=-11
+MaxWidth=8931
+MaxHeight=8522
ClientWidth=10000
-ClientHeight=9785
-BottomPanelSize=9521
+ClientHeight=9756
+BottomPanelSize=9456
BottomPanelClients=EditWindow0
BottomPanelData=0000080000000000000000000000000000000000000000000000000100000000000000000C0000004564697457696E646F775F30FFFFFFFF
@@ -205,14 +201,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2000
+Height=1422
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=5898
-LRDockWidth=2352
+ClientWidth=2000
+ClientHeight=1422
+TBDockHeight=5900
+LRDockWidth=2350
Dockable=1
StayOnTop=0
@@ -224,14 +220,14 @@
State=0
Left=0
Top=23
-Width=9820
-Height=1123
+Width=10000
+Height=1344
MaxLeft=-1
MaxTop=-1
-ClientWidth=9820
-ClientHeight=1123
-TBDockHeight=1123
-LRDockWidth=2766
+ClientWidth=10000
+ClientHeight=1344
+TBDockHeight=1344
+LRDockWidth=2769
Dockable=1
StayOnTop=0
@@ -243,13 +239,13 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=7158
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=7156
LRDockWidth=2000
Dockable=1
StayOnTop=0
@@ -260,16 +256,16 @@
Visible=0
Docked=1
State=0
-Left=-1280
-Top=314
-Width=273
-Height=361
+Left=-1600
+Top=270
+Width=275
+Height=356
MaxLeft=-1
MaxTop=-1
-ClientWidth=273
-ClientHeight=361
-TBDockHeight=361
-LRDockWidth=273
+ClientWidth=275
+ClientHeight=356
+TBDockHeight=356
+LRDockWidth=275
Dockable=1
StayOnTop=0
Name=120
@@ -284,14 +280,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=410
-LRDockWidth=4953
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=411
+LRDockWidth=4950
Dockable=1
StayOnTop=0
@@ -303,13 +299,13 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=211
LRDockWidth=7406
Dockable=1
StayOnTop=0
@@ -326,14 +322,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
+ClientWidth=3825
+ClientHeight=1067
TBDockHeight=1533
-LRDockWidth=3484
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -345,14 +341,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=2061
-LRDockWidth=3484
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=2056
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -364,14 +360,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=4883
-LRDockWidth=7148
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=2231
Dockable=1
StayOnTop=0
@@ -383,17 +379,17 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=9014
-LRDockWidth=1891
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=8878
+LRDockWidth=1894
Dockable=1
StayOnTop=0
-SplitPos=111
+SplitPos=131
[TFileExplorerForm]
PercentageSizes=1
@@ -401,15 +397,15 @@
Visible=0
Docked=1
State=0
-Left=-1202
-Top=38
+Left=-1502
+Top=27
Width=2844
-Height=6201
+Height=6200
MaxLeft=-1
MaxTop=-1
ClientWidth=2844
-ClientHeight=6201
-TBDockHeight=6201
+ClientHeight=6200
+TBDockHeight=6200
LRDockWidth=2844
Dockable=1
StayOnTop=0
@@ -422,14 +418,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=996
+Width=2338
+Height=967
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=996
-TBDockHeight=2314
-LRDockWidth=2828
+ClientWidth=2338
+ClientHeight=967
+TBDockHeight=2311
+LRDockWidth=2825
Dockable=1
StayOnTop=0
@@ -441,14 +437,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=3203
-LRDockWidth=2828
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=3200
+LRDockWidth=2825
Dockable=1
StayOnTop=0
@@ -460,14 +456,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=1152
-LRDockWidth=3672
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=1156
+LRDockWidth=3675
Dockable=1
StayOnTop=0
Column0Width=314
@@ -485,16 +481,16 @@
Visible=0
Docked=1
State=0
-Left=245
-Top=825
-Width=2859
-Height=3213
+Left=306
+Top=724
+Width=2856
+Height=3211
MaxLeft=-1
MaxTop=-1
-ClientWidth=2859
-ClientHeight=3213
-TBDockHeight=3213
-LRDockWidth=2859
+ClientWidth=2856
+ClientHeight=3211
+TBDockHeight=3211
+LRDockWidth=2856
Dockable=1
StayOnTop=0
@@ -506,14 +502,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=4883
-LRDockWidth=5305
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=5306
Dockable=1
StayOnTop=0
@@ -523,15 +519,15 @@
Visible=0
Docked=1
State=0
-Left=-1280
+Left=-1600
Top=-49
Width=1844
-Height=3145
+Height=3144
MaxLeft=-1
MaxTop=-1
ClientWidth=1844
-ClientHeight=3145
-TBDockHeight=3145
+ClientHeight=3144
+TBDockHeight=3144
LRDockWidth=1844
Dockable=1
StayOnTop=0
@@ -544,13 +540,13 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=4824
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=4833
LRDockWidth=3562
Dockable=1
StayOnTop=0
@@ -563,13 +559,13 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1230
+Width=2338
+Height=1200
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1230
-TBDockHeight=4824
+ClientWidth=2338
+ClientHeight=1200
+TBDockHeight=4833
LRDockWidth=3562
Dockable=1
StayOnTop=0
@@ -582,14 +578,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1067
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=1543
-LRDockWidth=8742
+ClientWidth=3825
+ClientHeight=1067
+TBDockHeight=1544
+LRDockWidth=8744
Dockable=1
StayOnTop=0
Column0Width=200
@@ -608,14 +604,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=8770
+Width=2181
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=8770
-TBDockHeight=3672
-LRDockWidth=1891
+ClientWidth=2181
+ClientHeight=8600
+TBDockHeight=3678
+LRDockWidth=1894
Dockable=1
StayOnTop=0
@@ -627,14 +623,14 @@
State=0
Left=0
Top=0
-Width=1828
-Height=6182
-MaxLeft=-8
-MaxTop=-10
-ClientWidth=1703
-ClientHeight=5850
-TBDockHeight=6182
-LRDockWidth=1828
+Width=1825
+Height=6178
+MaxLeft=-6
+MaxTop=-11
+ClientWidth=1725
+ClientHeight=5800
+TBDockHeight=6178
+LRDockWidth=1825
Dockable=1
StayOnTop=0
@@ -651,14 +647,14 @@
State=0
Left=0
Top=0
-Width=2336
-Height=1475
+Width=2338
+Height=1478
MaxLeft=-1
MaxTop=-1
-ClientWidth=2336
-ClientHeight=1475
-TBDockHeight=1475
-LRDockWidth=2336
+ClientWidth=2338
+ClientHeight=1478
+TBDockHeight=1478
+LRDockWidth=2338
Dockable=1
StayOnTop=0
TabPosition=1
@@ -675,14 +671,14 @@
State=0
Left=0
Top=23
-Width=3828
-Height=1416
+Width=3825
+Height=1344
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1416
-TBDockHeight=1416
-LRDockWidth=3828
+ClientWidth=3825
+ClientHeight=1344
+TBDockHeight=1344
+LRDockWidth=3825
Dockable=1
StayOnTop=0
TabPosition=1
@@ -697,19 +693,19 @@
Visible=0
Docked=1
State=0
-Left=1280
+Left=1600
Top=49
-Width=1648
-Height=9014
+Width=2181
+Height=8878
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9014
-TBDockHeight=9014
-LRDockWidth=1648
+ClientWidth=2181
+ClientHeight=8878
+TBDockHeight=8878
+LRDockWidth=2181
Dockable=1
StayOnTop=0
TabPosition=1
-ActiveTabID=ProjectManager
-TabDockClients=ProjectManager,ToolForm,PropertyInspector,StructureView,DataExplorerContainer,ModelViewTool,TFileExplorerForm,TemplateView,ClassBrowserTool
+ActiveTabID=ToolForm
+TabDockClients=ToolForm,PropertyInspector,ProjectManager,DataExplorerContainer,StructureView,ModelViewTool,TFileExplorerForm,TemplateView,ClassBrowserTool
=======================================
--- /trunk/ExtPascal.pas Tue Apr 2 10:52:37 2013
+++ /trunk/ExtPascal.pas Thu Apr 4 18:53:14 2013
@@ -236,7 +236,10 @@
TEvent = class(TExtObject);
TCSSStyleSheet = type string;
TTextNode = class(TExtObject);
- TXMLHttpRequest = string;
+ TXMLHttpRequest = type string;
+ TWindow = type string;
+ TNodeList = type string;
+ TMixed = TExtObjectList;
//DOM-IGNORE-END*)
const
=======================================
--- /trunk/ExtPascalSamples/ArrayGrid.pas Thu Apr 4 12:11:50 2013
+++ /trunk/ExtPascalSamples/ArrayGrid.pas Thu Apr 4 18:53:14 2013
@@ -79,34 +79,34 @@
DataIndex := Id;
end;
with TExtGridColumn.AddTo(Columns) do begin
- Text := 'Price';
+ Text := 'Price';
Width := 75;
Sortable := true;
DataIndex := 'price';
- Renderer := 'usMoney';
+ RendererString := 'usMoney';
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := 'Change';
Width := 75;
Sortable := true;
DataIndex := 'change';
- RendererExtFunction := ColorValue;
+ Renderer := ColorValue;
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := '% Change';
Width := 75;
Sortable := true;
DataIndex := 'pctchange';
- RendererExtFunction := ColorValue;
+ Renderer := ColorValue;
end;
with TExtGridColumn.AddTo(Columns) do begin
Text := 'Last Updated';
Width := 85;
Sortable := true;
DataIndex := 'lastchange';
- RendererExtFunction := ExtUtilFormat.Date('%0', 'm/d/Y'); // %0..%9
get event parameters
+ Renderer := ExtUtilFormat.Date('%0', 'm/d/Y'); // %0..%9 get event
parameters
end;
- with TExtButton.AddTo(TBarArray) do begin
+ with TExtButton.AddTo(TBar) do begin
Text := 'Show modal dialog using Ajax';
Handler := Ajax(SelfSession.ShowLayoutWindow);
end;
=======================================
--- /trunk/ExtPascalUtils.pas Tue Apr 2 10:10:33 2013
+++ /trunk/ExtPascalUtils.pas Thu Apr 4 18:53:14 2013
@@ -148,10 +148,13 @@
Header : boolean = false) : string;
// Returns true if BeforeS string occurs before AfterS string in S string
-function Before(const BeforeS, AfterS : string; var S : string) : boolean;
+function Before(const BeforeS, AfterS, S : string) : boolean;
// Returns true if S string occurs between BeforeS and AfterS strings in T
string
-function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
+function Between(const S, BeforeS, AfterS : string; var T : string) :
boolean;
+
+// Returns true if S string occurs between the first occurrence of BeforeS
and AfterS strings in T string
+function BetweenFirst(const S, BeforeS, AfterS : string; var T : string) :
boolean;
function GetBetween(const A, B, Line : string) : string;
@@ -445,7 +448,7 @@
EnumToJSString(TypeInfo(TCSSUnit), ord(CSSUnit))])
end;
-function Before(const BeforeS, AfterS : string; var S : string) : boolean;
+function Before(const BeforeS, AfterS, S : string) : boolean;
var
I, J : integer;
begin
@@ -476,7 +479,21 @@
end;
end;
-function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
+function Between(const S, BeforeS, AfterS : string; var T : string) :
boolean;
+var
+ I, J, K : integer;
+begin
+ Result := false;
+ I := pos(S, T);
+ if I <> 0 then begin
+ J := PosEx(AfterS, T, I);
+ K := RPosEx(BeforeS, copy(T, 1, J));
+ if K <> 0 then
+ Result := K < I;
+ end;
+end;
+
+function BetweenFirst(const S, BeforeS, AfterS : string; var T : string) :
boolean;
var
I, J : integer;
begin
@@ -485,7 +502,6 @@
if I <> 0 then begin
J := PosEx(AfterS, T, I);
Result := pos(S, copy(T, I+1, J-I)) <> 0;
- if Remove and Result then delete(T, 1, J+length(AfterS));
end;
end;
Reply all
Reply to author
Forward
0 new messages