Janitor: Fix some minor GUI issues

Use appendMenu instead of context command builder Remove case name from import grid feature Fix shortcut for feature
OPM · Oct 16, 2024 · e07443e · e07443e
1 parent 62a6ea6
commit e07443e
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 30 deletions.
diff --git a/...ationLibCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp b/...ationLibCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
@@ -71,7 +71,7 @@ void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actio
     actionToSetup->setText( "Create Plot from Last Used Template" );
     actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
 
-    QKeySequence keySeq( Qt::CTRL, Qt::Key_T );
+    QKeySequence keySeq( Qt::CTRL | Qt::Key_T );
 
     applyShortcutWithHintToAction( actionToSetup, keySeq );
 }
diff --git a/ApplicationLibCode/Commands/RicImportGridModelFromSummaryCaseFeature.cpp b/ApplicationLibCode/Commands/RicImportGridModelFromSummaryCaseFeature.cpp
@@ -63,10 +63,5 @@ void RicImportGridModelFromSummaryCaseFeature::setupActionLook( QAction* actionT
         txt = "Import Grid Model";
     }
 
-    if ( !summaryCaseName.isEmpty() )
-    {
-        txt += QString( " for '%1'" ).arg( summaryCaseName );
-    }
-
     actionToSetup->setText( txt );
 }
diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -790,30 +790,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
             menuBuilder << "RicConvertGroupToEnsembleFeature";
             menuBuilder.addSeparator();
         }
-        else if ( dynamic_cast<RimSummaryCase*>( firstUiItem ) )
-        {
-            menuBuilder << "RicShowDataSourcesForRealization";
-            menuBuilder.addSeparator();
-
-            menuBuilder.subMenuStart( "Import" );
-            menuBuilder << "RicImportSummaryCaseFeature";
-            menuBuilder << "RicImportSummaryCasesFeature";
-            menuBuilder << "RicImportSummaryGroupFeature";
-            menuBuilder << "RicImportEnsembleFeature";
-            menuBuilder.subMenuEnd();
-            menuBuilder.addSeparator();
-            menuBuilder << "RicNewSummaryMultiPlotFeature";
-            menuBuilder << "RicOpenSummaryPlotEditorFeature";
-            menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
-            menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";
-            menuBuilder.addSeparator();
-            menuBuilder << "RicImportGridModelFromSummaryCaseFeature";
-
-            if ( !dynamic_cast<RimObservedSummaryData*>( firstUiItem ) )
-            {
-                menuBuilder << "RicShowSummaryCurveCalculatorFeature";
-            }
-        }
         else if ( dynamic_cast<RimWellLogChannel*>( firstUiItem ) )
         {
             menuBuilder << "RicAddWellLogToPlotFeature";

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
@@ -110,6 +110,15 @@ QString RimObservedSummaryData::customWellName() const
     return "";
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimObservedSummaryData::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
+{
+    // Do not show curve calculator for observed data
+    RimSummaryCase::appendMenuItems( menuBuilder, false );
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h
@@ -46,6 +46,8 @@ class RimObservedSummaryData : public RimSummaryCase
 protected:
     QString customWellName() const;
 
+    void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
+
 private:
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
@@ -27,6 +27,7 @@
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryEnsemble.h"
 
+#include "cafCmdFeatureMenuBuilder.h"
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiTreeOrdering.h"
@@ -224,6 +225,42 @@ void RimSummaryCase::buildChildNodes()
     m_dataVectorFolders->updateFolderStructure( addresses, m_caseId );
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCase::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
+{
+    appendMenuItems( menuBuilder, true );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCase::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder, bool showCurveCalculator ) const
+{
+    menuBuilder << "RicShowDataSourcesForRealization";
+    menuBuilder.addSeparator();
+
+    menuBuilder.subMenuStart( "Import" );
+    menuBuilder << "RicImportSummaryCaseFeature";
+    menuBuilder << "RicImportSummaryCasesFeature";
+    menuBuilder << "RicImportSummaryGroupFeature";
+    menuBuilder << "RicImportEnsembleFeature";
+    menuBuilder.subMenuEnd();
+    menuBuilder.addSeparator();
+    menuBuilder << "RicNewSummaryMultiPlotFeature";
+    menuBuilder << "RicOpenSummaryPlotEditorFeature";
+    menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
+    menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";
+    menuBuilder.addSeparator();
+    menuBuilder << "RicImportGridModelFromSummaryCaseFeature";
+
+    if ( showCurveCalculator )
+    {
+        menuBuilder << "RicShowSummaryCurveCalculatorFeature";
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
@@ -100,6 +100,8 @@ class RimSummaryCase : public caf::PdmObject
     virtual QString caseName() const = 0;
 
     void initAfterRead() override;
+    void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
+    void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder, bool showCurveCalculator ) const;
 
 private:
     void buildChildNodes();