Browse Source

CH: bug fixes in general

Jean-Francois Goulet 20 years ago
parent
commit
ea69dd160f
5 changed files with 12 additions and 7 deletions
  1. 3 1
      LuaEdit/AddToPrj.pas
  2. 2 2
      LuaEdit/EditorSettings.pas
  3. 2 2
      LuaEdit/LuaEdit.dof
  4. BIN
      LuaEdit/LuaEdit.res
  5. 5 2
      LuaEdit/Main.pas

+ 3 - 1
LuaEdit/AddToPrj.pas

@@ -87,6 +87,8 @@ end;
 procedure TfrmAddToPrj.FormCreate(Sender: TObject);
 procedure TfrmAddToPrj.FormCreate(Sender: TObject);
 begin
 begin
   lstFiles := TStringList.Create;
   lstFiles := TStringList.Create;
+  lstFiles.QuoteChar := '"';
+  lstFiles.Delimiter := ',';
 end;
 end;
 
 
 procedure TfrmAddToPrj.FormDestroy(Sender: TObject);
 procedure TfrmAddToPrj.FormDestroy(Sender: TObject);
@@ -100,7 +102,7 @@ var
 begin
 begin
   if chkExisting.Checked then
   if chkExisting.Checked then
   begin
   begin
-    lstFiles.CommaText := txtExistingFile.Text;
+    lstFiles.DelimitedText := txtExistingFile.Text;
     ModalResult := mrOk;
     ModalResult := mrOk;
 
 
     for x := 0 to lstFiles.Count - 1 do
     for x := 0 to lstFiles.Count - 1 do

+ 2 - 2
LuaEdit/EditorSettings.pas

@@ -379,7 +379,7 @@ begin
   end;
   end;
 
 
   // Writing environement settings
   // Writing environement settings
-  pIniFile.WriteString('Environement', 'LibrariesSearchPaths', txtLibraries.Text);
+  pIniFile.WriteString('Environement', 'LibrariesSearchPaths', '"' + txtLibraries.Text + '"');
 
 
   //Writing display settings
   //Writing display settings
   pIniFile.WriteBool('Display', 'ShowGutter', chkShowGutter.Checked);
   pIniFile.WriteBool('Display', 'ShowGutter', chkShowGutter.Checked);
@@ -485,7 +485,7 @@ begin
   chkKeepReportOpened.Checked := KeepSIFWindowOpened;
   chkKeepReportOpened.Checked := KeepSIFWindowOpened;
   txtUndoLimit.Text := IntToStr(Main.UndoLimit);
   txtUndoLimit.Text := IntToStr(Main.UndoLimit);
   txtTabWidth.Text := IntToStr(Main.TabWidth);
   txtTabWidth.Text := IntToStr(Main.TabWidth);
-  txtLibraries.Text := LibrariesSearchPaths.CommaText;
+  txtLibraries.Text := LibrariesSearchPaths.DelimitedText;
   chkShowGutter.Checked := Main.ShowGutter;
   chkShowGutter.Checked := Main.ShowGutter;
   chkShowLineNumbers.Checked := Main.ShowLineNumbers;
   chkShowLineNumbers.Checked := Main.ShowLineNumbers;
   chkLeadingZeros.Checked := Main.LeadingZeros;
   chkLeadingZeros.Checked := Main.LeadingZeros;

+ 2 - 2
LuaEdit/LuaEdit.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=2
 MajorVer=2
 MinorVer=2
 MinorVer=2
 Release=1
 Release=1
-Build=878
+Build=882
 Debug=0
 Debug=0
 PreRelease=0
 PreRelease=0
 Special=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 [Version Info Keys]
 CompanyName=Open Source
 CompanyName=Open Source
 FileDescription=IDE for Lua 5.0.2
 FileDescription=IDE for Lua 5.0.2
-FileVersion=2.2.1.878
+FileVersion=2.2.1.882
 InternalName=LuaEdit
 InternalName=LuaEdit
 LegalCopyright=LuaEdit Copyright 2004-2005 ©
 LegalCopyright=LuaEdit Copyright 2004-2005 ©
 LegalTrademarks=
 LegalTrademarks=

BIN
LuaEdit/LuaEdit.res


+ 5 - 2
LuaEdit/Main.pas

@@ -1798,6 +1798,8 @@ begin
   SearchedInFilesText := TStringList.Create;
   SearchedInFilesText := TStringList.Create;
   ReplacedText := TStringList.Create;
   ReplacedText := TStringList.Create;
   LibrariesSearchPaths := TStringList.Create;
   LibrariesSearchPaths := TStringList.Create;
+  LibrariesSearchPaths.QuoteChar := '"';
+  LibrariesSearchPaths.Delimiter := ',';
   LuaSingleUnits := TLuaProject.Create('');
   LuaSingleUnits := TLuaProject.Create('');
   LuaSingleUnits.sPrjName := '[@@SingleUnits@@]';
   LuaSingleUnits.sPrjName := '[@@SingleUnits@@]';
   LuaProjects.Add(LuaSingleUnits);
   LuaProjects.Add(LuaSingleUnits);
@@ -5930,6 +5932,7 @@ end;
 procedure TfrmMain.LoadEditorSettings;
 procedure TfrmMain.LoadEditorSettings;
 var
 var
   pIniFile: TIniFile;
   pIniFile: TIniFile;
+  test: String;
 begin
 begin
   pIniFile := TIniFile.Create(ExtractFilePath(Application.ExeName)+'LuaEdit.ini');
   pIniFile := TIniFile.Create(ExtractFilePath(Application.ExeName)+'LuaEdit.ini');
   EditorColors.Clear;
   EditorColors.Clear;
@@ -5958,8 +5961,8 @@ begin
   KeepSIFWindowOpened := pIniFile.ReadBool('General', 'KeepSIFWindowOpened', True);
   KeepSIFWindowOpened := pIniFile.ReadBool('General', 'KeepSIFWindowOpened', True);
 
 
   // Reading Environment settings
   // Reading Environment settings
-  LibrariesSearchPaths.CommaText := pIniFile.ReadString('Environement', 'LibrariesSearchPaths', ExtractFilePath(Application.ExeName)+'Libraries');
-  
+  LibrariesSearchPaths.DelimitedText := pIniFile.ReadString('Environement', 'LibrariesSearchPaths', ExtractFilePath(Application.ExeName)+'Libraries');
+
   //Reading display settings
   //Reading display settings
   ShowGutter := pIniFile.ReadBool('Display', 'ShowGutter', True);
   ShowGutter := pIniFile.ReadBool('Display', 'ShowGutter', True);
   ShowLineNumbers := pIniFile.ReadBool('Display', 'ShowLineNumbers', False);
   ShowLineNumbers := pIniFile.ReadBool('Display', 'ShowLineNumbers', False);