pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Lazarus Trunk Fix (Thanks Juha Maninnen)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3169 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-06-14 17:19:39 +00:00
parent bb44723bea
commit bba6d27241
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wst/trunk/type_lib_edtr/uwsttypelibraryedit.pas
View File

@ -19,7 +19,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls,
ExtCtrls, Menus, ActnList, Contnrs, ExtCtrls, Menus, ActnList, Contnrs,
pastree, pascal_parser_intf, logger_intf, pastree, pascal_parser_intf, logger_intf, LCLVersion,
SynHighlighterPas, SynEdit, StdCtrls, SynHighlighterXML SynHighlighterPas, SynEdit, StdCtrls, SynHighlighterXML
{$IFDEF WST_IDE},ProjectIntf{$ENDIF}; {$IFDEF WST_IDE},ProjectIntf{$ENDIF};
@ -199,8 +199,7 @@ type
procedure FDFind(Sender : TObject); procedure FDFind(Sender : TObject);
procedure FDShow(Sender : TObject); procedure FDShow(Sender : TObject);
procedure FormClose (Sender : TObject; var CloseAction : TCloseAction ); procedure FormClose (Sender : TObject; var CloseAction : TCloseAction );
procedure FormDropFiles(Sender : TObject; const FileNames : array of String procedure FormDropFiles(Sender : TObject; const FileNames : array of String);
);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure trvSchemaSelectionChanged(Sender : TObject); procedure trvSchemaSelectionChanged(Sender : TObject);
private private
@ -244,11 +243,11 @@ var
implementation implementation
uses uses
view_helper, DOM, wst_fpc_xml, XMLWrite, //HeapTrc, view_helper, DOM, wst_fpc_xml, XMLWrite,
xsd_parser, wsdl_parser, source_utils, command_line_parser, generator, metadata_generator, xsd_parser, wsdl_parser, source_utils, command_line_parser, generator, metadata_generator,
binary_streamer, wst_resources_utils, xsd_generator, wsdl_generator, binary_streamer, wst_resources_utils, xsd_generator, wsdl_generator,
uabout, edit_helper, udm, ufrmsaveoption, pparser, SynEditTypes uabout, edit_helper, udm, ufrmsaveoption, pparser, SynEditTypes
{$IFDEF WST_IDE},LazIDEIntf,IDEMsgIntf{$ENDIF} {$IFDEF WST_IDE},LazIDEIntf,IDEMsgIntf, IDEExternToolIntf{$ENDIF}
, xsd_consts, parserutils, locators; , xsd_consts, parserutils, locators;
{$IFDEF WST_IDE} {$IFDEF WST_IDE}
@ -768,6 +767,26 @@ begin
end; end;
end; end;
{$IFDEF WST_IDE}
procedure ShowParsing(FileName: string);
begin
{$IF lcl_fullversion < 1030000}
IDEMessagesWindow.AddMsg(Format('Parsing %s...',[Filename]),ExtractFileDir(Filename),0);
{$ELSE}
IDEMessagesWindow.AddCustomMessage(mluNote, 'Parsing ...', Filename);
{$ENDIF}
end;
procedure ShowParsed(FileName: string);
begin
{$IF lcl_fullversion < 1030000}
IDEMessagesWindow.AddMsg(Format('File Parsed %s.',[Filename]),ExtractFileDir(Filename),0);
{$ELSE}
IDEMessagesWindow.AddCustomMessage(mluNote, 'File Parsed.', Filename);
{$ENDIF}
end;
{$ENDIF WST_IDE}
procedure TfWstTypeLibraryEdit.FormShow(Sender: TObject); procedure TfWstTypeLibraryEdit.FormShow(Sender: TObject);
var var
{$IFDEF WST_IDE} {$IFDEF WST_IDE}
@ -784,9 +803,9 @@ begin
locContent.LoadFromFile(prjFile.FileName); locContent.LoadFromFile(prjFile.FileName);
if ( locContent.Size > 0 ) then begin if ( locContent.Size > 0 ) then begin
locContent.Position := 0; locContent.Position := 0;
IDEMessagesWindow.AddMsg(Format('Parsing %s...',[prjFile.Filename]),ExtractFileDir(prjFile.Filename),0); ShowParsing(prjFile.Filename);
OpenFile(prjFile.Filename,locContent); OpenFile(prjFile.Filename,locContent);
IDEMessagesWindow.AddMsg(Format('File Parsed %s.',[prjFile.Filename]),ExtractFileDir(prjFile.Filename),0); ShowParsed(prjFile.Filename);
FProjectLibrary := prjFile; FProjectLibrary := prjFile;
end; end;
finally finally