An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit b54a80e2 authored by jcfr's avatar jcfr
Browse files

ENH: SlicerQT - Add icons (also remove the 1 pixel border, make them...

ENH: SlicerQT - Add icons (also remove the 1 pixel border, make them transparent and indexed) to Base/QTGUI, QTModules/Volumes and Base/QTCoreModules/

git-svn-id: http://svn.slicer.org/Slicer4/trunk@11124 3bd1e089-480b-0410-8dfb-8563597acbee
parent 49cf5db4
......@@ -107,6 +107,8 @@ SET(qSlicerQT_UI_SRCS
# Resources
SET(qt_module_resources
Resources/SlicerQT.qrc
${SlicerBaseQTGUI_SOURCE_DIR}/Resources/qSlicerBaseQTGUI.qrc
${SlicerBaseQTCoreModules_SOURCE_DIR}/Resources/qSlicerBaseQTCoreModules.qrc
)
#SET(qSlicerQT_RC_FILE Resources/SlicerQT.rc)
......
......@@ -20,7 +20,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>25</height>
<height>24</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
......@@ -32,7 +32,7 @@
<addaction name="actionFileAddData"/>
<addaction name="actionFileAddVolume"/>
<addaction name="actionFileAddTransform"/>
<addaction name="actionFileSave"/>
<addaction name="actionFileSaveScene"/>
<addaction name="actionFileCloseScene"/>
<addaction name="separator"/>
<addaction name="actionFileExit"/>
......@@ -139,7 +139,36 @@
</layout>
</widget>
</widget>
<widget class="QToolBar" name="MainToolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionFileLoadScene"/>
<addaction name="actionFileSaveScene"/>
<addaction name="separator"/>
</widget>
<widget class="QToolBar" name="ModuleToolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<action name="actionFileLoadScene">
<property name="icon">
<iconset resource="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc">
<normaloff>:/Icons/LoadScene.png</normaloff>:/Icons/LoadScene.png</iconset>
</property>
<property name="text">
<string>Load Scene</string>
</property>
......@@ -161,18 +190,30 @@
</property>
</action>
<action name="actionFileAddVolume">
<property name="icon">
<iconset resource="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc">
<normaloff>:/Icons/LoadVolume.png</normaloff>:/Icons/LoadVolume.png</iconset>
</property>
<property name="text">
<string>Add Volume</string>
</property>
</action>
<action name="actionFileAddTransform">
<property name="icon">
<iconset resource="../../../../Base/QTCoreModules/Resources/qSlicerBaseQTCoreModules.qrc">
<normaloff>:/Icons/LoadTransform.png</normaloff>:/Icons/LoadTransform.png</iconset>
</property>
<property name="text">
<string>Add Transform</string>
</property>
</action>
<action name="actionFileSave">
<action name="actionFileSaveScene">
<property name="icon">
<iconset resource="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc">
<normaloff>:/Icons/SaveScene.png</normaloff>:/Icons/SaveScene.png</iconset>
</property>
<property name="text">
<string>Save</string>
<string>Save Scene</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
......@@ -375,6 +416,9 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc"/>
<include location="../../../../Base/QTCoreModules/Resources/qSlicerBaseQTCoreModules.qrc"/>
</resources>
<connections/>
</ui>
......@@ -7,11 +7,15 @@
<x>0</x>
<y>0</y>
<width>304</width>
<height>94</height>
<height>96</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string>Cameras</string>
</property>
<property name="windowIcon">
<iconset resource="../qSlicerBaseQTCoreModules.qrc">
<normaloff>:/Icons/Cameras.png</normaloff>:/Icons/Cameras.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
......@@ -91,7 +95,9 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../qSlicerBaseQTCoreModules.qrc"/>
</resources>
<connections>
<connection>
<sender>qSlicerCamerasModule</sender>
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>366</width>
<width>518</width>
<height>756</height>
</rect>
</property>
......@@ -16,6 +16,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Transforms</string>
</property>
<property name="windowIcon">
<iconset resource="../qSlicerBaseQTCoreModules.qrc">
<normaloff>:/Icons/Transforms.png</normaloff>:/Icons/Transforms.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="qCTKCollapsibleButton" name="LoadCollapsibleWidget">
......@@ -60,239 +67,239 @@
<property name="contentsLineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>7</number>
</property>
<property name="margin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="TransformNodeSelectorLabel">
<property name="text">
<string>Transform Node:</string>
</property>
</widget>
</item>
<item>
<widget class="qMRMLNodeSelector" name="TransformNodeSelector">
<property name="editEnabled">
<bool>false</bool>
</property>
<property name="NodeType">
<string>vtkMRMLLinearTransformNode</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="qCTKCollapsibleGroupBox" name="MatrixViewGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Transform Matrix</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>6</number>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>7</number>
</property>
<property name="margin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="TransformNodeSelectorLabel">
<property name="text">
<string>Transform Node:</string>
</property>
<property name="rightMargin">
<number>2</number>
</widget>
</item>
<item>
<widget class="qMRMLNodeSelector" name="TransformNodeSelector">
<property name="editEnabled">
<bool>false</bool>
</property>
<property name="bottomMargin">
<number>2</number>
<property name="NodeType">
<string>vtkMRMLLinearTransformNode</string>
</property>
<item>
<widget class="qMRMLMatrixWidget" name="MatrixWidget">
<row/>
<row/>
<row/>
<row/>
<column/>
<column/>
<column/>
<column/>
<item row="0" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="qMRMLTransformSliders" name="TranslationSliders"/>
</item>
<item>
<widget class="qMRMLTransformSliders" name="RotationSliders">
<property name="Title">
<string>Rotation</string>
</widget>
</item>
</layout>
</item>
<item>
<widget class="qCTKCollapsibleGroupBox" name="MatrixViewGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Transform Matrix</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<property name="TypeOfTransform">
<enum>qMRMLTransformSliders::ROTATION</enum>
<property name="leftMargin">
<number>2</number>
</property>
<property name="minMaxVisible">
<bool>false</bool>
<property name="topMargin">
<number>6</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_1">
<property name="spacing">
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="QGroupBox" name="CoordinateReferenceGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Coordinate Reference</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="GlobalRadioButton">
<property name="text">
<string>Global</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="LocalRadioButton">
<property name="text">
<string>Local</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="IdentityPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Identity</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="InvertPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Revert</string>
</property>
<widget class="qMRMLMatrixWidget" name="MatrixWidget">
<row/>
<row/>
<row/>
<row/>
<column/>
<column/>
<column/>
<column/>
<item row="0" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="0" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="1" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="2" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="0">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="1">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="2">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
<item row="3" column="3">
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="qMRMLTransformSliders" name="TranslationSliders"/>
</item>
<item>
<widget class="qMRMLTransformSliders" name="RotationSliders">
<property name="Title">
<string>Rotation</string>
</property>
<property name="TypeOfTransform">
<enum>qMRMLTransformSliders::ROTATION</enum>
</property>
<property name="minMaxVisible">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_1">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QGroupBox" name="CoordinateReferenceGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Coordinate Reference</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="GlobalRadioButton">
<property name="text">
<string>Global</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="LocalRadioButton">
<property name="text">
<string>Local</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>