diff --git a/IDE/src/ui/GenerateDialog.bf b/IDE/src/ui/GenerateDialog.bf index df18cfab..bd870f94 100644 --- a/IDE/src/ui/GenerateDialog.bf +++ b/IDE/src/ui/GenerateDialog.bf @@ -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; } diff --git a/IDE/src/ui/ProjectPanel.bf b/IDE/src/ui/ProjectPanel.bf index fedf9188..2e05a409 100644 --- a/IDE/src/ui/ProjectPanel.bf +++ b/IDE/src/ui/ProjectPanel.bf @@ -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();*/ });