diff --git a/public/icons.svg b/public/icons.svg deleted file mode 100644 index 3b0690b4f..000000000 --- a/public/icons.svg +++ /dev/null @@ -1,246 +0,0 @@ - - - HUD - - - - - - - - - Additional Measurements - - - - - - Lesions - - - - - - Settings - - - - Complete - - - - - - Locked - - - - Studies - - - - - - Window / Level - - - - - - - Link - - - - - - - Non-Target Measurement - - - - - - - - Target Measurement - - - - - - - Target CR Measurement - - CR - - - - - Target UN Measurement - - UN - - - - - Temporary Measurement - - - - - - - - More - - - - - - Pan - - - - - - - - - - - Zoom - - - - - - - Invert - - - - Stack Scroll - - - - Elliptical ROI - - - - Magnify - - - - Reset - - - - Rotate - - - - Rotate Right - - - - Cineplay Toggle - - - - Vertical - - - - Horizontal - - - - Trial Information - - - - - - Expand - - - - Add - - - - Close - - - - - - Comment - - - - - Capture Screen - - - - - - - - Warning - - - - - - - Viewport Link - - - - - - - Theme - - - - Log - - - - Server - - - - Study List - - - - Logout - - - - Password - - - - - - - - - - - - diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js index 0e374babc..a80a8af67 100644 --- a/src/connectedComponents/ToolbarRow.js +++ b/src/connectedComponents/ToolbarRow.js @@ -1,10 +1,12 @@ +import './ToolbarRow.css' + import React, { Component } from 'react' -import PropTypes from 'prop-types' -import OHIF from 'ohif-core' -import { RoundedButtonGroup, Icon } from 'react-viewerbase' + import ConnectedLayoutButton from './ConnectedLayoutButton' import ConnectedPluginSwitch from './ConnectedPluginSwitch.js' -import './ToolbarRow.css' +import OHIF from 'ohif-core' +import PropTypes from 'prop-types' +import { RoundedButtonGroup } from 'react-viewerbase' class ToolbarRow extends Component { static propTypes = { @@ -32,11 +34,7 @@ class ToolbarRow extends Component { const leftSidebarToggle = [ { value: 'studies', - icon: { - name: 'studies', - width: 15, - height: 13, - }, + icon: 'th-large', bottomLabel: 'Series', }, ] @@ -44,11 +42,7 @@ class ToolbarRow extends Component { const rightSidebarToggle = [ { value: 'measurements', - icon: { - name: 'measurement-lesions', - width: 15, - height: 13, - }, + icon: 'list', bottomLabel: 'Measurements', }, ] diff --git a/src/images/icons.svg b/src/images/icons.svg deleted file mode 100644 index aa3817af6..000000000 --- a/src/images/icons.svg +++ /dev/null @@ -1,237 +0,0 @@ - - - HUD - - - - - - - - - Additional Measurements - - - - - - Lesions - - - - - - Settings - - - - Complete - - - - - - Locked - - - - Studies - - - - - - Window / Level - - - - - - - Link - - - - - - - Non-Target Measurement - - - - - - - - Target Measurement - - - - - - - Target CR Measurement - - CR - - - - - Target UN Measurement - - UN - - - - - Temporary Measurement - - - - - - - - More - - - - - - Pan - - - - - - - - - - - Zoom - - - - - - - Invert - - - - Stack Scroll - - - - Elliptical ROI - - - - Magnify - - - - Reset - - - - Rotate - - - - Rotate Right - - - - Cineplay Toggle - - - - Vertical - - - - Horizontal - - - - Trial Information - - - - - - Expand - - - - Add - - - - Close - - - - - - Comment - - - - - Capture Screen - - - - - - - - Warning - - - - - - - Viewport Link - - - - - - - Theme - - - - Log - - - - Server - - - - Study List - - - - Logout - - - - Password - - - diff --git a/src/utils/getDefaultToolbarButtons.js b/src/utils/getDefaultToolbarButtons.js index fff7069b8..4f26f6bd5 100644 --- a/src/utils/getDefaultToolbarButtons.js +++ b/src/utils/getDefaultToolbarButtons.js @@ -4,35 +4,35 @@ export default function() { command: 'StackScroll', type: 'tool', text: 'Stack Scroll', - icon: 'tool-stack-scroll', + icon: 'bars', active: false, }, { command: 'Zoom', type: 'tool', text: 'Zoom', - icon: 'tool-zoom', + icon: 'search-plus', active: false, }, { command: 'Wwwc', type: 'tool', text: 'Levels', - icon: 'tool-levels', + icon: 'level', active: true, }, { command: 'Pan', type: 'tool', text: 'Pan', - icon: 'tool-pan', + icon: 'arrows', active: false, }, { command: 'Length', type: 'tool', text: 'Length', - icon: 'tool-measure-temp', + icon: 'measure-temp', active: false, }, /*{ @@ -53,7 +53,7 @@ export default function() { command: 'Bidirectional', type: 'tool', text: 'Bidirectional', - icon: 'tool-measure-target', + icon: 'measure-target', active: false, }, { @@ -88,14 +88,14 @@ export default function() { command: 'RectangleRoi', type: 'tool', text: 'RectangleRoi', - icon: 'square', + icon: 'square-o', active: false, }, { command: 'reset', type: 'command', text: 'Reset', - icon: 'tool-reset', + icon: 'reset', active: false, }, ]