Skip to content

Commit

Permalink
Add icons
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Oct 21, 2024
1 parent 90d518e commit 4434016
Show file tree
Hide file tree
Showing 11 changed files with 134 additions and 7 deletions.
15 changes: 15 additions & 0 deletions ApplicationExeCode/Resources/NavigationProperty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ApplicationExeCode/Resources/ResInsight.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,13 @@
<file>cloud-and-server.svg</file>
<file>Cloud.svg</file>
<file>CloudBlobs.svg</file>
<file>arrow-swap.svg</file>
<file>inspect.svg</file>
<file>pin.svg</file>
<file>pinned.svg</file>
<file>pinned-remove.svg</file>
<file>Select.svg</file>
<file>NavigationProperty.svg</file>
</qresource>
<qresource prefix="/Shader">
<file>fs_CellFace.glsl</file>
Expand Down
13 changes: 13 additions & 0 deletions ApplicationExeCode/Resources/Select.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ApplicationExeCode/Resources/arrow-swap.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ApplicationExeCode/Resources/inspect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions ApplicationExeCode/Resources/pin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions ApplicationExeCode/Resources/pinned-remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ApplicationExeCode/Resources/pinned.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ RimFieldQuickAccess::RimFieldQuickAccess()
CAF_PDM_InitFieldNoDefault( &m_fieldReference, "FieldReference", "FieldReference" );
m_fieldReference = new RimFieldReference();

CAF_PDM_InitFieldNoDefault( &m_selectObjectButton, "SelectObject", "...", ":/Bullet.png", "Select Object in Property Editor" );
CAF_PDM_InitFieldNoDefault( &m_selectObjectButton, "SelectObject", "...", ":/Select.svg", "Select Object in Property Editor" );
m_selectObjectButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonCallbackEditor::uiEditorTypeName() );
m_selectObjectButton.xmlCapability()->disableIO();

CAF_PDM_InitFieldNoDefault( &m_removeItemButton, "RemoveItem", "...", ":/pin.svg", "Remove Quick Access" );
CAF_PDM_InitFieldNoDefault( &m_removeItemButton, "RemoveItem", "...", ":/pinned-remove.svg", "Remove Quick Access" );
m_removeItemButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonCallbackEditor::uiEditorTypeName() );
m_removeItemButton.xmlCapability()->disableIO();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
/////////////////////////////////////////////////////////////////////////////////

#include "RimFieldQuickAccessGroup.h"
#include "RimFieldQuickAccess.h"
#include "RimGridView.h"

#include "RiaLogging.h"

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ QIcon RiuDockWidgetTools::dockIcon( const QString dockWidgetName )
else if ( dockWidgetName == plotMainWindowCloudTreeName() )
return QIcon( ":/Cloud.svg" );
else if ( dockWidgetName == plotWindowQuickAccessName() || dockWidgetName == mainWindowQuickAccessName() )
return QIcon( ":/pin.svg" );
return QIcon( ":/pinned.svg" );

return QIcon( ":/view.svg" );
}
Expand Down

0 comments on commit 4434016

Please sign in to comment.