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

file generation dropdown changes, dialog fix

Browse source
This commit is contained in:
EinBurgbauer 2021-12-12 13:10:30 +01:00
parent d0f0834463
commit 506f5b7d5d
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; evt.mCloseDialog = false;
}, null, 0, 1); }, null, 0, 1);
Title = "Generate"; Title = "Generate File";
mKindBar = new GenerateKindBar(this); mKindBar = new GenerateKindBar(this);
AddWidget(mKindBar); AddWidget(mKindBar);
@ -312,7 +312,7 @@ namespace IDE.ui
if ((generatorName == default) || (hash == default)) if ((generatorName == default) || (hash == default))
{ {
Close(); 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; return;
} }
@ -455,6 +455,8 @@ namespace IDE.ui
if (line.StartsWith("!error")) if (line.StartsWith("!error"))
{ {
ShowError(line.Substring(7)); ShowError(line.Substring(7));
RehupMinSize();
continue; 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) //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) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
var projectFolder = GetSelectedProjectFolder(); 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 = menu.AddItem("Import File...");
item.mOnMenuItemSelected.Add(new (item) => { mImportFileDeferred = true; /* ImportFile();*/ }); item.mOnMenuItemSelected.Add(new (item) => { mImportFileDeferred = true; /* ImportFile();*/ });