From 8dec8ba234b1aa48b402b71f53119bdb63202c68 Mon Sep 17 00:00:00 2001 From: Ruben Thoms Date: Tue, 6 Oct 2020 17:12:58 +0200 Subject: [PATCH] Refactoring: New icons for delete, refresh, copy, filters --- .../RicDeleteScriptPathFeature.cpp | 2 +- .../RicRefreshScriptsFeature.cpp | 2 +- .../RicCopyReferencesToClipboardFeature.cpp | 2 +- .../Commands/RicCloseCaseFeature.cpp | 2 +- .../Commands/RicCloseObservedDataFeature.cpp | 2 +- .../Commands/RicCloseSourSimDataFeature.cpp | 2 +- ...RicCloseSummaryCaseInCollectionFeature.cpp | 2 +- .../Commands/RicDeleteItemFeature.cpp | 2 +- .../Commands/RicDeleteSubItemsFeature.cpp | 2 +- .../RicDeleteSummaryCaseCollectionFeature.cpp | 2 +- .../RicDeleteTemporaryLgrsFeature.cpp | 2 +- ...icDeleteWellMeasurementFilePathFeature.cpp | 2 +- .../Commands/RicGeoMechCopyCaseFeature.cpp | 2 +- .../Commands/RicRecursiveFileSearchDialog.cpp | 2 +- .../Commands/RicReloadCaseFeature.cpp | 2 +- .../RicReloadFormationNamesFeature.cpp | 2 +- .../Commands/RicReloadSummaryCaseFeature.cpp | 2 +- .../RicReloadWellMeasurementsFeature.cpp | 2 +- ...RicReloadWellPathFormationNamesFeature.cpp | 2 +- .../SurfaceCommands/RicCopySurfaceFeature.cpp | 2 +- .../RicReloadSurfaceFeature.cpp | 2 +- .../Ric3dWellLogCurveDeleteFeature.cpp | 2 +- .../RicDeletePltPlotFeature.cpp | 2 +- .../RicDeleteRftPlotFeature.cpp | 2 +- .../RicDeleteSubPlotFeature.cpp | 2 +- .../RicWellLogFileCloseFeature.cpp | 2 +- .../RicDeletePolylineTargetFeature.cpp | 2 +- .../RicDeleteWellPathAttributeFeature.cpp | 4 +- .../RicDeleteWellPathTargetFeature.cpp | 2 +- .../RicWellPathDeleteFeature.cpp | 2 +- ApplicationCode/Resources/Close.svg | 19 ++++++++ ApplicationCode/Resources/Copy.svg | 15 +++++++ ApplicationCode/Resources/Erase.svg | 14 ++++++ ApplicationCode/Resources/Filter.svg | 16 +++++++ .../Resources/FilterCollection.svg | 43 +++++++++++++++++++ ApplicationCode/Resources/Refresh.svg | 23 ++++++++++ ApplicationCode/Resources/ResInsight.qrc | 6 +++ .../UserInterface/RiuTextDialog.cpp | 4 +- 38 files changed, 169 insertions(+), 33 deletions(-) create mode 100644 ApplicationCode/Resources/Close.svg create mode 100644 ApplicationCode/Resources/Copy.svg create mode 100644 ApplicationCode/Resources/Erase.svg create mode 100644 ApplicationCode/Resources/Filter.svg create mode 100644 ApplicationCode/Resources/FilterCollection.svg create mode 100644 ApplicationCode/Resources/Refresh.svg diff --git a/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp index 41b3a7fd33..4636689e00 100644 --- a/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp +++ b/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp @@ -73,6 +73,6 @@ void RicDeleteScriptPathFeature::onActionTriggered( bool isChecked ) void RicDeleteScriptPathFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Script Path" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/OctaveScriptCommands/RicRefreshScriptsFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicRefreshScriptsFeature.cpp index a1e788fd61..b052c7adca 100644 --- a/ApplicationCode/Commands/OctaveScriptCommands/RicRefreshScriptsFeature.cpp +++ b/ApplicationCode/Commands/OctaveScriptCommands/RicRefreshScriptsFeature.cpp @@ -50,7 +50,7 @@ void RicRefreshScriptsFeature::onActionTriggered( bool isChecked ) void RicRefreshScriptsFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Refresh" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp index 0c42ca0fbd..064862a03a 100644 --- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp +++ b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp @@ -96,7 +96,7 @@ void RicCopyReferencesToClipboardFeature::onActionTriggered( bool isChecked ) void RicCopyReferencesToClipboardFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Copy" ); - actionToSetup->setIcon( QIcon( ":/Copy.png" ) ); + actionToSetup->setIcon( QIcon( ":/Copy.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Copy ); } diff --git a/ApplicationCode/Commands/RicCloseCaseFeature.cpp b/ApplicationCode/Commands/RicCloseCaseFeature.cpp index 04c22c3622..16711d1680 100644 --- a/ApplicationCode/Commands/RicCloseCaseFeature.cpp +++ b/ApplicationCode/Commands/RicCloseCaseFeature.cpp @@ -106,7 +106,7 @@ void RicCloseCaseFeature::onActionTriggered( bool isChecked ) void RicCloseCaseFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Close" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Close.png" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/RicCloseObservedDataFeature.cpp b/ApplicationCode/Commands/RicCloseObservedDataFeature.cpp index f046ada15d..93be515e67 100644 --- a/ApplicationCode/Commands/RicCloseObservedDataFeature.cpp +++ b/ApplicationCode/Commands/RicCloseObservedDataFeature.cpp @@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT( RicCloseObservedDataFeature, "RicCloseObservedDataFeature" void RicCloseObservedDataFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Close" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Close.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicCloseSourSimDataFeature.cpp b/ApplicationCode/Commands/RicCloseSourSimDataFeature.cpp index d5e9e8f72b..72617ecf05 100644 --- a/ApplicationCode/Commands/RicCloseSourSimDataFeature.cpp +++ b/ApplicationCode/Commands/RicCloseSourSimDataFeature.cpp @@ -53,7 +53,7 @@ void RicCloseSourSimDataFeature::onActionTriggered( bool isChecked ) void RicCloseSourSimDataFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Close SourSim Data" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Close.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp b/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp index bef9338edb..8a687c126e 100644 --- a/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp +++ b/ApplicationCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp @@ -48,7 +48,7 @@ CAF_CMD_SOURCE_INIT( RicCloseSummaryCaseInCollectionFeature, "RicCloseSummaryCas void RicCloseSummaryCaseInCollectionFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Close Summary Cases" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Close.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicDeleteItemFeature.cpp b/ApplicationCode/Commands/RicDeleteItemFeature.cpp index ec7a1ce4a3..1390853925 100644 --- a/ApplicationCode/Commands/RicDeleteItemFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteItemFeature.cpp @@ -111,6 +111,6 @@ void RicDeleteItemFeature::onActionTriggered( bool isChecked ) void RicDeleteItemFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp b/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp index d61fe8cccf..0ec67b29fa 100644 --- a/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp @@ -105,7 +105,7 @@ void RicDeleteSubItemsFeature::onActionTriggered( bool isChecked ) void RicDeleteSubItemsFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Sub Items" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp b/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp index d3b7916cbb..b7af5220a8 100644 --- a/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp @@ -132,7 +132,7 @@ void RicDeleteSummaryCaseCollectionFeature::onActionTriggered( bool isChecked ) void RicDeleteSummaryCaseCollectionFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Summary Case Group/Ensemble" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp b/ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp index 1ca6de3590..b8cc003717 100644 --- a/ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteTemporaryLgrsFeature.cpp @@ -80,6 +80,6 @@ void RicDeleteTemporaryLgrsFeature::onActionTriggered( bool isChecked ) void RicDeleteTemporaryLgrsFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Temporary LGRs" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/RicDeleteWellMeasurementFilePathFeature.cpp b/ApplicationCode/Commands/RicDeleteWellMeasurementFilePathFeature.cpp index 429e3ff15d..e5d91cb9d4 100644 --- a/ApplicationCode/Commands/RicDeleteWellMeasurementFilePathFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteWellMeasurementFilePathFeature.cpp @@ -64,5 +64,5 @@ void RicDeleteWellMeasurementFilePathFeature::onActionTriggered( bool isChecked void RicDeleteWellMeasurementFilePathFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Well Measurement File" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); } diff --git a/ApplicationCode/Commands/RicGeoMechCopyCaseFeature.cpp b/ApplicationCode/Commands/RicGeoMechCopyCaseFeature.cpp index 6a1b235882..2c2ba885f4 100644 --- a/ApplicationCode/Commands/RicGeoMechCopyCaseFeature.cpp +++ b/ApplicationCode/Commands/RicGeoMechCopyCaseFeature.cpp @@ -84,6 +84,6 @@ void RicGeoMechCopyCaseFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicGeoMechCopyCaseFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setIcon( QIcon( ":/Copy.png" ) ); + actionToSetup->setIcon( QIcon( ":/Copy.svg" ) ); actionToSetup->setText( "Copy and Replace Input" ); } diff --git a/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp b/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp index b3f8ac8031..83f96ac00d 100644 --- a/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp +++ b/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp @@ -554,7 +554,7 @@ void RicRecursiveFileSearchDialog::slotFileListCustomMenuRequested( const QPoint QMenu menu; QAction* action; - action = new QAction( QIcon( ":/Copy.png" ), "&Copy", this ); + action = new QAction( QIcon( ":/Copy.svg" ), "&Copy", this ); connect( action, SIGNAL( triggered() ), SLOT( slotCopyFileItemText() ) ); menu.addAction( action ); menu.addSeparator(); diff --git a/ApplicationCode/Commands/RicReloadCaseFeature.cpp b/ApplicationCode/Commands/RicReloadCaseFeature.cpp index 1d7b51ac80..5478a218d9 100644 --- a/ApplicationCode/Commands/RicReloadCaseFeature.cpp +++ b/ApplicationCode/Commands/RicReloadCaseFeature.cpp @@ -82,5 +82,5 @@ void RicReloadCaseFeature::onActionTriggered( bool isChecked ) void RicReloadCaseFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Reload" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } diff --git a/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp b/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp index 85a15141cd..55ccd92a70 100644 --- a/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp +++ b/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp @@ -80,5 +80,5 @@ void RicReloadFormationNamesFeature::onActionTriggered( bool isChecked ) void RicReloadFormationNamesFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Reload" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } diff --git a/ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp b/ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp index b2cd0ea614..bf7dc07583 100644 --- a/ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp +++ b/ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp @@ -76,7 +76,7 @@ void RicReloadSummaryCaseFeature::onActionTriggered( bool isChecked ) void RicReloadSummaryCaseFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Reload" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicReloadWellMeasurementsFeature.cpp b/ApplicationCode/Commands/RicReloadWellMeasurementsFeature.cpp index a312d4e8e8..ef40d2dd4f 100644 --- a/ApplicationCode/Commands/RicReloadWellMeasurementsFeature.cpp +++ b/ApplicationCode/Commands/RicReloadWellMeasurementsFeature.cpp @@ -61,5 +61,5 @@ void RicReloadWellMeasurementsFeature::onActionTriggered( bool isChecked ) void RicReloadWellMeasurementsFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Reload" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } diff --git a/ApplicationCode/Commands/RicReloadWellPathFormationNamesFeature.cpp b/ApplicationCode/Commands/RicReloadWellPathFormationNamesFeature.cpp index 22e486e080..ac655b7dbd 100644 --- a/ApplicationCode/Commands/RicReloadWellPathFormationNamesFeature.cpp +++ b/ApplicationCode/Commands/RicReloadWellPathFormationNamesFeature.cpp @@ -81,5 +81,5 @@ void RicReloadWellPathFormationNamesFeature::onActionTriggered( bool isChecked ) void RicReloadWellPathFormationNamesFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Reload All Well Picks" ); - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); } diff --git a/ApplicationCode/Commands/SurfaceCommands/RicCopySurfaceFeature.cpp b/ApplicationCode/Commands/SurfaceCommands/RicCopySurfaceFeature.cpp index 6e7329a296..0eb444860d 100644 --- a/ApplicationCode/Commands/SurfaceCommands/RicCopySurfaceFeature.cpp +++ b/ApplicationCode/Commands/SurfaceCommands/RicCopySurfaceFeature.cpp @@ -65,6 +65,6 @@ void RicCopySurfaceFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicCopySurfaceFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setIcon( QIcon( ":/Copy.png" ) ); + actionToSetup->setIcon( QIcon( ":/Copy.svg" ) ); actionToSetup->setText( "Create Copy" ); } diff --git a/ApplicationCode/Commands/SurfaceCommands/RicReloadSurfaceFeature.cpp b/ApplicationCode/Commands/SurfaceCommands/RicReloadSurfaceFeature.cpp index 7953dcfece..3055b9ead4 100644 --- a/ApplicationCode/Commands/SurfaceCommands/RicReloadSurfaceFeature.cpp +++ b/ApplicationCode/Commands/SurfaceCommands/RicReloadSurfaceFeature.cpp @@ -61,6 +61,6 @@ void RicReloadSurfaceFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicReloadSurfaceFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setIcon( QIcon( ":/Refresh-32.png" ) ); + actionToSetup->setIcon( QIcon( ":/Refresh.svg" ) ); actionToSetup->setText( "Reload" ); } diff --git a/ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveDeleteFeature.cpp b/ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveDeleteFeature.cpp index d633f5c87b..b76b878ab3 100644 --- a/ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveDeleteFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveDeleteFeature.cpp @@ -75,6 +75,6 @@ void Ric3dWellLogCurveDeleteFeature::onActionTriggered( bool isChecked ) void Ric3dWellLogCurveDeleteFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete 3D Well Log Curve(s)" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/WellLogCommands/RicDeletePltPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicDeletePltPlotFeature.cpp index 27be6cbbea..a0fdd9ac70 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicDeletePltPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicDeletePltPlotFeature.cpp @@ -74,5 +74,5 @@ void RicDeletePltPlotFeature::onActionTriggered( bool isChecked ) void RicDeletePltPlotFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete PLT Plot" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); } diff --git a/ApplicationCode/Commands/WellLogCommands/RicDeleteRftPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicDeleteRftPlotFeature.cpp index a0ac4e618a..35dafea7d8 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicDeleteRftPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicDeleteRftPlotFeature.cpp @@ -75,6 +75,6 @@ void RicDeleteRftPlotFeature::onActionTriggered( bool isChecked ) void RicDeleteRftPlotFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete RFT Plot" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/WellLogCommands/RicDeleteSubPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicDeleteSubPlotFeature.cpp index c14cf0f71a..46e328c56c 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicDeleteSubPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicDeleteSubPlotFeature.cpp @@ -137,6 +137,6 @@ void RicDeleteSubPlotFeature::setupActionLook( QAction* actionToSetup ) } actionToSetup->setText( actionText ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp index c218d22c8f..1ec335d18b 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp @@ -81,7 +81,7 @@ void RicWellLogFileCloseFeature::onActionTriggered( bool isChecked ) void RicWellLogFileCloseFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Close Well Log File(s)" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Close.svg" ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/WellPathCommands/RicDeletePolylineTargetFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicDeletePolylineTargetFeature.cpp index ebb9a78064..035b1280c1 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicDeletePolylineTargetFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicDeletePolylineTargetFeature.cpp @@ -69,6 +69,6 @@ void RicDeletePolylineTargetFeature::onActionTriggered( bool isChecked ) void RicDeletePolylineTargetFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Target" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp index ad3e9f1f0d..7570ce82e6 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp @@ -108,13 +108,13 @@ void RicDeleteWellPathAttributeFeature::setupActionLook( QAction* actionToSetup if ( attributes.size() > 0 ) { actionToSetup->setText( "Delete Attribute" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } else if ( caf::SelectionManager::instance()->selectedItemOfType() ) { actionToSetup->setText( "Delete Casing Design" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } } diff --git a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp index 8ae19f8d0b..f8837fac8f 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp @@ -70,5 +70,5 @@ void RicDeleteWellPathTargetFeature::onActionTriggered( bool isChecked ) void RicDeleteWellPathTargetFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Target" ); - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); } diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp index 3a25661d15..834c9da98d 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp @@ -86,6 +86,6 @@ void RicWellPathDeleteFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setText( "Delete Well Path" ); } - actionToSetup->setIcon( QIcon( ":/Erase.png" ) ); + actionToSetup->setIcon( QIcon( ":/Erase.svg" ) ); applyShortcutWithHintToAction( actionToSetup, QKeySequence::Delete ); } diff --git a/ApplicationCode/Resources/Close.svg b/ApplicationCode/Resources/Close.svg new file mode 100644 index 0000000000..8d849c7165 --- /dev/null +++ b/ApplicationCode/Resources/Close.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/ApplicationCode/Resources/Copy.svg b/ApplicationCode/Resources/Copy.svg new file mode 100644 index 0000000000..78360f4e9a --- /dev/null +++ b/ApplicationCode/Resources/Copy.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/ApplicationCode/Resources/Erase.svg b/ApplicationCode/Resources/Erase.svg new file mode 100644 index 0000000000..c9043f13bc --- /dev/null +++ b/ApplicationCode/Resources/Erase.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/ApplicationCode/Resources/Filter.svg b/ApplicationCode/Resources/Filter.svg new file mode 100644 index 0000000000..b2fd20bbec --- /dev/null +++ b/ApplicationCode/Resources/Filter.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/ApplicationCode/Resources/FilterCollection.svg b/ApplicationCode/Resources/FilterCollection.svg new file mode 100644 index 0000000000..deef3d28dd --- /dev/null +++ b/ApplicationCode/Resources/FilterCollection.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApplicationCode/Resources/Refresh.svg b/ApplicationCode/Resources/Refresh.svg new file mode 100644 index 0000000000..bd7b72aa48 --- /dev/null +++ b/ApplicationCode/Resources/Refresh.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index a3e4a7cd96..d6e4186a30 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -215,6 +215,12 @@ themes/dark/checkbox-unchecked-disabled.svg themes/dark/checkbox-indeterminate.svg themes/dark/checkbox-indeterminate-disabled.svg + Filter.svg + FilterCollection.svg + Copy.svg + Erase.svg + Close.svg + Refresh.svg fs_CellFace.glsl diff --git a/ApplicationCode/UserInterface/RiuTextDialog.cpp b/ApplicationCode/UserInterface/RiuTextDialog.cpp index 1616981b97..f00a8da309 100644 --- a/ApplicationCode/UserInterface/RiuTextDialog.cpp +++ b/ApplicationCode/UserInterface/RiuTextDialog.cpp @@ -163,7 +163,7 @@ void RiuTextDialog::contextMenuEvent( QContextMenuEvent* event ) QAction* actionToSetup = new QAction( this ); actionToSetup->setText( "Copy" ); - actionToSetup->setIcon( QIcon( ":/Copy.png" ) ); + actionToSetup->setIcon( QIcon( ":/Copy.svg" ) ); caf::CmdFeature::applyShortcutWithHintToAction( actionToSetup, QKeySequence::Copy ); connect( actionToSetup, SIGNAL( triggered() ), m_textEdit, SLOT( slotCopyContentToClipboard() ) ); @@ -310,7 +310,7 @@ void RiuTabbedTextDialog::contextMenuEvent( QContextMenuEvent* event ) QAction* actionToSetup = new QAction( this ); actionToSetup->setText( "Copy" ); - actionToSetup->setIcon( QIcon( ":/Copy.png" ) ); + actionToSetup->setIcon( QIcon( ":/Copy.svg" ) ); caf::CmdFeature::applyShortcutWithHintToAction( actionToSetup, QKeySequence::Copy ); connect( actionToSetup, SIGNAL( triggered() ), textEdit, SLOT( slotCopyContentToClipboard() ) );