Many new icons and minor CSS changes

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

View File

@@ -69,7 +69,7 @@ void RicOpenProjectFeature::onActionTriggered( bool isChecked )
void RicOpenProjectFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open Project" );
actionToSetup->setIcon( QIcon( ":/openFolder24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/OpenFolder.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Open );
}

View File

@@ -93,7 +93,7 @@ void RicSaveProjectAsFeature::onActionTriggered( bool isChecked )
void RicSaveProjectAsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Save Project &As" );
actionToSetup->setIcon( QIcon( ":/SaveAs24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/SaveAs.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::SaveAs );
}

View File

@@ -105,7 +105,7 @@ void RicSaveProjectFeature::onActionTriggered( bool isChecked )
void RicSaveProjectFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "&Save Project" );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Save );
}

View File

@@ -71,6 +71,6 @@ void RicShowMainWindowFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open 3D Window" );
actionToSetup->setToolTip( "Open 3D Window (Ctrl+Shift+3)" );
actionToSetup->setIcon( QIcon( ":/3DWindow24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/3DWindow.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence( tr( "Ctrl+Shift+3" ) ) );
}

View File

@@ -256,7 +256,7 @@ void RicShowPlotDataFeature::onActionTriggered( bool isChecked )
void RicShowPlotDataFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Show Plot Data" );
actionToSetup->setIcon( QIcon( ":/PlotWindow24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/PlotWindow.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -49,6 +49,6 @@ void RicShowPlotWindowFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open Plot Window" );
actionToSetup->setToolTip( "Open Plot Window (Ctrl+Shift+P)" );
actionToSetup->setIcon( QIcon( ":/PlotWindow24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/PlotWindow.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence( tr( "Ctrl+Shift+P" ) ) );
}

View File

@@ -69,7 +69,7 @@ void RicTileWindowsFeature::onActionTriggered( bool isChecked )
void RicTileWindowsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Tile Windows" );
actionToSetup->setIcon( QIcon( ":/TileWindows24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/TileWindows.svg" ) );
actionToSetup->setCheckable( true );
}
@@ -126,7 +126,7 @@ void RicTilePlotWindowsFeature::onActionTriggered( bool isChecked )
void RicTilePlotWindowsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Tile Windows" );
actionToSetup->setIcon( QIcon( ":/TileWindows24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/TileWindows.svg" ) );
actionToSetup->setCheckable( true );
}

View File

@@ -106,7 +106,7 @@ void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked )
void RicAdvancedSnapshotExportFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Advanced Snapshot Export ..." );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.png" ) );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -131,7 +131,7 @@ void RicExportCarfin::onActionTriggered( bool isChecked )
void RicExportCarfin::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export CARFIN ..." );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -110,5 +110,5 @@ void RicExportFaultsFeature::onActionTriggered( bool isChecked )
void RicExportFaultsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export Faults ..." );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
}

View File

@@ -150,5 +150,5 @@ void RicSnapshotAllPlotsToFileFeature::onActionTriggered( bool isChecked )
void RicSnapshotAllPlotsToFileFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Snapshot All Plots To File" );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.png" ) );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.svg" ) );
}

View File

@@ -178,5 +178,5 @@ void RicSnapshotAllViewsToFileFeature::onActionTriggered( bool isChecked )
void RicSnapshotAllViewsToFileFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Snapshot All Views To File" );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.png" ) );
actionToSetup->setIcon( QIcon( ":/SnapShotSaveViews.svg" ) );
}

View File

@@ -54,7 +54,7 @@ void RicSnapshotViewToClipboardFeature::copyToClipboard( const QImage& image )
//--------------------------------------------------------------------------------------------------
QIcon RicSnapshotViewToClipboardFeature::icon()
{
return QIcon( ":/SnapShot.png" );
return QIcon( ":/SnapShot.svg" );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -234,7 +234,7 @@ QString RicSnapshotViewToFileFeature::generateSaveFileName( const QString& defau
//--------------------------------------------------------------------------------------------------
QIcon RicSnapshotViewToFileFeature::icon()
{
return QIcon( ":/SnapShotSave.png" );
return QIcon( ":/SnapShotSave.svg" );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -87,5 +87,5 @@ void RicSnapshotViewToPdfFeature::onActionTriggered( bool isChecked )
void RicSnapshotViewToPdfFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export View To PDF" );
actionToSetup->setIcon( QIcon( ":/PdfSave.png" ) );
actionToSetup->setIcon( QIcon( ":/PdfSave.svg" ) );
}

View File

@@ -76,7 +76,7 @@ void RicShowTotalAllocationDataFeature::onActionTriggered( bool isChecked )
void RicShowTotalAllocationDataFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Show Total Allocation Data" );
// actionToSetup->setIcon(QIcon(":/PlotWindow24x24.png"));
// actionToSetup->setIcon(QIcon(":/PlotWindow.svg"));
}
//--------------------------------------------------------------------------------------------------

View File

@@ -126,6 +126,6 @@ void RicHoloLensExportToFolderFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicHoloLensExportToFolderFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
actionToSetup->setText( "HoloLens : Export to Folder" );
}

View File

@@ -77,7 +77,7 @@ void RicToggleMeasurementModeFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Measurement" );
actionToSetup->setToolTip( "Single Line Measurement (Ctrl+M)" );
actionToSetup->setIcon( QIcon( ":/Ruler24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Ruler.svg" ) );
actionToSetup->setCheckable( true );
auto* meas = measurement();
@@ -163,7 +163,7 @@ void RicTogglePolyMeasurementModeFeature::setupActionLook( QAction* actionToSetu
{
actionToSetup->setText( "Poly Line Measurement" );
actionToSetup->setToolTip( "Poly Line Measurement (Ctrl+Shift+M)" );
actionToSetup->setIcon( QIcon( ":/RulerPoly24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/RulerPoly.svg" ) );
actionToSetup->setCheckable( true );
auto* meas = measurement();

View File

@@ -73,5 +73,5 @@ void RicExportFractureModelPlotToFileFeature::onActionTriggered( bool isChecked
void RicExportFractureModelPlotToFileFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export Fracture Model to File" );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
}

View File

@@ -113,7 +113,7 @@ void RicImportEnsembleFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicImportEnsembleFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setIcon( QIcon( ":/SummaryEnsemble24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/SummaryEnsemble.svg" ) );
actionToSetup->setText( "Import Ensemble" );
}

View File

@@ -151,7 +151,7 @@ void RicImportGeneralDataFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicImportGeneralDataFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setIcon( QIcon( ":/Case24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Case.svg" ) );
actionToSetup->setText( "Import Eclipse Files" );
}

View File

@@ -57,6 +57,6 @@ void RicImportSummaryCaseFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicImportSummaryCaseFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setIcon( QIcon( ":/SummaryCase24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/SummaryCase.svg" ) );
actionToSetup->setText( "Import Summary Case" );
}

View File

@@ -69,11 +69,11 @@ void RicTogglePerspectiveViewFeature::setupActionLook( QAction* actionToSetup )
if ( RiaApplication::instance()->activeReservoirView()->isPerspectiveView() )
{
actionToSetup->setText( "Parallel View" );
actionToSetup->setIcon( QIcon( ":/Parallel24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Parallel.svg" ) );
return;
}
}
actionToSetup->setText( "Perspective View" );
actionToSetup->setIcon( QIcon( ":/Perspective24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Perspective.svg" ) );
}

View File

@@ -120,7 +120,7 @@ void RicAsciiExportSummaryPlotFeature::onActionTriggered( bool isChecked )
void RicAsciiExportSummaryPlotFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export Plot Data to Text File" );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -82,5 +82,5 @@ void RicEditSummaryCurveCalculationFeature::onActionTriggered( bool isChecked )
void RicEditSummaryCurveCalculationFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Edit Curve Calculation" );
actionToSetup->setIcon( QIcon( ":/calculator.png" ) );
actionToSetup->setIcon( QIcon( ":/Calculator.svg" ) );
}

View File

@@ -71,7 +71,7 @@ void RicNewDerivedSummaryFeature::onActionTriggered( bool isChecked )
void RicNewDerivedSummaryFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "New Delta Summary Case" );
actionToSetup->setIcon( QIcon( ":/SummaryCase16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/SummaryCase.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -93,5 +93,5 @@ void RicShowSummaryCurveCalculatorFeature::onActionTriggered( bool isChecked )
void RicShowSummaryCurveCalculatorFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Curve Calculator" );
actionToSetup->setIcon( QIcon( ":/calculator.png" ) );
actionToSetup->setIcon( QIcon( ":/Calculator.svg" ) );
}

View File

@@ -80,6 +80,6 @@ void RicViewZoomAllFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Zoom All" );
actionToSetup->setToolTip( "Zoom All (Ctrl+Alt+A)" );
actionToSetup->setIcon( QIcon( ":/ZoomAll16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/ZoomAll.svg" ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence( tr( "Ctrl+Alt+A" ) ) );
}

View File

@@ -75,5 +75,5 @@ void RicDeleteAllLinkedViewsFeature::onActionTriggered( bool isChecked )
void RicDeleteAllLinkedViewsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Unlink All Views" );
actionToSetup->setIcon( QIcon( ":/UnLinkView16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/UnLinkView.svg" ) );
}

View File

@@ -138,7 +138,7 @@ void RicLinkViewFeature::setupActionLook( QAction* actionToSetup )
if ( cmdImpl.viewsToLink().size() >= 2u )
{
actionToSetup->setText( "Link Selected Views" );
actionToSetup->setIcon( QIcon( ":/LinkView16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/LinkView.svg" ) );
}
else
{

View File

@@ -91,7 +91,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered( bool isChecked )
void RicLinkVisibleViewsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Link Visible Views" );
actionToSetup->setIcon( QIcon( ":/LinkView24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/LinkView.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -104,5 +104,5 @@ void RicUnLinkViewFeature::onActionTriggered( bool isChecked )
void RicUnLinkViewFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Unlink View" );
actionToSetup->setIcon( QIcon( ":/UnLinkView16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/UnLinkView.svg" ) );
}

View File

@@ -108,7 +108,7 @@ void RicAsciiExportWellLogPlotFeature::onActionTriggered( bool isChecked )
void RicAsciiExportWellLogPlotFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export Plot Data to Text File" );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -80,5 +80,5 @@ void RicShowWellPlanFeature::onActionTriggered( bool isChecked )
void RicShowWellPlanFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Show Well Plan" );
actionToSetup->setIcon( QIcon( ":/PlotWindow24x24.png" ) );
actionToSetup->setIcon( QIcon( ":/PlotWindow.svg" ) );
}