[extpascal] r808 committed - Updating examples for Ext JS 4.2
12 views
Skip to first unread message
extp...@googlecode.com
Mar 30, 2013, 4:47:10 PM3/30/13
to extp...@googlegroups.com
Revision: 808
Author: wanderl...@gmail.com
Date: Sat Mar 30 13:46:36 2013
Log: Updating examples for Ext JS 4.2
http://code.google.com/p/extpascal/source/detail?r=808
Modified:
/trunk/ExtJSWrapper/Ext.pas
/trunk/ExtJSWrapper/ExtFixes.txt
/trunk/ExtJSWrapper/ExtToPascal.dpr
/trunk/ExtJSWrapper/ExtToPascal.dsk
/trunk/ExtPascalSamples/BasicTabPanel.pas
/trunk/ExtPascalSamples/LayoutWindow.pas
/trunk/ExtPascalSamples/MessageBoxes.pas
/trunk/ExtPascalSamples/Session.pas
/trunk/ExtPascalUtils.pas
=======================================
--- /trunk/ExtJSWrapper/Ext.pas Thu Mar 28 06:48:07 2013
+++ /trunk/ExtJSWrapper/Ext.pas Sat Mar 30 13:46:36 2013
File is too large to display a diff.
=======================================
--- /trunk/ExtJSWrapper/ExtFixes.txt Wed Mar 27 10:21:02 2013
+++ /trunk/ExtJSWrapper/ExtFixes.txt Sat Mar 30 13:46:36 2013
@@ -1,4 +1,4 @@
-* For Ext JS 3.0 and later
+* For Ext JS 4.0 and later
* USED FORMATS in ExtFixes.txt
*
* Adding new classes:
@@ -10,6 +10,12 @@
* Changing a property type to enumeration
<class name>,<JavaScript property name>,<(enumerated list)>
*
+* Changing a type to enumeration
+<type name>,<(enumerated list)>
+*
+* Aliasing a type
+<type name>,<alias>
+*
* Adding and updating methods:
<class name>,<JavaScript method name>,<return type or void>,<if is a
static method>,<if is a overload method>
*
@@ -22,9 +28,67 @@
* For each event parameter:
<parameter name>,<type>
*
+ExtComponent, split, Boolean, false, true,
+ExtComponent, cmargins, string, false, true,
+ExtComponent, minSize, Integer, false, true,
+ExtComponent, maxSize, Integer, false, true,
+ExtComponent, anchor, string, false, true,
+ExtDataRecord, TExtDataModel
+ExtDataModel, Create,, true, false, Data, ExtObjectList, false
+
ExtEnumsLayout, (laAbsolute, laAccordion, laAnchor, laAutocomponent,
laAutocontainer, laBorder, laBox, laCard, laCheckboxgroup, laColumn,
laContainer, laFit, laForm, laHbox, laTable, laVbox)
ExtMessageBox, ExtWindowMessageBox, singleton, Ext.MessageBox
+ExtWindowMessageBox, show, ExtFunction, false, false, Config,
ExtShowConfig, false
+
+ExtMessageBoxSingleton, ERROR, string, true, false, 'ext-mb-error'
+ExtMessageBoxSingleton, INFO, string, true, false, 'ext-mb-info'
+ExtMessageBoxSingleton, QUESTION, string, true, false, 'ext-mb-question'
+ExtMessageBoxSingleton, WARNING, string, true, false, 'ext-mb-warning'
+ExtMessageBoxSingleton, OK, Integer, true, false, 1
+ExtMessageBoxSingleton, YES, Integer, true, false, 2
+ExtMessageBoxSingleton, NO, Integer, true, false, 4
+ExtMessageBoxSingleton, CANCEL, Integer, true, false, 8
+ExtMessageBoxSingleton, OKCANCEL, Integer, true, false, 9
+ExtMessageBoxSingleton, YESNO, Integer, true, false, 6
+ExtMessageBoxSingleton, YESNOCANCEL, Integer, true, false, 14
+
+ExtShowConfig,, Ext, Object
+ExtShowConfig, animTarget, string, false, true,
+ExtShowConfig, buttons, Integer, false, true,
+ExtShowConfig, closable, Boolean, false, true, true
+ExtShowConfig, cls, string, false, true,
+ExtShowConfig, defaultTextHeight, Integer, false, true, 75
+ExtShowConfig, fn, ExtFunction, false, true,
+ExtShowConfig, scope, ExtObject, false, true,
+ExtShowConfig, icon, string, false, true,
+ExtShowConfig, iconCls, string, false, true,
+ExtShowConfig, defaultFocus, string, false, true,
+ExtShowConfig, maxWidth, Integer, false, true, 600
+ExtShowConfig, minWidth, Integer, false, true, 100
+ExtShowConfig, modal, Boolean, false, true, true
+ExtShowConfig, msg, string, false, true,
+ExtShowConfig, multiline, Boolean, false, true,
+ExtShowConfig, progress, Boolean, false, true,
+ExtShowConfig, progressText, string, false, true,
+ExtShowConfig, prompt, Boolean, false, true,
+ExtShowConfig, proxyDrag, Boolean, false, true,
+ExtShowConfig, title, string, false, true,
+ExtShowConfig, value, string, false, true,
+ExtShowConfig, wait, Boolean, false, true,
+ExtShowConfig, waitConfig, ExtProgressWaitConfig, false, true,
+ExtShowConfig, width, Integer, false, true,
+ExtProgressWaitConfig,, Ext, Object
+ExtProgressWaitConfig, duration, Integer, false, true,
+ExtProgressWaitConfig, interval, Integer, false, true, 1000
+ExtProgressWaitConfig, animate, Boolean, false, true,
+ExtProgressWaitConfig, increment, Integer, false, true, 10
+ExtProgressWaitConfig, text, string, false, true,
+ExtProgressWaitConfig, fn, ExtFunction, false, true,
+ExtProgressWaitConfig, scope, ExtObject, false, true,
+
+
+
*ExtBoxComponent, region, (rgCenter, rgNorth, rgEast, rgSouth, rgWest)
*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)
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dpr Wed Mar 27 10:21:02 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dpr Sat Mar 30 13:46:36 2013
@@ -12,7 +12,7 @@
uses
SysUtils, StrUtils, Classes, ExtPascalUtils
-, Ext
+//, Ext
;
{.$DEFINE USES_PUBLISHED}
@@ -426,17 +426,17 @@
IsEvent, Optional, Static, Singleton: boolean;
I, Ci : integer;
begin
- if Before('@protected', '*/', Line, false) or
- Before('@ignore', '*/', Line, false) or
- Before('@deprecated','*/', Line, false) or
- Before('@abstract', '*/', Line, false) then exit;
+ if Before('@protected', '*/', Line) or
+ Before('@ignore', '*/', Line) or
+ Before('@deprecated','*/', Line) or
+ Before('@abstract', '*/', Line) then exit;
State := Initial;
Matches := TStringList.Create;
while true do begin
case State of
Initial : begin
JSName := '';
- Singleton := Before('@singleton', 'Ext.define(', Line, false);
+ Singleton := Before('@singleton', 'Ext.define(', Line);
Extract(['/**', '*/'], Line, Matches);
if (JSName <> '') or
Extract(['Ext.define(' + AP, AP], Line, Matches) or
@@ -449,7 +449,7 @@
else
CurClass := TClass(AllClasses.Objects[Ci]);
State := InClass;
- if not Singleton then Singleton := Before('singleton:', '}',
Line, false);
+ if not Singleton then Singleton := Before('singleton:', '}',
Line);
if Singleton then CurClass.Name := CurClass.Name + 'Singleton';
CurClass.Singleton := Singleton;
continue;
@@ -474,7 +474,10 @@
Between('@deprecated','/**', '*/', Line) or
Between('@protected', '/**', '*/', Line) then continue;
begin
- Config := Extract(['@cfg {', '} ', ' '], Line, Matches);
+ if Before('@cfg {', '@property {', Line) then
+ Config := Extract(['@cfg {', '} ', ' '], Line, Matches)
+ else
+ Config := False;
// To do Extract(['@property ', ' ', '@type ', ' '], Line,
Matches) PropName = Matches[0]; PropType = Matches[2]
if Config or Extract(['@property {', '} ', ' '], Line, Matches)
then begin
PropName := Matches[1];
@@ -483,7 +486,7 @@
if I <> 0 then
PropName := copy(PropName, 1, I-1); // Default value ****
if FixIdent(PropName) = '' then continue; // Discard
properties nameless
- if Before('@static', '*/', Line, false) then Static := true;
+ if Before('@static', '*/', Line) then Static := true;
if IsUppercase(PropName) then Static := true;
PropName := Unique(FixIdent(PropName), CurClass.Properties);
if not Static then PropName[1] := LowerCase(PropName)[1];
@@ -492,6 +495,7 @@
continue; // Discard duplicates
end;
Matches[0] :=
ReplaceStr(Matches[0], 'Object/Object[]', 'Object[]');
+ Matches[0] :=
ReplaceStr(Matches[0], 'String/Number', 'Number/String');
PropTypes := Explode('/', Matches[0]);
if (pos('"', Matches[0]) <> 0) and (PropTypes.Count <> 0) then
begin // Enumeration
CurProp := TProp.Create(PropName, PropName, 'string',
Static, Config);
@@ -510,8 +514,8 @@
CurClass.Properties.AddObject(FixIdent(PropName +
Sufix(FixType(PropTypes[I]))),
TProp.Create(PropName +
Sufix(FixType(PropTypes[I])), PropName, PropTypes[I], Static, Config));
//if Extract([PropName, ':', ','], Line, Matches) then begin
- if (Before('Default to', '*/', Line, false) and
Extract(['Default to', '.'], Line, Matches)) or
- (Before('Defaults to', '*/', Line, false) and
Extract(['Defaults to', '.'], Line, Matches)) then begin
+ if (Before('Default to', '*/', Line) and Extract(['Default
to', '.'], Line, Matches)) or
+ (Before('Defaults to', '*/', Line) and Extract(['Defaults
to', '.'], Line, Matches)) then begin
SetDefault(CurProp, Matches[0], Matches);
if (CurProp.Default <> '') and not CurClass.Defaults then
begin
CurClass.Defaults := true;
@@ -543,7 +547,13 @@
Between('@protected', '/**', '*/', Line) or
Between('@deprecated', '/**', '*/', Line) or
Between('@template', '/**', '*/', Line) then continue;
- IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches);
+ if Before('@event ', ': function', Line) then
+ IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches)
+ else
+ if Before('/**', ': function', Line) then
+ IsEvent := False
+ else
+ IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches);
if IsEvent or Extract(['/**', '*/', ': function'], Line, Matches)
then begin
JSName := IfThen(IsEvent, Matches[0], Matches[1]);
if (length(JSName) > 30) or (FixIdent(JSName) = '') or // Doc
fault
@@ -730,6 +740,12 @@
if NewClass.Singleton then NewClass.Name := NewClass.Name
+ 'Singleton';
AllClasses.AddObject(NewClass.Name, NewClass);
end
+ else
+ if Fields.Count = 2 then begin // Aliasing a type
+ Fields[0] := 'T' + Fields[0];
+ if Unresolved.IndexOfName(Fields[0]) = -1 then
+ Unresolved.Add(Fields[0] + '=' + Fields[1]);
+ end
else
writeln(^M^J'*** WARNING: Class ', Fields[0], ' does not
exist. ***'^M^J);
finally
@@ -1193,7 +1209,6 @@
writeln(Pas, 'type');
for J := 0 to AllClasses.Count-1 do // forward classes
writeln(Pas, Tab, TClass(AllClasses.Objects[J]).Name, ' = class;');
-// writeln(Pas, Tab, 'TExtDataRecord = TExtDataModel;');
WriteUnresolvedClasses;
writeln(Pas);
AllClasses.Sorted := false;
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Mar 28 06:48:07 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dsk Sat Mar 30 13:46:36 2013
@@ -1,75 +1,63 @@
[Closed Files]
-File_0=TSourceModule,'E:\extpascal\ext-4.2.0\src\AbstractComponent.js',0,1,7,23,583,0,0,,
-File_1=TSourceModule,'E:\Temp\Surface.js',0,1,19,36,308,0,0,,
-File_2=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6619,1,6644,0,0,,
-File_3=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22820,1,22860,0,0,,
-File_4=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtUtil.pas',0,1,1050,37,1073,0,0,,
-File_5=TSourceModule,'E:\extpascal\ext-4.1.1a\src\grid\plugin\Editing.js',0,1,147,33,196,0,0,,
-File_6=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtDd.pas',0,1,285,32,308,0,0,,
-File_7=TSourceModule,'E:\extpascal\FCGIApp.pas',0,1,210,28,231,0,0,,
-File_8=TSourceModule,'E:\extpascal\ext-4.1.1a\src\Ajax.js',0,1,1,4,2,0,0,,
-File_9=TSourceModule,'E:\extpascal\ext-4.1.1a\src\AbstractManager.js',0,1,70,24,19,0,0,,
-File_10=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\Loader.js',0,1,1,22,1261,0,0,,
-File_11=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\lang\Error.js',0,1,68,28,127,0,0,,
-File_12=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\ClassManager.js',0,1,1482,32,1505,0,0,,
-File_13=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\MixedCollection.js',0,1,1,4,2,0,0,,
-File_14=TSourceModule,'E:\extpascal\ext-4.1.1a\src\view\AbstractView.js',0,1,1,4,2,0,0,,
-File_15=TSourceModule,'E:\extpascal\ext-4.1.1a\src\window\MessageBox.js',0,1,867,8,890,0,0,,
-File_16=TSourceModule,'E:\extpascal\ext-4.1.1a\src\ZIndexManager.js',0,1,499,8,522,0,0,,
-File_17=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\HashMap.js',0,1,1,14,33,0,0,,
-File_18=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\dom\AbstractElement.insertion.js',0,1,1,12,2,0,0,,
-File_19=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\EventManager.js',0,1,1,1,1,0,0,,
+File_0=TSourceModule,'A:\ExtPascal\Ext.pas',0,1,8140,3,8156,0,0,,
+File_1=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6619,1,6644,0,0,,
+File_2=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22820,1,22860,0,0,,
+File_3=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtUtil.pas',0,1,1050,37,1073,0,0,,
+File_4=TSourceModule,'E:\extpascal\ext-4.1.1a\src\grid\plugin\Editing.js',0,1,147,33,196,0,0,,
+File_5=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtDd.pas',0,1,285,32,308,0,0,,
+File_6=TSourceModule,'E:\extpascal\FCGIApp.pas',0,1,210,28,231,0,0,,
+File_7=TSourceModule,'E:\extpascal\ext-4.1.1a\src\Ajax.js',0,1,1,4,2,0,0,,
+File_8=TSourceModule,'E:\extpascal\ext-4.1.1a\src\AbstractManager.js',0,1,70,24,19,0,0,,
+File_9=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\Loader.js',0,1,1,22,1261,0,0,,
+File_10=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\lang\Error.js',0,1,68,28,127,0,0,,
+File_11=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\ClassManager.js',0,1,1482,32,1505,0,0,,
+File_12=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\MixedCollection.js',0,1,1,4,2,0,0,,
+File_13=TSourceModule,'E:\extpascal\ext-4.1.1a\src\view\AbstractView.js',0,1,1,4,2,0,0,,
+File_14=TSourceModule,'E:\extpascal\ext-4.1.1a\src\window\MessageBox.js',0,1,867,8,890,0,0,,
[Modules]
-Module0=E:\extpascal\ExtJSWrapper\Ext.pas
-Module1=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
-Module2=E:\extpascal\ExtPascalUtils.pas
-Module3=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-Module4=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
-Module5=E:\extpascal\ExtPascal.pas
-Module6=E:\extpascal\ExtJSWrapper\ExtOld.pas
-Count=7
+Module0=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj
+Module1=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
+Module2=A:\ExtPascal\ExtJSWrapper\Ext.pas
+Module3=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
+Module4=A:\ExtPascal\ExtPascal.pas
+Module5=A:\ExtPascal\ExtPascalUtils.pas
+Count=6
EditWindowCount=1
-[E:\extpascal\ExtJSWrapper\Ext.pas]
-ModuleType=TSourceModule
-FormState=0
-FormOnTop=0
-
-[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
+[A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj]
ModuleType=TBaseProject
-[E:\extpascal\ExtPascalUtils.pas]
+[A:\ExtPascal\ExtJSWrapper\ExtFixes.txt]
ModuleType=TSourceModule
+
+[A:\ExtPascal\ExtJSWrapper\Ext.pas]
+ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
+[A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt]
ModuleType=TSourceModule
-[E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js]
+[A:\ExtPascal\ExtPascal.pas]
ModuleType=TSourceModule
-
-[E:\extpascal\ExtPascal.pas]
-ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtJSWrapper\ExtOld.pas]
+[A:\ExtPascal\ExtPascalUtils.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
[EditWindow0]
-ViewCount=7
-CurrentEditView=E:\extpascal\ExtJSWrapper\Ext.pas
+ViewCount=6
+CurrentEditView=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
View0=0
View1=1
View2=2
View3=3
View4=4
View5=5
-View6=6
PercentageSizes=1
Create=1
Visible=1
@@ -78,101 +66,89 @@
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=1648
-LeftPanelClients=DockSite2
-LeftPanelData=00000800010100000000C11D00000000000001700600000000000001000000003125000009000000446F636B5369746532FFFFFFFF
+LeftPanelSize=0
RightPanelSize=0
-BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B5369746531D430000000000000002406000000000000FFFFFFFF
-BottomMiddlePanelSize=1348
-BottomMiddlePanelClients=DockSite0,GraphDrawingModel,MessageView
-BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577AA280000000000000244050000000000000100000000AA2800000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomPanelSize=1578
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001000100000009000000446F636B5369746531724500000000000000E5090000000000000100000000724500000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomMiddlePanelSize=0
+BottomMiddlePanelClients=DockSite0,GraphDrawingModel
+BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779A1D00000000000002F206000000000000FFFFFFFF
+TabDockLeftClients=DockSite2=0
[View0]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\Ext.pas
-CursorX=3
-CursorY=12711
-TopLine=12757
+Module=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
+CursorX=1
+CursorY=15
+TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\Ext.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
[View1]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
-CursorX=1
-CursorY=15
-TopLine=13
+Module=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
+CursorX=25
+CursorY=77
+TopLine=62
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
[View2]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascal.pas
+Module=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
CursorX=1
-CursorY=814
-TopLine=1
+CursorY=73
+TopLine=51
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascal.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
[View3]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-CursorX=48
-CursorY=26
-TopLine=1
+Module=A:\ExtPascal\ExtPascal.pas
+CursorX=1
+CursorY=814
+TopLine=797
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+EditViewName=A:\ExtPascal\ExtPascal.pas
[View4]
CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
-CursorX=20
-CursorY=625
-TopLine=5
+Module=A:\ExtPascal\ExtPascalUtils.pas
+CursorX=27
+CursorY=450
+TopLine=444
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
+EditViewName=A:\ExtPascal\ExtPascalUtils.pas
[View5]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascalUtils.pas
-CursorX=43
-CursorY=293
-TopLine=284
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ExtPascalUtils.pas
-
-[View6]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtOld.pas
-CursorX=52
-CursorY=35805
-TopLine=35799
+Module=A:\ExtPascal\ExtJSWrapper\Ext.pas
+CursorX=45
+CursorY=42739
+TopLine=42741
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtOld.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\Ext.pas
[Watches]
Count=5
@@ -192,20 +168,20 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
-LRDockWidth=13602
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=211
+LRDockWidth=13600
Dockable=1
StayOnTop=0
[Breakpoints]
Count=1
-Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',734,'',0,1,'',1,0,0,'',1,'','','',0,''
+Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',747,'',0,1,'',1,0,0,'',1,'','','',0,''
[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
@@ -219,17 +195,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
@@ -241,14 +217,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=9053
+Width=2000
+Height=1422
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9053
-TBDockHeight=5898
-LRDockWidth=2352
+ClientWidth=2000
+ClientHeight=1422
+TBDockHeight=5900
+LRDockWidth=2350
Dockable=1
StayOnTop=0
@@ -260,14 +236,14 @@
State=0
Left=0
Top=23
-Width=8328
-Height=1123
+Width=10000
+Height=1322
MaxLeft=-1
MaxTop=-1
-ClientWidth=8328
-ClientHeight=1123
-TBDockHeight=1123
-LRDockWidth=2766
+ClientWidth=10000
+ClientHeight=1322
+TBDockHeight=1322
+LRDockWidth=2769
Dockable=1
StayOnTop=0
@@ -279,13 +255,13 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=7158
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=7156
LRDockWidth=2000
Dockable=1
StayOnTop=0
@@ -296,16 +272,16 @@
Visible=0
Docked=1
State=0
-Left=0
-Top=291
-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
@@ -320,14 +296,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=410
-LRDockWidth=4953
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=411
+LRDockWidth=4950
Dockable=1
StayOnTop=0
@@ -339,13 +315,13 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=211
LRDockWidth=7406
Dockable=1
StayOnTop=0
@@ -362,14 +338,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
+ClientWidth=3825
+ClientHeight=1044
TBDockHeight=1533
-LRDockWidth=3484
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -381,14 +357,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=2061
-LRDockWidth=3484
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=2056
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -400,14 +376,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=4883
-LRDockWidth=7148
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=2231
Dockable=1
StayOnTop=0
@@ -419,17 +395,17 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=9014
-LRDockWidth=1891
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=8878
+LRDockWidth=1894
Dockable=1
StayOnTop=0
-SplitPos=111
+SplitPos=131
[TFileExplorerForm]
PercentageSizes=1
@@ -437,15 +413,15 @@
Visible=0
Docked=1
State=0
-Left=78
-Top=15
+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
@@ -458,14 +434,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
@@ -477,14 +453,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
@@ -496,14 +472,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
@@ -521,16 +497,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
@@ -542,14 +518,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=4883
-LRDockWidth=5305
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=5306
Dockable=1
StayOnTop=0
@@ -559,15 +535,15 @@
Visible=0
Docked=1
State=0
-Left=0
-Top=-72
+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
@@ -580,13 +556,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
@@ -599,13 +575,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
@@ -618,14 +594,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=1543
-LRDockWidth=8742
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=1544
+LRDockWidth=8744
Dockable=1
StayOnTop=0
Column0Width=200
@@ -644,14 +620,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=3672
-LRDockWidth=1891
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=3678
+LRDockWidth=1894
Dockable=1
StayOnTop=0
@@ -663,14 +639,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
@@ -687,14 +663,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
@@ -711,14 +687,14 @@
State=0
Left=0
Top=23
-Width=3828
-Height=1416
+Width=3825
+Height=1322
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1416
-TBDockHeight=1416
-LRDockWidth=3828
+ClientWidth=3825
+ClientHeight=1322
+TBDockHeight=1322
+LRDockWidth=3825
Dockable=1
StayOnTop=0
TabPosition=1
@@ -726,26 +702,26 @@
TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow
[DockSite2]
-HostDockSite=DockLeftPanel
+HostDockSite=LeftDockTabSet
DockSiteType=1
PercentageSizes=1
Create=1
-Visible=1
+Visible=0
Docked=1
State=0
-Left=0
-Top=23
-Width=1648
-Height=9297
+Left=1600
+Top=49
+Width=2362
+Height=8878
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9297
-TBDockHeight=9014
-LRDockWidth=1648
+ClientWidth=2362
+ClientHeight=8878
+TBDockHeight=8878
+LRDockWidth=2362
Dockable=1
StayOnTop=0
TabPosition=1
-ActiveTabID=ProjectManager
-TabDockClients=ProjectManager,ToolForm,PropertyInspector,StructureView,DataExplorerContainer,ModelViewTool,ClassBrowserTool,TemplateView,TFileExplorerForm
+ActiveTabID=ToolForm
+TabDockClients=ToolForm,PropertyInspector,ProjectManager,DataExplorerContainer,StructureView,ModelViewTool,ClassBrowserTool,TemplateView,TFileExplorerForm
=======================================
--- /trunk/ExtPascalSamples/BasicTabPanel.pas Wed Mar 27 10:21:02 2013
+++ /trunk/ExtPascalSamples/BasicTabPanel.pas Sat Mar 30 13:46:36 2013
@@ -25,7 +25,7 @@
Height := 300;
CloseAction := 'hide';
with TExtTabPanel.AddTo(Items) do begin
- ActiveTabInteger := 0;
+ ActiveTab := 0;
with TExtPanel.AddTo(Items) do begin
Title := 'Hello World 1';
Html := 'Hello...';
=======================================
--- /trunk/ExtPascalSamples/LayoutWindow.pas Tue Mar 30 12:44:31 2010
+++ /trunk/ExtPascalSamples/LayoutWindow.pas Sat Mar 30 13:46:36 2013
@@ -28,7 +28,7 @@
Region := rgCenter;
Margins := SetMargins(3, 3, 3);
Defaults := JSObject('autoScroll:true');
- ActiveTabNumber := 0;
+ ActiveTab := 0;
OnTabChange := ExtTabPanelOnTabchange;
with TExtPanel.AddTo(Items) do begin
Title := 'Bogus Tab';
=======================================
--- /trunk/ExtPascalSamples/MessageBoxes.pas Tue Mar 30 12:44:31 2010
+++ /trunk/ExtPascalSamples/MessageBoxes.pas Sat Mar 30 13:46:36 2013
@@ -52,7 +52,7 @@
Width := 300;
Buttons := ExtMessageBox.OKCANCEL;
Multiline := true;
- AnimEl := 'ButtonMultiline';
+ AnimTarget:= 'ButtonMultiline';
Fn := JSFunction(ReadButtonJS);
end;
Handler := ExtMessageBox.Show(ShowConfig);
@@ -63,12 +63,12 @@
Text := Id;
ShowConfig := TExtShowConfig.Create;
with ShowConfig do begin
- Title := 'Save Changes?';
- Msg := 'You are closing a tab that has unsaved
changes.<br/>Would you like to save your changes?';
- Icon := ExtMessageBox.QUESTION;
- Buttons := ExtMessageBox.YESNOCANCEL;
- AnimEl := Id;
- Fn := Ajax(ReadButtonAjax, ['ButtonID', '%0']);
+ Title := 'Save Changes?';
+ Msg := 'You are closing a tab that has unsaved
changes.<br/>Would you like to save your changes?';
+ Icon := ExtMessageBox.QUESTION;
+ Buttons := ExtMessageBox.YESNOCANCEL;
+ AnimTarget := Id;
+ Fn := Ajax(ReadButtonAjax, ['ButtonID', '%0']);
end;
Handler := ExtMessageBox.Show(ShowConfig);
ShowConfig.Free;
@@ -83,7 +83,7 @@
Progress := true;
Msg := 'Loading items...';
Wait := true;
- AnimEl := Id;
+ AnimTarget := Id;
ProgressText := 'Loading...';
WaitConfig := TExtProgressWaitConfig.Create;
with WaitConfig do begin
@@ -108,7 +108,7 @@
Width := 300;
Wait := true;
Icon := 'ext-mb-download';
- AnimEl := Id;
+ AnimTarget := Id;
ProgressText := 'Saving...';
WaitConfig := TExtProgressWaitConfig.Create;
with WaitConfig do begin
=======================================
--- /trunk/ExtPascalSamples/Session.pas Wed Mar 27 10:21:02 2013
+++ /trunk/ExtPascalSamples/Session.pas Sat Mar 30 13:46:36 2013
@@ -136,11 +136,12 @@
Width := 600;
Height := 400;
Modal := true;
- with TExtUxCodePress.AddTo(Items) do begin
+(* with
+ TExtUxCodePress.AddTo(Items) do begin
ReadOnly := true;
Code := Lines;
end;
- if Proc <> 'ShowSource' then
+*) if Proc <> 'ShowSource' then
AddShowSourceButton(Buttons, 'Session', 'ShowSource');
Show;
Free;
=======================================
--- /trunk/ExtPascalUtils.pas Thu Mar 28 06:48:07 2013
+++ /trunk/ExtPascalUtils.pas Sat Mar 30 13:46:36 2013
@@ -148,7 +148,7 @@
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; Remove :
boolean = true) : boolean;
+function Before(const BeforeS, AfterS : string; var 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;
@@ -441,13 +441,13 @@
EnumToJSString(TypeInfo(TCSSUnit), ord(CSSUnit))])
end;
-function Before(const BeforeS, AfterS : string; var S : string; Remove :
boolean = true) : boolean;
+function Before(const BeforeS, AfterS : string; var S : string) : boolean;
var
- I : integer;
+ I, J : integer;
begin
I := pos(BeforeS, S);
- Result := (I <> 0) and (I < pos(AfterS, S));
- if Remove and Result then delete(S, 1, pos(AfterS, S) + length(AfterS));
+ J := pos(AfterS, S);
+ Result := (I <> 0) and (((J <> 0) and (I < J)) or (J = 0));
end;
function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
Author: wanderl...@gmail.com
Date: Sat Mar 30 13:46:36 2013
Log: Updating examples for Ext JS 4.2
http://code.google.com/p/extpascal/source/detail?r=808
Modified:
/trunk/ExtJSWrapper/Ext.pas
/trunk/ExtJSWrapper/ExtFixes.txt
/trunk/ExtJSWrapper/ExtToPascal.dpr
/trunk/ExtJSWrapper/ExtToPascal.dsk
/trunk/ExtPascalSamples/BasicTabPanel.pas
/trunk/ExtPascalSamples/LayoutWindow.pas
/trunk/ExtPascalSamples/MessageBoxes.pas
/trunk/ExtPascalSamples/Session.pas
/trunk/ExtPascalUtils.pas
=======================================
--- /trunk/ExtJSWrapper/Ext.pas Thu Mar 28 06:48:07 2013
+++ /trunk/ExtJSWrapper/Ext.pas Sat Mar 30 13:46:36 2013
File is too large to display a diff.
=======================================
--- /trunk/ExtJSWrapper/ExtFixes.txt Wed Mar 27 10:21:02 2013
+++ /trunk/ExtJSWrapper/ExtFixes.txt Sat Mar 30 13:46:36 2013
@@ -1,4 +1,4 @@
-* For Ext JS 3.0 and later
+* For Ext JS 4.0 and later
* USED FORMATS in ExtFixes.txt
*
* Adding new classes:
@@ -10,6 +10,12 @@
* Changing a property type to enumeration
<class name>,<JavaScript property name>,<(enumerated list)>
*
+* Changing a type to enumeration
+<type name>,<(enumerated list)>
+*
+* Aliasing a type
+<type name>,<alias>
+*
* Adding and updating methods:
<class name>,<JavaScript method name>,<return type or void>,<if is a
static method>,<if is a overload method>
*
@@ -22,9 +28,67 @@
* For each event parameter:
<parameter name>,<type>
*
+ExtComponent, split, Boolean, false, true,
+ExtComponent, cmargins, string, false, true,
+ExtComponent, minSize, Integer, false, true,
+ExtComponent, maxSize, Integer, false, true,
+ExtComponent, anchor, string, false, true,
+ExtDataRecord, TExtDataModel
+ExtDataModel, Create,, true, false, Data, ExtObjectList, false
+
ExtEnumsLayout, (laAbsolute, laAccordion, laAnchor, laAutocomponent,
laAutocontainer, laBorder, laBox, laCard, laCheckboxgroup, laColumn,
laContainer, laFit, laForm, laHbox, laTable, laVbox)
ExtMessageBox, ExtWindowMessageBox, singleton, Ext.MessageBox
+ExtWindowMessageBox, show, ExtFunction, false, false, Config,
ExtShowConfig, false
+
+ExtMessageBoxSingleton, ERROR, string, true, false, 'ext-mb-error'
+ExtMessageBoxSingleton, INFO, string, true, false, 'ext-mb-info'
+ExtMessageBoxSingleton, QUESTION, string, true, false, 'ext-mb-question'
+ExtMessageBoxSingleton, WARNING, string, true, false, 'ext-mb-warning'
+ExtMessageBoxSingleton, OK, Integer, true, false, 1
+ExtMessageBoxSingleton, YES, Integer, true, false, 2
+ExtMessageBoxSingleton, NO, Integer, true, false, 4
+ExtMessageBoxSingleton, CANCEL, Integer, true, false, 8
+ExtMessageBoxSingleton, OKCANCEL, Integer, true, false, 9
+ExtMessageBoxSingleton, YESNO, Integer, true, false, 6
+ExtMessageBoxSingleton, YESNOCANCEL, Integer, true, false, 14
+
+ExtShowConfig,, Ext, Object
+ExtShowConfig, animTarget, string, false, true,
+ExtShowConfig, buttons, Integer, false, true,
+ExtShowConfig, closable, Boolean, false, true, true
+ExtShowConfig, cls, string, false, true,
+ExtShowConfig, defaultTextHeight, Integer, false, true, 75
+ExtShowConfig, fn, ExtFunction, false, true,
+ExtShowConfig, scope, ExtObject, false, true,
+ExtShowConfig, icon, string, false, true,
+ExtShowConfig, iconCls, string, false, true,
+ExtShowConfig, defaultFocus, string, false, true,
+ExtShowConfig, maxWidth, Integer, false, true, 600
+ExtShowConfig, minWidth, Integer, false, true, 100
+ExtShowConfig, modal, Boolean, false, true, true
+ExtShowConfig, msg, string, false, true,
+ExtShowConfig, multiline, Boolean, false, true,
+ExtShowConfig, progress, Boolean, false, true,
+ExtShowConfig, progressText, string, false, true,
+ExtShowConfig, prompt, Boolean, false, true,
+ExtShowConfig, proxyDrag, Boolean, false, true,
+ExtShowConfig, title, string, false, true,
+ExtShowConfig, value, string, false, true,
+ExtShowConfig, wait, Boolean, false, true,
+ExtShowConfig, waitConfig, ExtProgressWaitConfig, false, true,
+ExtShowConfig, width, Integer, false, true,
+ExtProgressWaitConfig,, Ext, Object
+ExtProgressWaitConfig, duration, Integer, false, true,
+ExtProgressWaitConfig, interval, Integer, false, true, 1000
+ExtProgressWaitConfig, animate, Boolean, false, true,
+ExtProgressWaitConfig, increment, Integer, false, true, 10
+ExtProgressWaitConfig, text, string, false, true,
+ExtProgressWaitConfig, fn, ExtFunction, false, true,
+ExtProgressWaitConfig, scope, ExtObject, false, true,
+
+
+
*ExtBoxComponent, region, (rgCenter, rgNorth, rgEast, rgSouth, rgWest)
*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)
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dpr Wed Mar 27 10:21:02 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dpr Sat Mar 30 13:46:36 2013
@@ -12,7 +12,7 @@
uses
SysUtils, StrUtils, Classes, ExtPascalUtils
-, Ext
+//, Ext
;
{.$DEFINE USES_PUBLISHED}
@@ -426,17 +426,17 @@
IsEvent, Optional, Static, Singleton: boolean;
I, Ci : integer;
begin
- if Before('@protected', '*/', Line, false) or
- Before('@ignore', '*/', Line, false) or
- Before('@deprecated','*/', Line, false) or
- Before('@abstract', '*/', Line, false) then exit;
+ if Before('@protected', '*/', Line) or
+ Before('@ignore', '*/', Line) or
+ Before('@deprecated','*/', Line) or
+ Before('@abstract', '*/', Line) then exit;
State := Initial;
Matches := TStringList.Create;
while true do begin
case State of
Initial : begin
JSName := '';
- Singleton := Before('@singleton', 'Ext.define(', Line, false);
+ Singleton := Before('@singleton', 'Ext.define(', Line);
Extract(['/**', '*/'], Line, Matches);
if (JSName <> '') or
Extract(['Ext.define(' + AP, AP], Line, Matches) or
@@ -449,7 +449,7 @@
else
CurClass := TClass(AllClasses.Objects[Ci]);
State := InClass;
- if not Singleton then Singleton := Before('singleton:', '}',
Line, false);
+ if not Singleton then Singleton := Before('singleton:', '}',
Line);
if Singleton then CurClass.Name := CurClass.Name + 'Singleton';
CurClass.Singleton := Singleton;
continue;
@@ -474,7 +474,10 @@
Between('@deprecated','/**', '*/', Line) or
Between('@protected', '/**', '*/', Line) then continue;
begin
- Config := Extract(['@cfg {', '} ', ' '], Line, Matches);
+ if Before('@cfg {', '@property {', Line) then
+ Config := Extract(['@cfg {', '} ', ' '], Line, Matches)
+ else
+ Config := False;
// To do Extract(['@property ', ' ', '@type ', ' '], Line,
Matches) PropName = Matches[0]; PropType = Matches[2]
if Config or Extract(['@property {', '} ', ' '], Line, Matches)
then begin
PropName := Matches[1];
@@ -483,7 +486,7 @@
if I <> 0 then
PropName := copy(PropName, 1, I-1); // Default value ****
if FixIdent(PropName) = '' then continue; // Discard
properties nameless
- if Before('@static', '*/', Line, false) then Static := true;
+ if Before('@static', '*/', Line) then Static := true;
if IsUppercase(PropName) then Static := true;
PropName := Unique(FixIdent(PropName), CurClass.Properties);
if not Static then PropName[1] := LowerCase(PropName)[1];
@@ -492,6 +495,7 @@
continue; // Discard duplicates
end;
Matches[0] :=
ReplaceStr(Matches[0], 'Object/Object[]', 'Object[]');
+ Matches[0] :=
ReplaceStr(Matches[0], 'String/Number', 'Number/String');
PropTypes := Explode('/', Matches[0]);
if (pos('"', Matches[0]) <> 0) and (PropTypes.Count <> 0) then
begin // Enumeration
CurProp := TProp.Create(PropName, PropName, 'string',
Static, Config);
@@ -510,8 +514,8 @@
CurClass.Properties.AddObject(FixIdent(PropName +
Sufix(FixType(PropTypes[I]))),
TProp.Create(PropName +
Sufix(FixType(PropTypes[I])), PropName, PropTypes[I], Static, Config));
//if Extract([PropName, ':', ','], Line, Matches) then begin
- if (Before('Default to', '*/', Line, false) and
Extract(['Default to', '.'], Line, Matches)) or
- (Before('Defaults to', '*/', Line, false) and
Extract(['Defaults to', '.'], Line, Matches)) then begin
+ if (Before('Default to', '*/', Line) and Extract(['Default
to', '.'], Line, Matches)) or
+ (Before('Defaults to', '*/', Line) and Extract(['Defaults
to', '.'], Line, Matches)) then begin
SetDefault(CurProp, Matches[0], Matches);
if (CurProp.Default <> '') and not CurClass.Defaults then
begin
CurClass.Defaults := true;
@@ -543,7 +547,13 @@
Between('@protected', '/**', '*/', Line) or
Between('@deprecated', '/**', '*/', Line) or
Between('@template', '/**', '*/', Line) then continue;
- IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches);
+ if Before('@event ', ': function', Line) then
+ IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches)
+ else
+ if Before('/**', ': function', Line) then
+ IsEvent := False
+ else
+ IsEvent := Extract(['@event ', ' ', '*/'], Line, Matches);
if IsEvent or Extract(['/**', '*/', ': function'], Line, Matches)
then begin
JSName := IfThen(IsEvent, Matches[0], Matches[1]);
if (length(JSName) > 30) or (FixIdent(JSName) = '') or // Doc
fault
@@ -730,6 +740,12 @@
if NewClass.Singleton then NewClass.Name := NewClass.Name
+ 'Singleton';
AllClasses.AddObject(NewClass.Name, NewClass);
end
+ else
+ if Fields.Count = 2 then begin // Aliasing a type
+ Fields[0] := 'T' + Fields[0];
+ if Unresolved.IndexOfName(Fields[0]) = -1 then
+ Unresolved.Add(Fields[0] + '=' + Fields[1]);
+ end
else
writeln(^M^J'*** WARNING: Class ', Fields[0], ' does not
exist. ***'^M^J);
finally
@@ -1193,7 +1209,6 @@
writeln(Pas, 'type');
for J := 0 to AllClasses.Count-1 do // forward classes
writeln(Pas, Tab, TClass(AllClasses.Objects[J]).Name, ' = class;');
-// writeln(Pas, Tab, 'TExtDataRecord = TExtDataModel;');
WriteUnresolvedClasses;
writeln(Pas);
AllClasses.Sorted := false;
=======================================
--- /trunk/ExtJSWrapper/ExtToPascal.dsk Thu Mar 28 06:48:07 2013
+++ /trunk/ExtJSWrapper/ExtToPascal.dsk Sat Mar 30 13:46:36 2013
@@ -1,75 +1,63 @@
[Closed Files]
-File_0=TSourceModule,'E:\extpascal\ext-4.2.0\src\AbstractComponent.js',0,1,7,23,583,0,0,,
-File_1=TSourceModule,'E:\Temp\Surface.js',0,1,19,36,308,0,0,,
-File_2=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6619,1,6644,0,0,,
-File_3=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22820,1,22860,0,0,,
-File_4=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtUtil.pas',0,1,1050,37,1073,0,0,,
-File_5=TSourceModule,'E:\extpascal\ext-4.1.1a\src\grid\plugin\Editing.js',0,1,147,33,196,0,0,,
-File_6=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtDd.pas',0,1,285,32,308,0,0,,
-File_7=TSourceModule,'E:\extpascal\FCGIApp.pas',0,1,210,28,231,0,0,,
-File_8=TSourceModule,'E:\extpascal\ext-4.1.1a\src\Ajax.js',0,1,1,4,2,0,0,,
-File_9=TSourceModule,'E:\extpascal\ext-4.1.1a\src\AbstractManager.js',0,1,70,24,19,0,0,,
-File_10=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\Loader.js',0,1,1,22,1261,0,0,,
-File_11=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\lang\Error.js',0,1,68,28,127,0,0,,
-File_12=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\ClassManager.js',0,1,1482,32,1505,0,0,,
-File_13=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\MixedCollection.js',0,1,1,4,2,0,0,,
-File_14=TSourceModule,'E:\extpascal\ext-4.1.1a\src\view\AbstractView.js',0,1,1,4,2,0,0,,
-File_15=TSourceModule,'E:\extpascal\ext-4.1.1a\src\window\MessageBox.js',0,1,867,8,890,0,0,,
-File_16=TSourceModule,'E:\extpascal\ext-4.1.1a\src\ZIndexManager.js',0,1,499,8,522,0,0,,
-File_17=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\HashMap.js',0,1,1,14,33,0,0,,
-File_18=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\dom\AbstractElement.insertion.js',0,1,1,12,2,0,0,,
-File_19=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\EventManager.js',0,1,1,1,1,0,0,,
+File_0=TSourceModule,'A:\ExtPascal\Ext.pas',0,1,8140,3,8156,0,0,,
+File_1=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\source\rtl\common\System.Classes.pas',0,1,6619,1,6644,0,0,,
+File_2=TSourceModule,'c:\program files (x86)\embarcadero\rad
studio\10.0\SOURCE\RTL\SYS\System.pas',0,1,22820,1,22860,0,0,,
+File_3=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtUtil.pas',0,1,1050,37,1073,0,0,,
+File_4=TSourceModule,'E:\extpascal\ext-4.1.1a\src\grid\plugin\Editing.js',0,1,147,33,196,0,0,,
+File_5=TSourceModule,'E:\extpascal\ExtJSWrapper\ExtDd.pas',0,1,285,32,308,0,0,,
+File_6=TSourceModule,'E:\extpascal\FCGIApp.pas',0,1,210,28,231,0,0,,
+File_7=TSourceModule,'E:\extpascal\ext-4.1.1a\src\Ajax.js',0,1,1,4,2,0,0,,
+File_8=TSourceModule,'E:\extpascal\ext-4.1.1a\src\AbstractManager.js',0,1,70,24,19,0,0,,
+File_9=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\Loader.js',0,1,1,22,1261,0,0,,
+File_10=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\lang\Error.js',0,1,68,28,127,0,0,,
+File_11=TSourceModule,'E:\extpascal\ext-4.1.1a\src\core\src\class\ClassManager.js',0,1,1482,32,1505,0,0,,
+File_12=TSourceModule,'E:\extpascal\ext-4.1.1a\src\util\MixedCollection.js',0,1,1,4,2,0,0,,
+File_13=TSourceModule,'E:\extpascal\ext-4.1.1a\src\view\AbstractView.js',0,1,1,4,2,0,0,,
+File_14=TSourceModule,'E:\extpascal\ext-4.1.1a\src\window\MessageBox.js',0,1,867,8,890,0,0,,
[Modules]
-Module0=E:\extpascal\ExtJSWrapper\Ext.pas
-Module1=E:\extpascal\ExtJSWrapper\ExtToPascal.dproj
-Module2=E:\extpascal\ExtPascalUtils.pas
-Module3=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-Module4=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
-Module5=E:\extpascal\ExtPascal.pas
-Module6=E:\extpascal\ExtJSWrapper\ExtOld.pas
-Count=7
+Module0=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj
+Module1=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
+Module2=A:\ExtPascal\ExtJSWrapper\Ext.pas
+Module3=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
+Module4=A:\ExtPascal\ExtPascal.pas
+Module5=A:\ExtPascal\ExtPascalUtils.pas
+Count=6
EditWindowCount=1
-[E:\extpascal\ExtJSWrapper\Ext.pas]
-ModuleType=TSourceModule
-FormState=0
-FormOnTop=0
-
-[E:\extpascal\ExtJSWrapper\ExtToPascal.dproj]
+[A:\ExtPascal\ExtJSWrapper\ExtToPascal.dproj]
ModuleType=TBaseProject
-[E:\extpascal\ExtPascalUtils.pas]
+[A:\ExtPascal\ExtJSWrapper\ExtFixes.txt]
ModuleType=TSourceModule
+
+[A:\ExtPascal\ExtJSWrapper\Ext.pas]
+ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtJSWrapper\ExtFixes.txt]
+[A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt]
ModuleType=TSourceModule
-[E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js]
+[A:\ExtPascal\ExtPascal.pas]
ModuleType=TSourceModule
-
-[E:\extpascal\ExtPascal.pas]
-ModuleType=TSourceModule
FormState=0
FormOnTop=0
-[E:\extpascal\ExtJSWrapper\ExtOld.pas]
+[A:\ExtPascal\ExtPascalUtils.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
[EditWindow0]
-ViewCount=7
-CurrentEditView=E:\extpascal\ExtJSWrapper\Ext.pas
+ViewCount=6
+CurrentEditView=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
View0=0
View1=1
View2=2
View3=3
View4=4
View5=5
-View6=6
PercentageSizes=1
Create=1
Visible=1
@@ -78,101 +66,89 @@
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=1648
-LeftPanelClients=DockSite2
-LeftPanelData=00000800010100000000C11D00000000000001700600000000000001000000003125000009000000446F636B5369746532FFFFFFFF
+LeftPanelSize=0
RightPanelSize=0
-BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B5369746531D430000000000000002406000000000000FFFFFFFF
-BottomMiddlePanelSize=1348
-BottomMiddlePanelClients=DockSite0,GraphDrawingModel,MessageView
-BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E6756696577AA280000000000000244050000000000000100000000AA2800000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomPanelSize=1578
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001000100000009000000446F636B5369746531724500000000000000E5090000000000000100000000724500000F0000004D65737361676556696577466F726DFFFFFFFF
+BottomMiddlePanelSize=0
+BottomMiddlePanelClients=DockSite0,GraphDrawingModel
+BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779A1D00000000000002F206000000000000FFFFFFFF
+TabDockLeftClients=DockSite2=0
[View0]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\Ext.pas
-CursorX=3
-CursorY=12711
-TopLine=12757
+Module=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
+CursorX=1
+CursorY=15
+TopLine=1
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\Ext.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtToPascal.dpr
[View1]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
-CursorX=1
-CursorY=15
-TopLine=13
+Module=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
+CursorX=25
+CursorY=77
+TopLine=62
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtToPascal.dpr
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtFixes.txt
[View2]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascal.pas
+Module=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
CursorX=1
-CursorY=814
-TopLine=1
+CursorY=73
+TopLine=51
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtPascal.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\ExtFixes3.txt
[View3]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtFixes.txt
-CursorX=48
-CursorY=26
-TopLine=1
+Module=A:\ExtPascal\ExtPascal.pas
+CursorX=1
+CursorY=814
+TopLine=797
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtFixes.txt
+EditViewName=A:\ExtPascal\ExtPascal.pas
[View4]
CustomEditViewType=TEditView
-Module=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
-CursorX=20
-CursorY=625
-TopLine=5
+Module=A:\ExtPascal\ExtPascalUtils.pas
+CursorX=27
+CursorY=450
+TopLine=444
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ext-4.2.0\src\dom\AbstractElement.js
+EditViewName=A:\ExtPascal\ExtPascalUtils.pas
[View5]
-CustomEditViewType=TEditView
-Module=E:\extpascal\ExtPascalUtils.pas
-CursorX=43
-CursorY=293
-TopLine=284
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=E:\extpascal\ExtPascalUtils.pas
-
-[View6]
CustomEditViewType=TEditView
-Module=E:\extpascal\ExtJSWrapper\ExtOld.pas
-CursorX=52
-CursorY=35805
-TopLine=35799
+Module=A:\ExtPascal\ExtJSWrapper\Ext.pas
+CursorX=45
+CursorY=42739
+TopLine=42741
LeftCol=1
Elisions=
Bookmarks=
-EditViewName=E:\extpascal\ExtJSWrapper\ExtOld.pas
+EditViewName=A:\ExtPascal\ExtJSWrapper\Ext.pas
[Watches]
Count=5
@@ -192,20 +168,20 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
-LRDockWidth=13602
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=211
+LRDockWidth=13600
Dockable=1
StayOnTop=0
[Breakpoints]
Count=1
-Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',734,'',0,1,'',1,0,0,'',1,'','','',0,''
+Breakpoint0='E:\extpascal\ExtJSWrapper\ExtToPascal.dpr',747,'',0,1,'',1,0,0,'',1,'','','',0,''
[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
@@ -219,17 +195,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
@@ -241,14 +217,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=9053
+Width=2000
+Height=1422
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9053
-TBDockHeight=5898
-LRDockWidth=2352
+ClientWidth=2000
+ClientHeight=1422
+TBDockHeight=5900
+LRDockWidth=2350
Dockable=1
StayOnTop=0
@@ -260,14 +236,14 @@
State=0
Left=0
Top=23
-Width=8328
-Height=1123
+Width=10000
+Height=1322
MaxLeft=-1
MaxTop=-1
-ClientWidth=8328
-ClientHeight=1123
-TBDockHeight=1123
-LRDockWidth=2766
+ClientWidth=10000
+ClientHeight=1322
+TBDockHeight=1322
+LRDockWidth=2769
Dockable=1
StayOnTop=0
@@ -279,13 +255,13 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=7158
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=7156
LRDockWidth=2000
Dockable=1
StayOnTop=0
@@ -296,16 +272,16 @@
Visible=0
Docked=1
State=0
-Left=0
-Top=291
-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
@@ -320,14 +296,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=410
-LRDockWidth=4953
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=411
+LRDockWidth=4950
Dockable=1
StayOnTop=0
@@ -339,13 +315,13 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=215
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=211
LRDockWidth=7406
Dockable=1
StayOnTop=0
@@ -362,14 +338,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
+ClientWidth=3825
+ClientHeight=1044
TBDockHeight=1533
-LRDockWidth=3484
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -381,14 +357,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=2061
-LRDockWidth=3484
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=2056
+LRDockWidth=3481
Dockable=1
StayOnTop=0
@@ -400,14 +376,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=4883
-LRDockWidth=7148
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=2231
Dockable=1
StayOnTop=0
@@ -419,17 +395,17 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=9014
-LRDockWidth=1891
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=8878
+LRDockWidth=1894
Dockable=1
StayOnTop=0
-SplitPos=111
+SplitPos=131
[TFileExplorerForm]
PercentageSizes=1
@@ -437,15 +413,15 @@
Visible=0
Docked=1
State=0
-Left=78
-Top=15
+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
@@ -458,14 +434,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
@@ -477,14 +453,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
@@ -496,14 +472,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
@@ -521,16 +497,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
@@ -542,14 +518,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=4883
-LRDockWidth=5305
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=4878
+LRDockWidth=5306
Dockable=1
StayOnTop=0
@@ -559,15 +535,15 @@
Visible=0
Docked=1
State=0
-Left=0
-Top=-72
+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
@@ -580,13 +556,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
@@ -599,13 +575,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
@@ -618,14 +594,14 @@
State=0
Left=0
Top=0
-Width=3828
-Height=1172
+Width=3825
+Height=1044
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1172
-TBDockHeight=1543
-LRDockWidth=8742
+ClientWidth=3825
+ClientHeight=1044
+TBDockHeight=1544
+LRDockWidth=8744
Dockable=1
StayOnTop=0
Column0Width=200
@@ -644,14 +620,14 @@
State=0
Left=0
Top=0
-Width=1648
-Height=7109
+Width=2362
+Height=8600
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=7109
-TBDockHeight=3672
-LRDockWidth=1891
+ClientWidth=2362
+ClientHeight=8600
+TBDockHeight=3678
+LRDockWidth=1894
Dockable=1
StayOnTop=0
@@ -663,14 +639,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
@@ -687,14 +663,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
@@ -711,14 +687,14 @@
State=0
Left=0
Top=23
-Width=3828
-Height=1416
+Width=3825
+Height=1322
MaxLeft=-1
MaxTop=-1
-ClientWidth=3828
-ClientHeight=1416
-TBDockHeight=1416
-LRDockWidth=3828
+ClientWidth=3825
+ClientHeight=1322
+TBDockHeight=1322
+LRDockWidth=3825
Dockable=1
StayOnTop=0
TabPosition=1
@@ -726,26 +702,26 @@
TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow
[DockSite2]
-HostDockSite=DockLeftPanel
+HostDockSite=LeftDockTabSet
DockSiteType=1
PercentageSizes=1
Create=1
-Visible=1
+Visible=0
Docked=1
State=0
-Left=0
-Top=23
-Width=1648
-Height=9297
+Left=1600
+Top=49
+Width=2362
+Height=8878
MaxLeft=-1
MaxTop=-1
-ClientWidth=1648
-ClientHeight=9297
-TBDockHeight=9014
-LRDockWidth=1648
+ClientWidth=2362
+ClientHeight=8878
+TBDockHeight=8878
+LRDockWidth=2362
Dockable=1
StayOnTop=0
TabPosition=1
-ActiveTabID=ProjectManager
-TabDockClients=ProjectManager,ToolForm,PropertyInspector,StructureView,DataExplorerContainer,ModelViewTool,ClassBrowserTool,TemplateView,TFileExplorerForm
+ActiveTabID=ToolForm
+TabDockClients=ToolForm,PropertyInspector,ProjectManager,DataExplorerContainer,StructureView,ModelViewTool,ClassBrowserTool,TemplateView,TFileExplorerForm
=======================================
--- /trunk/ExtPascalSamples/BasicTabPanel.pas Wed Mar 27 10:21:02 2013
+++ /trunk/ExtPascalSamples/BasicTabPanel.pas Sat Mar 30 13:46:36 2013
@@ -25,7 +25,7 @@
Height := 300;
CloseAction := 'hide';
with TExtTabPanel.AddTo(Items) do begin
- ActiveTabInteger := 0;
+ ActiveTab := 0;
with TExtPanel.AddTo(Items) do begin
Title := 'Hello World 1';
Html := 'Hello...';
=======================================
--- /trunk/ExtPascalSamples/LayoutWindow.pas Tue Mar 30 12:44:31 2010
+++ /trunk/ExtPascalSamples/LayoutWindow.pas Sat Mar 30 13:46:36 2013
@@ -28,7 +28,7 @@
Region := rgCenter;
Margins := SetMargins(3, 3, 3);
Defaults := JSObject('autoScroll:true');
- ActiveTabNumber := 0;
+ ActiveTab := 0;
OnTabChange := ExtTabPanelOnTabchange;
with TExtPanel.AddTo(Items) do begin
Title := 'Bogus Tab';
=======================================
--- /trunk/ExtPascalSamples/MessageBoxes.pas Tue Mar 30 12:44:31 2010
+++ /trunk/ExtPascalSamples/MessageBoxes.pas Sat Mar 30 13:46:36 2013
@@ -52,7 +52,7 @@
Width := 300;
Buttons := ExtMessageBox.OKCANCEL;
Multiline := true;
- AnimEl := 'ButtonMultiline';
+ AnimTarget:= 'ButtonMultiline';
Fn := JSFunction(ReadButtonJS);
end;
Handler := ExtMessageBox.Show(ShowConfig);
@@ -63,12 +63,12 @@
Text := Id;
ShowConfig := TExtShowConfig.Create;
with ShowConfig do begin
- Title := 'Save Changes?';
- Msg := 'You are closing a tab that has unsaved
changes.<br/>Would you like to save your changes?';
- Icon := ExtMessageBox.QUESTION;
- Buttons := ExtMessageBox.YESNOCANCEL;
- AnimEl := Id;
- Fn := Ajax(ReadButtonAjax, ['ButtonID', '%0']);
+ Title := 'Save Changes?';
+ Msg := 'You are closing a tab that has unsaved
changes.<br/>Would you like to save your changes?';
+ Icon := ExtMessageBox.QUESTION;
+ Buttons := ExtMessageBox.YESNOCANCEL;
+ AnimTarget := Id;
+ Fn := Ajax(ReadButtonAjax, ['ButtonID', '%0']);
end;
Handler := ExtMessageBox.Show(ShowConfig);
ShowConfig.Free;
@@ -83,7 +83,7 @@
Progress := true;
Msg := 'Loading items...';
Wait := true;
- AnimEl := Id;
+ AnimTarget := Id;
ProgressText := 'Loading...';
WaitConfig := TExtProgressWaitConfig.Create;
with WaitConfig do begin
@@ -108,7 +108,7 @@
Width := 300;
Wait := true;
Icon := 'ext-mb-download';
- AnimEl := Id;
+ AnimTarget := Id;
ProgressText := 'Saving...';
WaitConfig := TExtProgressWaitConfig.Create;
with WaitConfig do begin
=======================================
--- /trunk/ExtPascalSamples/Session.pas Wed Mar 27 10:21:02 2013
+++ /trunk/ExtPascalSamples/Session.pas Sat Mar 30 13:46:36 2013
@@ -136,11 +136,12 @@
Width := 600;
Height := 400;
Modal := true;
- with TExtUxCodePress.AddTo(Items) do begin
+(* with
+ TExtUxCodePress.AddTo(Items) do begin
ReadOnly := true;
Code := Lines;
end;
- if Proc <> 'ShowSource' then
+*) if Proc <> 'ShowSource' then
AddShowSourceButton(Buttons, 'Session', 'ShowSource');
Show;
Free;
=======================================
--- /trunk/ExtPascalUtils.pas Thu Mar 28 06:48:07 2013
+++ /trunk/ExtPascalUtils.pas Sat Mar 30 13:46:36 2013
@@ -148,7 +148,7 @@
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; Remove :
boolean = true) : boolean;
+function Before(const BeforeS, AfterS : string; var 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;
@@ -441,13 +441,13 @@
EnumToJSString(TypeInfo(TCSSUnit), ord(CSSUnit))])
end;
-function Before(const BeforeS, AfterS : string; var S : string; Remove :
boolean = true) : boolean;
+function Before(const BeforeS, AfterS : string; var S : string) : boolean;
var
- I : integer;
+ I, J : integer;
begin
I := pos(BeforeS, S);
- Result := (I <> 0) and (I < pos(AfterS, S));
- if Remove and Result then delete(S, 1, pos(AfterS, S) + length(AfterS));
+ J := pos(AfterS, S);
+ Result := (I <> 0) and (((J <> 0) and (I < J)) or (J = 0));
end;
function Between(const S, BeforeS, AfterS : string; var T : string;
Remove : boolean = true) : boolean;
Reply all
Reply to author
Forward
0 new messages