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

#6460 Improve consistency of icons on high-DPI displays

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-08 10:31:23 +02:00
parent cd3e331e12
commit 7afbae6597
19 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp
View File

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

2
ApplicationCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp
View File

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

2
ApplicationCode/Commands/ExportCommands/RicExportCarfin.cpp
View File

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

2
ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
View File

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

2
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp
View File

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

2
ApplicationCode/Commands/RicExportFractureModelPlotToFileFeature.cpp
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( ":/Save.png" ) );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
}

2
ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
View File

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

2
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

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

2
ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
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( ":/Save.png" ) );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp
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( ":/Save.png" ) );
actionToSetup->setIcon( QIcon( ":/Save24x24.png" ) );
}
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -340,7 +340,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicImportWellMeasurementsFeature";
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder.subMenuStart( "Export Well Paths", QIcon( ":/Save.png" ) );
menuBuilder.subMenuStart( "Export Well Paths", QIcon( ":/Save24x24.png" ) );
menuBuilder << "RicExportSelectedWellPathsFeature";
menuBuilder << "RicExportVisibleWellPathsFeature";
menuBuilder.subMenuEnd();
@@ -1343,7 +1343,11 @@ int RimContextCommandBuilder::appendExportWellPaths( caf::CmdFeatureMenuBuilder&
candidates << "RicExportSelectedWellPathsFeature";
candidates << "RicExportVisibleWellPathsFeature";
return appendSubMenuWithCommands( menuBuilder, candidates, "Export Well Paths", QIcon( ":/Save.png" ), addSeparatorBeforeMenu );
return appendSubMenuWithCommands( menuBuilder,
candidates,
"Export Well Paths",
QIcon( ":/Save24x24.png" ),
addSeparatorBeforeMenu );
}
//-------------------------------------------------------------------------------------------------

BIN
ApplicationCode/Resources/Case24x24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

5
ApplicationCode/Resources/ResInsight.qrc
View File

@@ -15,6 +15,7 @@
<file>Axes16x16.png</file>
<file>BottomAxis16x16.png</file>
<file>Case48x48.png</file>
<file>Case24x24.png</file>
<file>Cases16x16.png</file>
<file>CasingDesign16x16.png</file>
<file>CellFilter_Range.png</file>
@@ -120,7 +121,8 @@
<file>RightAxis16x16.png</file>
<file>Ruler24x24.png</file>
<file>RulerPoly24x24.png</file>
<file>Save.png</file>
<file>Save24x24.png</file>
<file>SaveAs24x24.png</file>
<file>SnapShot.png</file>
<file>SnapShotSave.png</file>
<file>SnapShotSaveViews.png</file>
@@ -130,6 +132,7 @@
<file>StepUpDown16x16.png</file>
<file>StepUpDownCorner16x16.png</file>
<file>SummaryCase16x16.png</file>
<file>SummaryCase24x24.png</file>
<file>SummaryCase48x48.png</file>
<file>SummaryCases16x16.png</file>
<file>SummaryCurve16x16.png</file>

BIN
ApplicationCode/Resources/Save.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
ApplicationCode/Resources/Save24x24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
ApplicationCode/Resources/Save48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
ApplicationCode/Resources/SaveAs24x24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
ApplicationCode/Resources/SummaryCase24x24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

6
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@@ -243,7 +243,7 @@ void RiuPlotMainWindow::createMenus()
QMenu* importMenu = fileMenu->addMenu( "&Import" );
QMenu* importEclipseMenu = importMenu->addMenu( QIcon( ":/Case48x48.png" ), "Eclipse Cases" );
QMenu* importEclipseMenu = importMenu->addMenu( QIcon( ":/Case24x24.png" ), "Eclipse Cases" );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCaseFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCasesFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportInputEclipseCaseFeature" ) );
@@ -252,13 +252,13 @@ void RiuPlotMainWindow::createMenus()
#ifdef USE_ODB_API
importMenu->addSeparator();
QMenu* importGeoMechMenu = importMenu->addMenu( QIcon( ":/GeoMechCase48x48.png" ), "Geo Mechanical Cases" );
QMenu* importGeoMechMenu = importMenu->addMenu( QIcon( ":/GeoMechCase24x24.png" ), "Geo Mechanical Cases" );
importGeoMechMenu->addAction( cmdFeatureMgr->action( "RicImportGeoMechCaseFeature" ) );
importGeoMechMenu->addAction( cmdFeatureMgr->action( "RicImportElementPropertyFeature" ) );
#endif
importMenu->addSeparator();
QMenu* importSummaryMenu = importMenu->addMenu( QIcon( ":/SummaryCase48x48.png" ), "Summary Cases" );
QMenu* importSummaryMenu = importMenu->addMenu( QIcon( ":/SummaryCase24x24.png" ), "Summary Cases" );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCaseFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCasesFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryGroupFeature" ) );