Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -re4dc5a2f979cd2d810010b683969c20d30bce846 -r2fb856472ed92ee1b51ff65cdb57e1ac751b85a5 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision e4dc5a2f979cd2d810010b683969c20d30bce846) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 2fb856472ed92ee1b51ff65cdb57e1ac751b85a5) @@ -444,8 +444,8 @@ .AddSeparator() .AddToggleRelevancyOfFailureMechanismItem(grassCoverErosionOutwardsFailureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); @@ -464,8 +464,8 @@ return builder.AddToggleRelevancyOfFailureMechanismItem(grassCoverErosionOutwardsFailureMechanismContext, RemoveAllViewsForItem) .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .Build(); } @@ -645,39 +645,40 @@ StrictContextMenuItem generateCalculationsItem = CreateGenerateWaveConditionsCalculationsItem(nodeData); - if (!isNestedGroup) - { - builder.AddCustomItem(generateCalculationsItem); - } - builder.AddExportItem() - .AddSeparator() - .AddCreateCalculationGroupItem(group) - .AddCreateCalculationItem(nodeData, AddWaveConditionsCalculation); + .AddSeparator(); if (!isNestedGroup) { - builder.AddSeparator() - .AddRemoveAllChildrenItem(); + builder.AddCustomItem(generateCalculationsItem) + .AddSeparator(); } - builder.AddSeparator() + builder.AddCreateCalculationGroupItem(group) + .AddCreateCalculationItem(nodeData, AddWaveConditionsCalculation) + .AddSeparator() + .AddRenameItem() .AddValidateAllCalculationsInGroupItem(nodeData, ValidateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup) - .AddClearAllCalculationOutputInGroupItem(group) - .AddSeparator(); + .AddSeparator() + .AddClearAllCalculationOutputInGroupItem(group); + if (!isNestedGroup) + { + builder.AddRemoveAllChildrenItem() + .AddSeparator(); + } + if (isNestedGroup) { - builder.AddRenameItem() - .AddDeleteItem() + builder.AddDeleteItem() .AddSeparator(); } - return builder.AddExpandAllItem() - .AddCollapseAllItem() + return builder.AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build(); @@ -831,17 +832,17 @@ return builder .AddExportItem() .AddSeparator() + .AddRenameItem() .AddValidateCalculationItem(nodeData, Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) - .AddClearCalculationOutputItem(calculation) .AddSeparator() - .AddRenameItem() + .AddClearCalculationOutputItem(calculation) .AddDeleteItem() .AddSeparator() - .AddExpandAllItem() .AddCollapseAllItem() + .AddExpandAllItem() .AddSeparator() .AddPropertiesItem() .Build();