Magne Sjaastad f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc

2017-02-16 10:18:39 +01:00

..

3DView16x16.png

#846 Plot Window and 3D Window icons

2016-10-04 14:36:49 +02:00

3DWindow24x24.png

#846 Plot Window and 3D Window icons

2016-10-04 14:36:49 +02:00

AppLogo48x48.ico

Icons: New App icon based on picture sent from Statoil

2013-06-01 01:29:05 +02:00

AppLogo48x48.png

Icons: New App icon based on picture sent from Statoil

2013-06-01 01:29:05 +02:00

Axes16x16.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

BottomAxis16x16.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

Case48x48.png

Icons: New App icon based on picture sent from Statoil

2013-06-01 01:29:05 +02:00

Cases16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

CellFilter_Range.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

CellFilter_Values.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

CellResult.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

chain.png

Added ManagedViews and sync of camera, time step and cell result

2015-08-26 15:42:31 +02:00

clipboard.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

Copy.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

CreateGridCaseGroup16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00

CrossSection16x16.png

(#665) Icons for cross sections

2015-11-24 13:27:44 +01:00

CrossSections16x16.png

(#665) Icons for cross sections

2015-11-24 13:27:44 +01:00

Default.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

disable_lighting_24x24.png

New DisableLightning icon

2015-06-18 14:12:44 +02:00

DownViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

draw_style_faults_24x24.png

Drawstyle and Faults control Toolbuttons

2013-04-18 15:10:57 +02:00

draw_style_faults_label_24x24.png

Improved tool button image

2014-01-23 09:06:56 +01:00

draw_style_lines_24x24.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

draw_style_meshlines_24x24.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

draw_style_meshoutlines_24x24.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

draw_style_outlines_24x24.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

draw_style_surface_24x24.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

draw_style_surface_w_fault_mesh_24x24.png

Toolbar - Gridlines - Faults only option #74

2013-12-18 23:37:30 +01:00

draw_style_WellCellsToRangeFilter_24x24.png

Tool button to add well cells to range filter

2013-10-18 11:19:49 +02:00

EastViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

EclipseInput48x48.png

#849 Icon brushup due to new SummaryCaseIcon

2016-10-07 15:48:17 +02:00

EdgeResult_1.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

EdgeResult_2.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

Erase.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

Folder.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

FormationCollection16x16.png

#809 Created Formation Names project items.

2016-08-24 08:30:12 +02:00

Formations16x16.png

#809 Created Formation Names project items.

2016-08-24 08:30:12 +02:00

FractureLayout16x16.png

#1071 Updated icons for fractures

2017-01-05 14:57:04 +01:00

FractureSymbol16x16.png

#1071 Updated icons for fractures

2017-01-05 14:57:04 +01:00

FractureTemplate16x16.png

#1071 Updated icons for fractures

2017-01-05 14:57:04 +01:00

fs_CellFace.glsl

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

GeoMechCase48x48.png

Start of geomech support

2015-04-20 09:02:33 +02:00

GeoMechCase48x48.xcf

Start of geomech support

2015-04-20 09:02:33 +02:00

GeoMechCases48x48.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

GeoMechCases48x48.xcf

Start of geomech support

2015-04-20 09:02:33 +02:00

GridCaseGroup16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00

GridModels.png

Add temporary icon for Grid Models in PDM, should create proper icon later.

2013-06-07 09:32:32 +02:00

Histogram16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00

Histograms16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00

InfoBox16x16.png

Added a better info box icon

2013-10-23 16:17:05 +02:00

IntersectionBox16x16.png

#889 Intersection Box Icon

2016-09-30 09:43:37 +02:00

IntersectionBoxes16x16.png

#814 New project tree items Intersection Boxes and Intersection Box. Support for add, toggle and delete

2016-09-20 12:03:26 +02:00

IntersectionXPlane16x16.png

#889 Added intersection box icons

2016-09-30 13:10:49 +02:00

IntersectionYPlane16x16.png

#889 Added intersection box icons

2016-09-30 13:10:49 +02:00

IntersectionZPlane16x16.png

#889 Added intersection box icons

2016-09-30 13:10:49 +02:00

LasFile16x16.png

(#521, #522) Added new icon files

2015-10-15 13:41:30 +02:00

LeftAxis16x16.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

Legend.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

Loop.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

Minus.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

new16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00

NorthViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

octave.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

openFolder24x24.png

#849 Icon brushup due to new SummaryCaseIcon

2016-10-07 15:48:17 +02:00

Parallel16x16.png

#168 Added Perspective/parallel view tool button

2016-08-16 22:43:22 +02:00

Parallel24x24.png

Use 24x24 icons (was 16x16) in the toolbar for perspective/parallel

2016-11-18 10:46:40 +01:00

Perspective16x16.png

#168 Added Perspective/parallel view tool button

2016-08-16 22:43:22 +02:00

Perspective24x24.png

Use 24x24 icons (was 16x16) in the toolbar for perspective/parallel

2016-11-18 10:46:40 +01:00

PlotWindow24x24.png

#846 Plot Window and 3D Window icons

2016-10-04 14:36:49 +02:00

Plus.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

Refresh-32.png

#649 Added 'Refresh' to script collections

2016-07-18 15:01:14 +02:00

ResInsight.qrc

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-16 10:18:39 +01:00

ResInsight.rc

Added application icon on Windows

2013-04-10 12:01:38 +02:00

RightAxis16x16.png

#962 Added axis-icons in the project tree.

2016-11-18 10:48:35 +01:00

Save.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

SnapShot.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

SnapShotSave.png

Added new icons to resource file

2013-04-16 09:44:31 +02:00

SnapShotSaveViews.png

Toolbar and menu refinements

2013-04-17 10:59:34 +02:00

SouthViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

SummaryCase48x48.png

#849 Icon brushup due to new SummaryCaseIcon

2016-10-07 15:48:17 +02:00

SummaryCurve16x16.png

#781 Icons for Summary plot items

2016-06-21 14:17:50 +02:00

SummaryCurveFilter16x16.png

#781 Icons for Summary plot items

2016-06-21 14:17:50 +02:00

SummaryPlot16x16.png

#781 Icons for Summary plot items

2016-06-21 14:17:50 +02:00

SummaryPlotLight16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

SummaryPlots16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

TileWindows24x24.png

Improved Tile Windows icon

2016-10-04 15:42:26 +02:00

UpViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

vs_2dTextureCellFace.glsl

Added cell edge with 2d texture coord support

2014-08-14 10:56:46 +02:00

vs_CellFace.glsl

Fixed shader program

2013-04-30 15:07:38 +02:00

Well.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

WellAllocLegend16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellAllocPie16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellAllocPlot16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellAllocPlots16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellCollection.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

WellFlowPlot16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellLogCurve16x16.png

(#521, #522) Added new icon files

2015-10-15 13:41:30 +02:00

WellLogPlot16x16.png

Adjusted Well Log plots icons to a more soft tone

2015-11-02 13:10:55 +01:00

WellLogPlots16x16.png

#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look

2017-02-15 18:29:01 +01:00

WellLogTrack16x16.png

Adjusted Well Log plots icons to a more soft tone

2015-11-02 13:10:55 +01:00

WestViewArrow.png

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

ZoomAll16x16.png

Added several new icons, including zoom all

2013-03-07 16:47:42 +01:00