#4892 Improved names and added improved icons to linked views commands

This commit is contained in:
Jacob Støren 2019-10-28 12:38:20 +01:00
parent 6af4356f36
commit d5a39ab3aa
13 changed files with 18 additions and 10 deletions

View File

@ -118,10 +118,11 @@ void RicLinkViewFeature::setupActionLook( QAction* actionToSetup )
if ( selectedGridViews.size() > 1u ) if ( selectedGridViews.size() > 1u )
{ {
actionToSetup->setText( "Link Selected Views" ); actionToSetup->setText( "Link Selected Views" );
actionToSetup->setIcon( QIcon( ":/LinkView16x16.png" ) );
} }
else else
{ {
actionToSetup->setText( "Link View" ); actionToSetup->setText( "Link View" );
actionToSetup->setIcon( QIcon( ":/ControlledView16x16.png" ) );
} }
actionToSetup->setIcon( QIcon( ":/chain.png" ) );
} }

View File

@ -92,7 +92,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered( bool isChecked )
void RicLinkVisibleViewsFeature::setupActionLook( QAction* actionToSetup ) void RicLinkVisibleViewsFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "Link Visible Views" ); actionToSetup->setText( "Link Visible Views" );
actionToSetup->setIcon( QIcon( ":/chain.png" ) ); actionToSetup->setIcon( QIcon( ":/LinkView16x16.png" ) );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -171,8 +171,8 @@ void RicLinkVisibleViewsFeature::linkViews( std::vector<RimGridView*>& views )
RicLinkVisibleViewsFeatureUi featureUi; RicLinkVisibleViewsFeatureUi featureUi;
featureUi.setViews( masterCandidates ); featureUi.setViews( masterCandidates );
caf::PdmUiPropertyViewDialog propertyDialog( nullptr, &featureUi, "Select Master View", "" ); caf::PdmUiPropertyViewDialog propertyDialog( nullptr, &featureUi, "Select Primary View", "" );
propertyDialog.setWindowIcon( QIcon( ":/chain.png" ) ); propertyDialog.setWindowIcon( QIcon( ":/LinkView16x16.png" ) );
if ( propertyDialog.exec() != QDialog::Accepted ) return; if ( propertyDialog.exec() != QDialog::Accepted ) return;
masterView = featureUi.masterView(); masterView = featureUi.masterView();

View File

@ -34,9 +34,9 @@ CAF_PDM_SOURCE_INIT( RicLinkVisibleViewsFeatureUi, "RicLinkVisibleViewsFeatureUi
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi( void ) RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi( void )
{ {
CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/chain.png", "", "" ); CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/LinkView16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Master View", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View", "", "", "" );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -96,5 +96,6 @@ void RicSetMasterViewFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSetMasterViewFeature::setupActionLook( QAction* actionToSetup ) void RicSetMasterViewFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "Set As Master View" ); actionToSetup->setText( "Set As Primary View" );
actionToSetup->setIcon( QIcon( ":/MasterView16x16.png" ) );
} }

View File

@ -69,5 +69,5 @@ void RicShowLinkOptionsFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicShowLinkOptionsFeature::setupActionLook( QAction* actionToSetup ) void RicShowLinkOptionsFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "Show Link Options" ); actionToSetup->setText( "Show Linked View Options" );
} }

View File

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

View File

@ -127,7 +127,7 @@ RimProject::RimProject( void )
CAF_PDM_InitFieldNoDefault( &viewLinkerCollection, CAF_PDM_InitFieldNoDefault( &viewLinkerCollection,
"LinkedViews", "LinkedViews",
"Linked Views (field in RimProject", "Linked Views (field in RimProject",
":/chain.png", ":/LinkView16x16.png",
"", "",
"" ); "" );
viewLinkerCollection.uiCapability()->setUiHidden( true ); viewLinkerCollection.uiCapability()->setUiHidden( true );

View File

@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimViewLinkerCollection, "RimViewLinkerCollection" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimViewLinkerCollection::RimViewLinkerCollection( void ) RimViewLinkerCollection::RimViewLinkerCollection( void )
{ {
CAF_PDM_InitObject( "Linked Views", ":/chain.png", "", "" ); CAF_PDM_InitObject( "Linked Views", ":/LinkView16x16.png", "", "" );
CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" );
isActive.uiCapability()->setUiHidden( true ); isActive.uiCapability()->setUiHidden( true );

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

View File

@ -58,6 +58,10 @@
<file>GeoMechCasePropTable24x24.png</file> <file>GeoMechCasePropTable24x24.png</file>
<file>GeoMechCases48x48.png</file> <file>GeoMechCases48x48.png</file>
<file>chain.png</file> <file>chain.png</file>
<file>UnLinkView16x16.png</file>
<file>LinkView16x16.png</file>
<file>MasterView16x16.png</file>
<file>ControlledView16x16.png</file>
<file>TileWindows24x24.png</file> <file>TileWindows24x24.png</file>
<file>Window16x16.png</file> <file>Window16x16.png</file>
<file>LasFile16x16.png</file> <file>LasFile16x16.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B