Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Merge pull request #1273 from EinScott/generate-dialog

Browse source 
file generation dropdown changes, dialog fix
This commit is contained in:
Brian Fiete 2021-12-13 08:33:42 -05:00 • committed by GitHub
commit 902c038227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDE/src/ui/GenerateDialog.bf
View file

@ -262,7 +262,7 @@ namespace IDE.ui
evt.mCloseDialog = false;
}, null, 0, 1);
Title = "Generate";
Title = "Generate File";
mKindBar = new GenerateKindBar(this);
AddWidget(mKindBar);
@ -312,7 +312,7 @@ namespace IDE.ui
if ((generatorName == default) || (hash == default))
{
Close();
gApp.Fail(scope $"File '{filePath}' was not generated by a generator that include regeneration information");
gApp.Fail(scope $"File '{filePath}' was not generated by a generator that includes regeneration information");
return;
}
@ -455,6 +455,8 @@ namespace IDE.ui
if (line.StartsWith("!error"))
{
ShowError(line.Substring(7));
RehupMinSize();
continue;
}

21
IDE/src/ui/ProjectPanel.bf
View file

@ -2456,7 +2456,15 @@ namespace IDE.ui
});
}
if (let projectFolder = projectItem as ProjectFolder)
if (projectItem is ProjectSource)
{
item = menu.AddItem("Regenerate");
item.mOnMenuItemSelected.Add(new (item) =>
{
Regenerate(false);
});
}
else if (let projectFolder = projectItem as ProjectFolder)
{
//if (projectFolder.mIncludeKind == .Manual)
{
@ -2554,7 +2562,7 @@ namespace IDE.ui
}
});
item = menu.AddItem("Generate...");
item = menu.AddItem("Generate File...");
item.mOnMenuItemSelected.Add(new (item) =>
{
var projectFolder = GetSelectedProjectFolder();
@ -2565,15 +2573,6 @@ namespace IDE.ui
}
});
if ((projectItem != null) && (projectItem is ProjectSource) && (!isProject))
{
item = menu.AddItem("Regenerate");
item.mOnMenuItemSelected.Add(new (item) =>
{
Regenerate(false);
});
}
item = menu.AddItem("Import File...");
item.mOnMenuItemSelected.Add(new (item) => { mImportFileDeferred = true; /* ImportFile();*/ });