Permalink
Browse files

No commit message

  • Loading branch information...
pyscripter
pyscripter committed Dec 8, 2008
1 parent 24b686d commit 25c6d55dd37f772aeee2cd4c8b78b9396a521ed1
View
@@ -130,7 +130,7 @@
<Directories Name="UsePackages">False</Directories>
</Directories>
<Parameters>
- <Parameters Name="RunParams">--PYTHON25</Parameters>
+ <Parameters Name="RunParams"></Parameters>
<Parameters Name="HostApplication"></Parameters>
<Parameters Name="Launcher"></Parameters>
<Parameters Name="UseLauncher">False</Parameters>
@@ -175,7 +175,14 @@
<Language Name="ActiveLang"></Language>
<Language Name="ProjectLang">$00000000</Language>
<Language Name="RootDir"></Language>
- </Language> <Excluded_Packages>
+ </Language>
+
+
+
+
+
+
+ <Excluded_Packages>
<Excluded_Packages Name="c:\program files\borland\bds\4.0\Bin\bcbie100.bpl">Borland C++Builder Internet Explorer 5 Components Package</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
View
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
- <Transactions>
- <Transaction>2005/11/14 00:43:35.773.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTesting.pas</Transaction>
- <Transaction>2005/11/14 00:43:35.773.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTesting.dfm</Transaction>
- <Transaction>2005/11/14 00:45:32.220.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTesting.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTester.pas</Transaction>
- <Transaction>2005/11/14 00:45:32.220.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTesting.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmRegExpTester.dfm</Transaction>
- <Transaction>2005/12/08 15:21:32.860.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cCodeHint.pas</Transaction>
- <Transaction>2006/01/15 01:31:27.090.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvJVCLUtils.pas=</Transaction>
- <Transaction>2006/02/10 00:28:44.521.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCommandLine.pas</Transaction>
- <Transaction>2006/02/10 00:28:44.581.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCommandLine.dfm</Transaction>
- <Transaction>2006/02/21 20:25:49.517.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmCustomShortcuts.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCustomShortcuts.pas</Transaction>
- <Transaction>2006/02/21 20:25:49.517.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmCustomShortcuts.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCustomShortcuts.dfm</Transaction>
- <Transaction>2006/03/01 12:40:40.562.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgUnitTestWizard.pas</Transaction>
- <Transaction>2006/03/01 12:40:40.578.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgUnitTestWizard.dfm</Transaction>
- <Transaction>2006/03/02 18:46:32.272.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmUnitTests.pas</Transaction>
- <Transaction>2006/03/02 18:46:32.272.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmUnitTests.dfm</Transaction>
- <Transaction>2006/03/09 18:15:11.570.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cFilePersist.pas</Transaction>
- <Transaction>2006/03/11 03:13:48.806.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgPickList.pas</Transaction>
- <Transaction>2006/03/11 03:13:48.837.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgPickList.dfm</Transaction>
- <Transaction>2006/03/15 02:58:21.252.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgAboutPyScripter.pas=</Transaction>
- <Transaction>2006/03/15 02:58:21.267.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgAboutPyScripter.dfm=</Transaction>
- <Transaction>2006/03/16 15:15:14.125.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\uMMMXP_MainService.pas=</Transaction>
- <Transaction>2006/04/02 00:57:24.686.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvAppStorage.pas=</Transaction>
- <Transaction>2006/04/20 22:03:34.794.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cPyDebuggerBase.pas</Transaction>
- <Transaction>2006/04/21 04:39:58.954.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cPyDebuggerBase.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cPyBaseDebugger.pas</Transaction>
- <Transaction>2006/04/21 04:48:40.093.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cPyRemoteDebugger.pas</Transaction>
- <Transaction>2006/05/31 06:11:35.209.pas,C:\Delphi\progs32\PythonIDE\SynHighlighterMulti.pas=</Transaction>
- <Transaction>2006/06/01 00:25:36.274.pas,C:\Delphi\progs32\PythonIDE\SynEditHighlighter.pas=</Transaction>
- <Transaction>2006/08/08 23:18:38.734.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cFileTemplates.pas</Transaction>
- <Transaction>2006/08/12 19:08:01.975.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCodeTemplates.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgFileTemplates.pas</Transaction>
- <Transaction>2006/08/12 19:08:01.995.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgCodeTemplates.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgFileTemplates.dfm</Transaction>
- <Transaction>2006/08/15 00:51:31.074.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgNewFile.pas</Transaction>
- <Transaction>2006/08/15 00:51:31.154.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgNewFile.dfm</Transaction>
- <Transaction>2006/09/23 02:28:25.884.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\TinyWideStrings.pas</Transaction>
- <Transaction>2007/01/17 02:38:03.267.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvAppIniStorage.pas=</Transaction>
- <Transaction>2007/01/17 02:58:54.907.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvAppStorage.pas=</Transaction>
- <Transaction>2007/01/17 03:03:25.236.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvChangeNotify.pas=</Transaction>
- <Transaction>2007/01/17 03:05:22.374.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvCreateProcess.pas=</Transaction>
- <Transaction>2007/01/17 03:07:20.314.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvThread.pas=</Transaction>
- <Transaction>2007/01/17 03:10:47.602.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvTabBar.pas=</Transaction>
- <Transaction>2007/03/05 11:09:46.672.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDockVIDVCStyle.pas=</Transaction>
- <Transaction>2007/03/06 02:23:34.218.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDockVIDVCStyle.pas=</Transaction>
- <Transaction>2007/05/03 08:01:05.583.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\uDpiAware.pas</Transaction>
- <Transaction>2007/05/13 03:05:30.730.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgSearchText.pas=</Transaction>
- <Transaction>2007/05/13 03:05:30.730.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgSearchText.dfm=</Transaction>
- <Transaction>2007/05/13 03:07:02.071.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgReplaceText.pas=</Transaction>
- <Transaction>2007/05/13 03:07:02.071.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgReplaceText.dfm=</Transaction>
- <Transaction>2007/05/24 04:01:10.835.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\uSearchHighlighter.pas</Transaction>
- <Transaction>2007/06/09 00:51:42.636.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\VCLFlickerReduce.pas=</Transaction>
- <Transaction>2007/06/09 00:58:26.526.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\RtlVclOptimize.pas=</Transaction>
- <Transaction>2007/06/18 03:18:22.324.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDockTree.pas=</Transaction>
- <Transaction>2007/06/18 03:36:18.200.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvThreadDialog.pas=</Transaction>
- <Transaction>2007/09/21 04:45:01.154.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDockInfo.pas=</Transaction>
- <Transaction>2007/09/21 05:14:39.316.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDSAAppStorage.pas=</Transaction>
- <Transaction>2007/09/21 05:46:59.985.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvTabBar.pas=</Transaction>
- <Transaction>2007/09/21 05:48:55.433.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\JvDockSupportControl.pas=</Transaction>
- <Transaction>2007/11/30 23:49:55.665.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\cProjectClasses.pas</Transaction>
- <Transaction>2007/12/01 22:45:48.603.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmProjectExplorer.pas</Transaction>
- <Transaction>2007/12/01 22:45:48.603.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmProjectExplorer.dfm</Transaction>
- <Transaction>2007/12/12 04:05:30.431.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgImportDirectory.pas</Transaction>
- <Transaction>2007/12/12 04:05:30.431.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgImportDirectory.dfm</Transaction>
- <Transaction>2007/12/15 22:40:22.403.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgRunConfiguration.pas</Transaction>
- <Transaction>2007/12/15 22:40:22.423.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgRunConfiguration.dfm</Transaction>
- <Transaction>2008/03/04 17:59:03.241.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\SynEditKeyCmds.pas=</Transaction>
- <Transaction>2008/03/05 00:13:28.750.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\SynUnicode.pas=</Transaction>
- <Transaction>2008/03/06 06:18:52.130.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmDocView.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmWebPreview.pas</Transaction>
- <Transaction>2008/03/06 06:18:52.137.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmDocView.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\frmWebPreview.dfm</Transaction>
- <Transaction>2008/04/02 19:19:18.214.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.pas=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgPyIDEBase.pas</Transaction>
- <Transaction>2008/04/02 19:19:18.244.dfm,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\Unit1.dfm=C:\Sandbox\P4D\PythonForDelphi\PythonIDE\dlgPyIDEBase.dfm</Transaction>
- <Transaction>2008/06/16 00:59:53.175.pas,C:\Sandbox\P4D\PythonForDelphi\PythonIDE\SynHighlighterYAML.pas=</Transaction>
- </Transactions>
-</BorlandProject>
View
@@ -6125,6 +6125,7 @@ procedure TPythonEngine.DoRedirectIO;
'class DebugOutput:'+LF+
' pyio = __import__("pyio")'+LF+
' softspace=0'+LF+
+ ' encoding=None'+LF+
' def write(self,message):'+LF+
' self.pyio.write(message)'+LF+
' def readline(self, size=None):'+LF+
@@ -2925,7 +2925,8 @@ procedure TSynCompletionProposal.HandleOnCancel(Sender: TObject);
// ((F.CurrentEditor as TCustomSynEdit).Owner as TWinControl).SetFocus;
// end;
- (F.CurrentEditor as TCustomSynEdit).SetFocus;
+ if (F.CurrentEditor as TCustomSynEdit).CanFocus then //KV added line
+ (F.CurrentEditor as TCustomSynEdit).SetFocus;
{$IFDEF SYN_CLX}
GetParentForm( F.CurrentEditor ).Show;
@@ -3007,7 +3008,8 @@ procedure TSynCompletionProposal.HandleOnValidate(Sender: TObject;
//sending a WM_MOUSEDOWN message. The problem with the mouse down is
//that the editor would bounce back to the left margin, very irritating
InternalCancelCompletion;
- SetFocus;
+ if CanFocus then // KV added
+ SetFocus;
{$IFDEF SYN_CLX}
GetParentForm( F.CurrentEditor ).Show;
{$ENDIF}
View
@@ -16,6 +16,17 @@
language="*"/>
</dependentAssembly>
</dependency>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.VC90.CRT"
+ version="9.0.21022.8"
+ processorArchitecture="x86"
+ publicKeyToken="1fc8b3b9a1e18e3b"
+ language="*"/>
+ </dependentAssembly>
+ </dependency>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
View
Binary file not shown.
View
@@ -422,7 +422,7 @@ procedure TPyBaseInterpreter.HandlePyException(E: EPythonError; SkipFrames : int
procedure TPyBaseInterpreter.Initialize;
begin
// Execute python_init.py
- RunScript(CommandsDataModule.UserDataDir + EngineInitFile);
+ //RunScript(CommandsDataModule.UserDataDir + EngineInitFile);
// Add extra project paths
if Assigned(ActiveProject) then
View
@@ -1455,3 +1455,4 @@ procedure TPyInternalInterpreter.SysPathToStrings(Strings: WideStrings.TWideStri
+
View
@@ -14113,7 +14113,7 @@ object CommandsDataModule: TCommandsDataModule
end
object actPrinterSetup: TTntAction
Category = 'File'
- Caption = 'Printer &Setup...'
+ Caption = 'Printer Set&up...'
HelpContext = 310
HelpType = htContext
Hint = 'Printer setup'
View
@@ -535,7 +535,7 @@ object PyIDEMainForm: TPyIDEMainForm
Action = CommandsDataModule.actPageSetup
end
object PrinterSetup1: TSpTBXItem
- Caption = 'Printer &Setup...'
+ Caption = 'Printer Set&up...'
Hint = 'Printer setup'
Action = CommandsDataModule.actPrinterSetup
end
View
@@ -328,7 +328,7 @@
132, 134, 135, 136, 137, 138, 139, 140, 141, 146, 147, 150, 153, 155,
160, 164, 165, 166, 167, 168, 169, 171, 174, 178, (182), 186,
193, 195, 196, 197, (198), (201), (202), (204), (206), (208), (212), (219), (226),
- (228), (229), (234), (235), (237) fixed
+ (228), (229), (234), (235), (237), (253) fixed
Vista Compatibility issues (all resolved)
- Flip3D and Form preview (solved with LX)
@@ -3617,7 +3617,7 @@ procedure TPyIDEMainForm.FormShow(Sender: TObject);
end;
// Execute pyscripter_init.py
- InternalInterpreter.RunScript(CommandsDataModule.UserDataDir + PyScripterInitFile);
+ //InternalInterpreter.RunScript(CommandsDataModule.UserDataDir + PyScripterInitFile);
// This is needed to update the variables window
PyControl.DoStateChange(dsInactive);

0 comments on commit 25c6d55

Please sign in to comment.