OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Many new icons and minor CSS changes

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-10-01 17:25:19 +02:00
committed by Magne Sjaastad
parent 3f1fd44554
commit b7ac99e53b
98 changed files with 631 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafAnimControl/Resources/Fast.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M 14 9.2 L 9.2 9.2 L 9.2 14 L 6.8 14 L 6.8 9.2 L 2 9.2 L 2 6.8 L 6.8 6.8 L 6.8 2 L 9.2 2 L 9.2 6.8 L 14 6.8 Z" style="fill: rgb(255, 115, 0); stroke-width: 0.4px;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 318 B

4
Fwk/AppFwk/cafAnimControl/Resources/Pause.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M 7 2 L 7 14 L 3.5 14 L 3.5 2 Z M 12.5 14 L 9 14 L 9 2 L 12.5 2 Z" fill="#75BEFF" style="stroke-width: 0.5px;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 265 B

3
Fwk/AppFwk/cafAnimControl/Resources/Play.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4 2V13.8199L13 7.88L4 2ZM5.5 4.81995L10.3101 7.88L5.5 11V4.81995Z" fill="#89D185"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 197 B

4
Fwk/AppFwk/cafAnimControl/Resources/RepeatFromStart.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.75 7.99988C12.75 10.4852 10.7353 12.4999 8.24999 12.4999C6.41795 12.4999 4.84162 11.4051 4.13953 9.83404L2.74882 10.3989C3.67446 12.5185 5.78923 13.9999 8.24999 13.9999C11.5637 13.9999 14.25 11.3136 14.25 7.99988C14.25 4.68617 11.5637 1.99988 8.24999 1.99988C6.3169 1.99988 4.59732 2.91406 3.5 4.33367V2.49988H2V6.49988L2.75 7.24988H6.25V5.74988H4.35201C5.13008 4.40482 6.58436 3.49988 8.24999 3.49988C10.7353 3.49988 12.75 5.5146 12.75 7.99988Z" fill="#89D185" style="stroke-width: 0.5px;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 689 B

6
Fwk/AppFwk/cafAnimControl/Resources/SkipToEnd.svg Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M 16 14 L 14.769 14 L 14.769 13.76 L 14.769 2 L 16 2 L 16 14 Z" fill="#75BEFF" style="" transform="matrix(-1, 0, 0, -1, 30.769, 16)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M 14.769 14 L 14.769 2.181 L 7.385 8.119 Z M 13.539 5 L 13.539 11.181 L 9.587 8.119 Z" fill="#75BEFF" style="" transform="matrix(-1, 0, 0, -1, 22.154, 16.181)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M 7.385 14 L 7.385 2.181 L 0 8.119 Z M 6.154 5 L 6.154 11.181 L 2.203 8.119 Z" fill="#75BEFF" style="" transform="matrix(-1, 0, 0, -1, 7.385, 16.181)"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 744 B

6
Fwk/AppFwk/cafAnimControl/Resources/SkipToStart.svg Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M 1.231 2 L 0 2 L 0 2.24 L 0 14 L 1.231 14 L 1.231 2 Z" fill="#75BEFF" style=""/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M 8.615 2.181 L 8.615 14 L 1.231 8.062 Z M 7.385 11.181 L 7.385 5 L 3.433 8.062 Z" fill="#75BEFF" style=""/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M 16 2.181 L 16 14 L 8.615 8.062 Z M 14.769 11.181 L 14.769 5 L 10.818 8.062 Z" fill="#75BEFF" style=""/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 591 B

4
Fwk/AppFwk/cafAnimControl/Resources/Slow.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M 14.5 9.5 L 1.5 9.5 L 1.5 6.5 L 14.5 6.5 Z" style="fill: rgb(137, 209, 133); stroke-width: 0.4px;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 254 B

5
Fwk/AppFwk/cafAnimControl/Resources/Speed.svg Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M 1.482 2.09 L 1.482 13.91 L 10.482 7.97 L 1.482 2.09 Z M 2.982 4.91 L 7.792 7.97 L 2.982 11.09 L 2.982 4.91 Z" fill="#89D185"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M 13.143 8.872 L 14.518 9.165 L 14.493 10.776 L 13.111 11.028 L 13.874 12.21 L 12.718 13.333 L 11.559 12.537 L 11.261 13.91 L 9.652 13.885 L 9.398 12.504 L 8.217 13.264 L 7.091 12.105 L 7.893 10.948 L 6.518 10.653 L 6.543 9.043 L 7.924 8.792 L 7.16 7.607 L 8.32 6.486 L 9.477 7.282 L 9.772 5.908 L 11.384 5.932 L 11.638 7.316 L 12.82 6.555 L 13.943 7.711 Z M 9.107 9.28 C 8.988 9.568 8.952 9.882 9.006 10.195 C 9.058 10.503 9.203 10.788 9.413 11.015 C 9.624 11.24 9.894 11.393 10.194 11.461 C 10.491 11.53 10.801 11.503 11.08 11.384 C 11.362 11.268 11.607 11.07 11.776 10.813 C 11.952 10.551 12.05 10.249 12.055 9.931 C 12.057 9.513 11.901 9.106 11.617 8.804 C 11.335 8.501 10.947 8.329 10.539 8.319 C 10.237 8.315 9.938 8.403 9.682 8.572 C 9.43 8.744 9.23 8.992 9.107 9.28 Z" style="fill: rgb(174, 78, 151); stroke-width: 0.4px;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Fwk/AppFwk/cafAnimControl/Resources/StepBwd.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 2H12V2.24001L12 14L13.5 14L13.5 2ZM10 2.18094V14L0.999998 8.06218L10 2.18094ZM3.68522 8.06218L8.49976 5L8.49976 11.1809L3.68522 8.06218Z" fill="#75BEFF"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 313 B

3
Fwk/AppFwk/cafAnimControl/Resources/StepFwd.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.5 2H4V2.24001L4 14L2.5 14L2.5 2ZM6 2.18094V14L15 8.06218L6 2.18094ZM12.3148 8.06218L7.50023 5L7.50023 11.1809L12.3148 8.06218Z" fill="#75BEFF"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 300 B

18
Fwk/AppFwk/cafAnimControl/Resources/cafAnimControl.qrc
View File

@@ -8,12 +8,22 @@
<file>SkipToEnd.png</file>
<file>SkipToStart.png</file>
<file>RepeatFromStart.png</file>
<file>RepeatFwdBwd.png</file>
<file>PlayBwd.png</file>
<file>Slow.png</file>
<file>Fast.png</file>
<file>Speed.png</file>
<file>Play.svg</file>
<file>Pause.svg</file>
<file>StepFwd.svg</file>
<file>StepBwd.svg</file>
<file>SkipToEnd.svg</file>
<file>SkipToStart.svg</file>
<file>RepeatFromStart.svg</file>
<file>Slow.svg</file>
<file>Fast.svg</file>
<file>Speed.svg</file>
<file>PlayBwd.png</file>
<file>SlowHorizontal.png</file>
<file>FastHorizontal.png</file>
<file>Speed.png</file>
<file>FastHorizontal.png</file>
<file>RepeatFwdBwd.png</file>
</qresource>
</RCC>

20
Fwk/AppFwk/cafAnimControl/cafAnimationToolBar.cpp
View File

@@ -76,32 +76,32 @@ void AnimationToolBar::init()
m_fastFrameRate = 20;
// Create actions and widgets
m_animSkipToStartAction = new QAction( QIcon( ":/cafAnimControl/SkipToStart.png" ), tr( "Skip to Start" ), this );
m_animStepBackwardAction = new QAction( QIcon( ":/cafAnimControl/StepBwd.png" ), tr( "Step Backward" ), this );
m_animPauseAction = new QAction( QIcon( ":/cafAnimControl/Pause.png" ), tr( "Pause" ), this );
m_animPlayAction = new QAction( QIcon( ":/cafAnimControl/Play.png" ), tr( "Play" ), this );
m_animSkipToStartAction = new QAction( QIcon( ":/cafAnimControl/SkipToStart.svg" ), tr( "Skip to Start" ), this );
m_animStepBackwardAction = new QAction( QIcon( ":/cafAnimControl/StepBwd.svg" ), tr( "Step Backward" ), this );
m_animPauseAction = new QAction( QIcon( ":/cafAnimControl/Pause.svg" ), tr( "Pause" ), this );
m_animPlayAction = new QAction( QIcon( ":/cafAnimControl/Play.svg" ), tr( "Play" ), this );
m_animPlayPauseButton = new QToolButton( this );
m_animPlayPauseButton->setIcon( m_animPlayAction->icon() );
m_animPlayPauseButton->setToolTip( m_animPlayAction->toolTip() );
QObject::connect( m_animPlayPauseButton, SIGNAL( clicked() ), this, SLOT( playPauseChanged() ) );
m_animStepForwardAction = new QAction( QIcon( ":/cafAnimControl/StepFwd.png" ), tr( "Step Forward" ), this );
m_animSkipToEndAction = new QAction( QIcon( ":/cafAnimControl/SkipToEnd.png" ), tr( "Skip to End" ), this );
m_animStepForwardAction = new QAction( QIcon( ":/cafAnimControl/StepFwd.svg" ), tr( "Step Forward" ), this );
m_animSkipToEndAction = new QAction( QIcon( ":/cafAnimControl/SkipToEnd.svg" ), tr( "Skip to End" ), this );
m_animRepeatFromStartAction =
new QAction( QIcon( ":/cafAnimControl/RepeatFromStart.png" ), tr( "Repeat From start" ), this );
new QAction( QIcon( ":/cafAnimControl/RepeatFromStart.svg" ), tr( "Repeat From start" ), this );
m_animRepeatFromStartAction->setCheckable( true );
m_animSpeedButton = new PopupMenuButton( this );
m_animSpeedButton->setIcon( QIcon( ":/cafAnimControl/Speed.png" ) );
m_animSpeedButton->setIcon( QIcon( ":/cafAnimControl/Speed.svg" ) );
m_animSpeedButton->setToolTip( "Adjust Animation Speed" );
m_frameRateSlowLabel = new QLabel( this );
m_frameRateSlowLabel->setPixmap( QPixmap( ":/cafAnimControl/SlowHorizontal.png" ) );
m_frameRateSlowLabel->setPixmap( QPixmap( ":/cafAnimControl/Slow.svg" ) );
m_frameRateSlowLabel->setToolTip( tr( "Slow" ) );
m_frameRateFastLabel = new QLabel( this );
m_frameRateFastLabel->setPixmap( QPixmap( ":/cafAnimControl/FastHorizontal.png" ) );
m_frameRateFastLabel->setPixmap( QPixmap( ":/cafAnimControl/Fast.svg" ) );
m_frameRateFastLabel->setToolTip( tr( "Fast" ) );
m_frameRateFastLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );