diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index 2ada56675b..ed671389f1 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -482,18 +482,24 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() } else if (dynamic_cast(uiItem)) { + menuBuilder.subMenuStart("Import"); menuBuilder << "RicImportSummaryCaseFeature"; menuBuilder << "RicImportSummaryCasesFeature"; menuBuilder << "RicImportEnsembleFeature"; + menuBuilder.subMenuEnd(); + menuBuilder.addSeparator(); menuBuilder << "RicNewSummaryPlotFeature"; menuBuilder << "RicNewSummaryCrossPlotFeature"; menuBuilder.addSeparator(); } else if (dynamic_cast(uiItem)) { + menuBuilder.subMenuStart("Import"); menuBuilder << "RicImportSummaryCaseFeature"; menuBuilder << "RicImportSummaryCasesFeature"; menuBuilder << "RicImportEnsembleFeature"; + menuBuilder.subMenuEnd(); + menuBuilder.addSeparator(); menuBuilder << "RicNewSummaryPlotFeature"; menuBuilder << "RicNewSummaryCrossPlotFeature"; menuBuilder.addSeparator(); diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index d598cf9919..b233d92bf8 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -391,18 +391,17 @@ void RiuMainWindow::createMenus() importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature")); importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCasesFeature")); importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportEnsembleFeature")); - importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportObservedDataInMenuFeature")); importMenu->addSeparator(); - QMenu* importWellMenu = importMenu->addMenu(QIcon(":/Well.png"), "Wells"); + QMenu* importWellMenu = importMenu->addMenu(QIcon(":/Well.png"), "Well Data"); importWellMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportFileFeature")); importWellMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportSsihubFeature")); importWellMenu->addAction(cmdFeatureMgr->action("RicWellLogsImportFileFeature")); - + importWellMenu->addAction(cmdFeatureMgr->action("RicImportFormationNamesFeature")); + importMenu->addSeparator(); - QMenu* importFormationsMenu = importMenu->addMenu(QIcon(":/FormationCollection16x16.png"), "Formations"); - importFormationsMenu->addAction(cmdFeatureMgr->action("RicImportFormationNamesFeature")); - importFormationsMenu->addAction(cmdFeatureMgr->action("RicWellPathFormationsImportFileFeature")); + importMenu->addAction(cmdFeatureMgr->action("RicImportObservedDataInMenuFeature")); + importMenu->addAction(cmdFeatureMgr->action("RicWellPathFormationsImportFileFeature")); QMenu* exportMenu = fileMenu->addMenu("&Export"); exportMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToFileFeature")); diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp index b05000e771..02277e6de8 100644 --- a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp @@ -197,18 +197,17 @@ void RiuPlotMainWindow::createMenus() importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature")); importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCasesFeature")); importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportEnsembleFeature")); - importSummaryMenu->addAction(cmdFeatureMgr->action("RicImportObservedDataInMenuFeature")); importMenu->addSeparator(); - QMenu* importWellMenu = importMenu->addMenu(QIcon(":/Well.png"), "Wells"); + QMenu* importWellMenu = importMenu->addMenu(QIcon(":/Well.png"), "Well Data"); importWellMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportFileFeature")); importWellMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportSsihubFeature")); importWellMenu->addAction(cmdFeatureMgr->action("RicWellLogsImportFileFeature")); - + importWellMenu->addAction(cmdFeatureMgr->action("RicWellPathFormationsImportFileFeature")); + importMenu->addSeparator(); - QMenu* importFormationsMenu = importMenu->addMenu(QIcon(":/FormationCollection16x16.png"), "Formations"); - importFormationsMenu->addAction(cmdFeatureMgr->action("RicImportFormationNamesFeature")); - importFormationsMenu->addAction(cmdFeatureMgr->action("RicWellPathFormationsImportFileFeature")); + importMenu->addAction(cmdFeatureMgr->action("RicImportObservedDataInMenuFeature")); + importMenu->addAction(cmdFeatureMgr->action("RicImportFormationNamesFeature")); QMenu* exportMenu = fileMenu->addMenu("&Export"); exportMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToFileFeature"));