administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix for PascalABC.NET for Linux

Browse source
This commit is contained in:
Ivan Bondarev 2022-10-23 14:57:07 +02:00
parent da05b63470
commit 1e1e9f009c
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
VisualPascalABCNETLinux/FileMonitoring.cs
View file

@ -88,6 +88,34 @@ namespace VisualPascalABC
} }
} }
void showChangedFileMessage()
{
string mes = null;
if (!File.Exists(fileName))
{
mes = Form1StringResources.Get("FILE_NOT_EXIST_MESSAGE");
if (MessageBox.Show(fileName + "\n\n" + mes, Form1StringResources.Get("CHANGED_FILE"), MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
WorkbenchServiceFactory.FileService.SetFileAsChanged(fileName);
}
else
{
WorkbenchServiceFactory.FileService.CloseFile(fileName);
}
return;
}
mes = Form1StringResources.Get("FILE_CHANGED_MESSAGE");
if (MessageBox.Show(fileName + "\n\n" + mes, Form1StringResources.Get("CHANGED_FILE"), MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
WorkbenchServiceFactory.FileService.ReloadFile(fileName);
}
else
{
WorkbenchServiceFactory.FileService.SetFileAsChanged(fileName);
}
}
void MainForm_Activated(object sender, EventArgs e) void MainForm_Activated(object sender, EventArgs e)
{ {
try try
@ -96,30 +124,8 @@ namespace VisualPascalABC
{ {
wasChangedExternally = false; wasChangedExternally = false;
string mes = null; WorkbenchServiceFactory.Workbench.MainForm.BeginInvoke((Action)showChangedFileMessage);
if (!File.Exists(fileName))
{
mes = Form1StringResources.Get("FILE_NOT_EXIST_MESSAGE");
if (MessageBox.Show(fileName + "\n\n" + mes, Form1StringResources.Get("CHANGED_FILE"), MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
WorkbenchServiceFactory.FileService.SetFileAsChanged(fileName);
}
else
{
WorkbenchServiceFactory.FileService.CloseFile(fileName);
}
return;
}
mes = Form1StringResources.Get("FILE_CHANGED_MESSAGE");
if (MessageBox.Show(fileName + "\n\n" + mes, Form1StringResources.Get("CHANGED_FILE"), MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
WorkbenchServiceFactory.FileService.ReloadFile(fileName);
}
else
{
WorkbenchServiceFactory.FileService.SetFileAsChanged(fileName);
}
} }
} }
catch (Exception ex) catch (Exception ex)

2
VisualPascalABCNETLinux/ReplaceForm.cs
View file

@ -103,7 +103,7 @@ namespace VisualPascalABC
return findSuccess; return findSuccess;
} }
if (cbSearchUp.Checked) if (cbSearchUp.Checked)
Match = Regex.Match(Form1.CurrentSyntaxEditor.TextEditor.Document.TextContent, 0, startOffset); Match = Regex.Match(Form1.CurrentSyntaxEditor.TextEditor.Document.TextContent, 0, Math.Max(startOffset, 0));
else else
Match = Regex.Match(Form1.CurrentSyntaxEditor.TextEditor.Document.TextContent, startOffset); Match = Regex.Match(Form1.CurrentSyntaxEditor.TextEditor.Document.TextContent, startOffset);