From c150f3e57879dfb61321bce9ae151eaf8098d740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Mon, 7 May 2018 12:28:24 +0200 Subject: [PATCH] #2853 Add a specific ensembles icon. Use Cases icon for recursive import --- .../RicImportEclipseCasesFeature.cpp | 2 +- .../Summary/RimSummaryCaseCollection.cpp | 2 +- ApplicationCode/Resources/ResInsight.qrc | 1 + .../Resources/SummaryEnsemble16x16.png | Bin 900 -> 945 bytes ApplicationCode/Resources/SummaryGroup16x16.png | Bin 0 -> 900 bytes 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 ApplicationCode/Resources/SummaryGroup16x16.png diff --git a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp index f5cb90e476..39cbbec3b6 100644 --- a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp +++ b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp @@ -82,6 +82,6 @@ void RicImportEclipseCasesFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- void RicImportEclipseCasesFeature::setupActionLook(QAction* actionToSetup) { - actionToSetup->setIcon(QIcon(":/Case48x48.png")); + actionToSetup->setIcon(QIcon(":/Cases16x16.png")); actionToSetup->setText("Import Eclipse Cases Recursively"); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index ec509da4e4..f74b107526 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCaseCollection, "SummaryCaseSubCollection"); //-------------------------------------------------------------------------------------------------- RimSummaryCaseCollection::RimSummaryCaseCollection() { - CAF_PDM_InitObject("Summary Case Group", ":/SummaryEnsemble16x16.png", "", ""); + CAF_PDM_InitObject("Summary Case Group", ":/SummaryGroup16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_cases, "SummaryCases", "", "", "", ""); m_cases.uiCapability()->setUiHidden(true); diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 513fc55b8a..76d3deb53e 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -26,6 +26,7 @@ Cases16x16.png SummaryCases16x16.png SummaryEnsemble16x16.png + SummaryGroup16x16.png CreateGridCaseGroup16x16.png GridCaseGroup16x16.png Histogram16x16.png diff --git a/ApplicationCode/Resources/SummaryEnsemble16x16.png b/ApplicationCode/Resources/SummaryEnsemble16x16.png index f0af79850a878c4aa87390d484e4d1f734bc046f..27c94b849002795cbf7562134a1cd27ad36fe8db 100644 GIT binary patch delta 835 zcmV-J1HAl%2eAi`R0jzr1PKk>QjuFLe*+asL_t(I%UzC5XdPu3g`fAEnKU={l9(SG zljbHELTPRVBUCg>BU&^Hk`}EiMY<4|QoAp>aiv|kC|X){Q>=(aX-gF;XcetUNU>>Y zVjz$v&ENgMcjnG~^Sv%Ypm>(&oab<)zHs5DbIIc*6^M&q>tJgDUuU2B^i3Ynf9TYS z%OH)p>Cvckd`b@7VDYI2AyM@mh8To@uGP ze(Gv>vDyr(p_QFM&wx#pzK6|v0)sPf}4x5(uNQRhI6=L!w4WBMu^Pj`}kc0VL;`-WP8 z4qrq)TwS!;1mm-|w$9|_E8C@NjQ!#qb1zut>t*t3lmE*EzUNC)^jus}e+}2@@7=SV zlxr-1beuDTXIOl(4Wfvo0op8~Q4tqz;F<+|Ts2TzGivJ~hRsS04fyr+Buf)9Q!oF- zfQ<9m%wg`7{-$ht7(X-yX$WbIk+|d&msD*{U0l&zo5$k$DbnZLd28|pUBz)eKc_6+ ztCDf6^le?@`uE>ZEtOP~e-xuh*=X7jY+cn>-Q};YaG@|nru!1-zl0Az-lR7t?8_@j#}nBF{``FgjY1?|nXYK#en!(s)H!Bn*X8)!&k_B<=q7T$j8F?>y(DhlF&gc12!a)UFJlYokJu$vm4UY)zXf6tA@Hrl%exp-}p z!w2_*3-NJ{-MEHoQU@EcQr*RBJx486Y^I<4n`Js%Eklnu_Jr$HqXsR$01B%3NQ=WJ zkVIgcEN*!^w;V{+w7P%TxUQ@*<*-#YBA=N>75uRC);&pkgE*%V#qvwdD(US2g=zjnvD>=aoK(l*!u*gnALr58SUga5!df7?Gr zo1bST#}B}M*CWXZ-2Z?wK|PB2TFUc6?&t~->~!i z7_}EqK<4(hiv<`pN{NRXC`l5~hOMn_mX==M4+Saq<15^I*|Ik1Qp=Nnov3}|8I`p? zm$pQrEhfhg@0)I)%?szbG<}KsE5i`SWFbh>LE<(p+QB6)3@-4+_O;jne<;mvFNF|( zdVh(Hg_JX|eaDoV=fjmn{_OlgS67%nJqLLNd5TtP$B=eJY+qd3lj^WX{puO=mqvJV z={Du|JeRKs8xI4DuF1sSb#8t21wp4HD$CK5b+zQ7!VW}i;J*I!2G?3gDIU7c)lcBP zi@S_h700W>T2s>)csyNNf9JPfR**PCrH$pDgpZ1n$4Z=Ib#+_a`gvWO{swWJGk&B< zFSYDFe84*kK6n3W(I2VN2nxLQ>M@MuP6PqvfQ(u7gQ`xi(9L{$YLtWY8S@4_FoxUp zVMfZ+e0Fn}#b=Lzi!iwGATAWi24G_v!2z0sD*Z^X#YrCRb{QM8e;j?%aX8v0h(iiS z0RkczRKa00$YQVw^*vASZTc!stelw9u3XZ(8x5(Q*sxNEsi!Ku`}QQ25g)QH2K4Wk zVhtOCw({IF$2mDW<)yh*6NiSxsGJ)&?|Z9jO;awF?Agp8x;= diff --git a/ApplicationCode/Resources/SummaryGroup16x16.png b/ApplicationCode/Resources/SummaryGroup16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..f0af79850a878c4aa87390d484e4d1f734bc046f GIT binary patch literal 900 zcmV-~1AF|5P)WFU8GbZ8()Nlj2>E@cM*00QVqL_t(I%Z-rDYg|5uRC);&pkgE*%V#qvwdD(US2g=zjnvD>=aoK(l*!u*gnAL zr58SUga5!d+doB~KpsQ9^|(9B|G>~*WpgXQ=_h)kltlz5e%qJM%;UkR@x5Q1Sj_%e zpzeQpP5{Q|&Ue6x0u(7;;ehYyLJyZj%B29X~&RuL~LJN+LP+A zNB!y<@|Q+M@MuP6PqvfQ(u7gQ`xi(9L{$YLtWY z8S@4_FoxUpVMfZ+e0Fn}#b=Lzi!iwGATAWi24G_v!2z0sD*Z^X#YrCRb{QM89DUMp zINBzNLkdO#0wNex!C^DVVz3GIJx}g!`YKMWoS4zBT++H54XK^juu_Mqrz*Vr_9T@N zAF?h6^zWEr4I6>B^4v4WIXOG!rMXoThla$coEtaqd#h_rQ!bV4+0&KK^Kxx%w&uC` aqrU<2+@RQ5@UDjd0000