From 8e95fda14490dc0ede0147f7f96cb3526a628bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 4 Oct 2016 14:36:27 +0200 Subject: [PATCH] #846 Plot Window and 3D Window icons --- .../Commands/RicShowMainWindowFeature.cpp | 2 +- .../Commands/RicShowPlotWindowFeature.cpp | 2 +- .../ProjectDataModel/RimEclipseView.cpp | 2 +- .../ProjectDataModel/RimGeoMechView.cpp | 2 +- ApplicationCode/Resources/3DView16x16.png | Bin 0 -> 727 bytes ApplicationCode/Resources/3DWindow24x24.png | Bin 0 -> 1157 bytes ApplicationCode/Resources/PlotWindow24x24.png | Bin 0 -> 1108 bytes ApplicationCode/Resources/ResInsight.qrc | 3 +++ 8 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ApplicationCode/Resources/3DView16x16.png create mode 100644 ApplicationCode/Resources/3DWindow24x24.png create mode 100644 ApplicationCode/Resources/PlotWindow24x24.png diff --git a/ApplicationCode/Commands/RicShowMainWindowFeature.cpp b/ApplicationCode/Commands/RicShowMainWindowFeature.cpp index 03acb432b2..0618a7234e 100644 --- a/ApplicationCode/Commands/RicShowMainWindowFeature.cpp +++ b/ApplicationCode/Commands/RicShowMainWindowFeature.cpp @@ -50,5 +50,5 @@ void RicShowMainWindowFeature::onActionTriggered(bool isChecked) void RicShowMainWindowFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Open 3D Window"); - actionToSetup->setIcon(QIcon(":/ReservoirView.png")); + actionToSetup->setIcon(QIcon(":/3DWindow24x24.png")); } diff --git a/ApplicationCode/Commands/RicShowPlotWindowFeature.cpp b/ApplicationCode/Commands/RicShowPlotWindowFeature.cpp index 609fef085f..dfaf8d4f49 100644 --- a/ApplicationCode/Commands/RicShowPlotWindowFeature.cpp +++ b/ApplicationCode/Commands/RicShowPlotWindowFeature.cpp @@ -46,5 +46,5 @@ void RicShowPlotWindowFeature::onActionTriggered(bool isChecked) void RicShowPlotWindowFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Open Plot Window"); - actionToSetup->setIcon(QIcon(":/SummaryPlots16x16.png")); + actionToSetup->setIcon(QIcon(":/PlotWindow24x24.png")); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 8923053151..4dbcfcd783 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -89,7 +89,7 @@ RimEclipseView::RimEclipseView() RiaPreferences* preferences = app->preferences(); CVF_ASSERT(preferences); - CAF_PDM_InitObject("Reservoir View", ":/ReservoirView.png", "", ""); + CAF_PDM_InitObject("Reservoir View", ":/3DView16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&cellResult, "GridCellResult", "Cell Result", ":/CellResult.png", "", ""); cellResult = new RimEclipseCellColors(); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index 0b080b0f9b..a1ce1e8edc 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -74,7 +74,7 @@ RimGeoMechView::RimGeoMechView(void) RiaPreferences* preferences = app->preferences(); CVF_ASSERT(preferences); - CAF_PDM_InitObject("Geomechanical View", ":/ReservoirView.png", "", ""); + CAF_PDM_InitObject("Geomechanical View", ":/3DView16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&cellResult, "GridCellResult", "Color Result", ":/CellResult.png", "", ""); cellResult = new RimGeoMechCellColors(); diff --git a/ApplicationCode/Resources/3DView16x16.png b/ApplicationCode/Resources/3DView16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..fea97a9c45d322ec0f695b881654596985713540 GIT binary patch literal 727 zcmV;|0x127P)WFU8GbZ8()Nlj2>E@cM*00KKnL_t(I%dL~$OOs(3 z#((eo?wxZp)10#c(L}8bHR>QxDG)Iug@}?q6f%NJB#@Ab=qMt>zd$fBsuK@FgR(kG z^COf@WLB6d+lZK!D>t^e_v7h6QdW)*>Nw4~o>-R_p&vy#l5GcwrzoeO<%EU=k z03PCW#`;@q^ENYo%4F|a2q#55gioOLb9s>&n*$;qhq2K8s`E zDNSPXn~ck=^SGb{$EPUsjrD6!kYpK2wW8c<;ZdNE7Zr^xlsidvXJNQAxLbY!UxO33 zKS(IxAt+^YvA!K)7%KsWZ;mhRZFFz*(jV-EQHkB6mrLpZvU42W5IBbY9M1;x$p)HQ zA0P~4t%b~vHbV0rsvK#^`xnSN)5oFW5yIX#M0W|k0+mJZvfD}Xxh`xrdwdHS2TUeP zqU7PDWBMu^w?z4z3a$c>{GjARLtx6Ng2HAmT6cM<|iEJnWbamvkP`ZKh72WM-KfcO(y zspr+4xW1Uet&HHhKuL;WFU8GbZ8()Nlj2>E@cM*00ZesL_t(Y$JLctY*keh zhQGbfx#!%WltM3Up*Fx}5OKiaK_UoM+gd~tYLo~x8A=E^} zgGo)G#3=<8gxgY5do=;XwpXwt9lh-t_SrsMC|pX>)F)PQl5=+U{@1_$v;Mu{W)Jb& zdmm}bj?y>cpaO+6?%?@8L7*A;bq)mBuID_1t`1-@%M9$_xhav|?s7A72Yx zt3S)mwyzwXaSe4wC+jhM)mmYcEUl#(C_kWvzjM*kB?pghnZ zq=AqUp0Tu{y8`yb%mTVpI; zwjR&-@s+}~EqjtgHwyLBVGf?%!O^@Y8C|}bj6a{uQbly}DLT!)44sXVerFebwXaYr zBA6P@y7iAu0_r;7fo0ni&MCQU8E83%|7I;!vtYwBbzDqB#|oR)eo0ZM&sR(CBKG?@ zJ=-?1@saH`fByw0=<71Q<4s)EbluavrVW^i~76r=8}vA7ZqpgNj%Ia!oIZ z?G3EE^B9@VX2x&V^Z^eqhsOPJc09kAa5#DiTq6XSgM$O?tE}%B_O)NSPWyo!ixKzrg+Y6XdO%>05Btw2vwC8 z=VP&$1CUCk5{6+QQ#;9jK-OG^topA+byG>28-Ign>ll2=Sgc`^4G)r10YwRgQq zfWCZHG&VMJZ3W7ge0Tg?Dp#%rXm Xr9qq%92yfW00000NkvXXu0mjf*SrIT literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/PlotWindow24x24.png b/ApplicationCode/Resources/PlotWindow24x24.png new file mode 100644 index 0000000000000000000000000000000000000000..6d7f5fa745756bd2c945e1155533b095c93f27f6 GIT binary patch literal 1108 zcmV-a1grarP)WFU8GbZ8()Nlj2>E@cM*00X#5L_t(Y$JLcvNE~Mr z$A5F#8F!axnzYgy(~@mk7OAGtv^6AN9#X3bq!@+vu_ho9g$ULQp`@7BUZ6=MG_>R) zYVuTw286guUtDe3)C;6;U4*n!(1cW!ZoLfd?#z6B*mQN&gh2X|10VB!|8x2N=X~cd z@U)9m-}ar*bPw}OF)Z66wi+X0n%K5r)f5inxCNTx43MS*NW?6ObhnG=cX&}0g~Q>S zD7ubnFD+15ScGNUD00$!`rbU!1}66w{&AeMc4lm1`|_@5Q+x43I&m|G>Smd3L`evX z3{N_ykcevwNp`xv=DckKb(S~RV{sj})5GX56R46T<5gq0(s$r;X{auh9|OP5O#kuw z?v9R*C#wI@P!QRjmd4zIL2NaSYzy}6@u9g?whA7JMCkADClm@13WWf86bVU^kO4|c z-(~-sZ?M<@DvB(lX_{mh#+FW{rKL`_u*}TNhXyw-3t89nO(n8zo9^!J|78wTfuQW@5eH~lmQ+(yLswUq z1K)q*yyHA}rGcM*outRTeOIrGbm5%efjD<^7L4*D}~DEnU~`uNzNcnkMm}omI9#{~E*U)vHXSQ$0v`p^*b)SKO0SDXJ-X2PSzD@tZ*U3H8`uLCRcDpHg=kQ&x*Bb+v zoSgJ2in8_KJOmHq=TdenjA0mfJRXNm)?6B6V`IC5!Jsb~4EpBh=P^w))$?1)-M(G| z`MCguKmWw>br2Gu#uIUhi;Gj>%*+hqp2mPMnyCl6-!G?A{-8j zmX?;8yu3W|q|(&XBvho$8K|l%LZJ|gi;HArWFUk{4dBYkO7e%3l|?if#W0N29>DMS zGc`4pw3lV1^73-w^Z6VX*tQKoEFOOlTtWzeBuUt|g|L%*@!-<+%QO>cnvN_<=IntersectionXPlane16x16.png IntersectionYPlane16x16.png IntersectionZPlane16x16.png + PlotWindow24x24.png + 3DWindow24x24.png + 3DView16x16.png fs_CellFace.glsl