Expand Up
@@ -14,7 +14,7 @@
<string >Layer Properties</string >
</property >
<property name =" windowIcon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/icons/qgis-icon-16x16.png</normaloff >:/images/icons/qgis-icon-16x16.png</iconset >
</property >
<property name =" modal"
Expand Down
Expand Up
@@ -76,7 +76,7 @@
</property >
<widget class =" QWidget" name =" tabWidgetPage1"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/symbology.png</normaloff >:/images/themes/default/propertyicons/symbology.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -186,7 +186,7 @@
</widget >
<widget class =" QWidget" name =" labelingTab"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/labels.png</normaloff >:/images/themes/default/propertyicons/labels.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -250,7 +250,7 @@
</widget >
<widget class =" QWidget" name =" tabWidgetPage3"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/attributes.png</normaloff >:/images/themes/default/propertyicons/attributes.png</iconset >
</attribute >
<attribute name =" title"
Expand All
@@ -273,7 +273,7 @@
</property >
<property name =" icon"
<iconset >
<normaloff >../../../../../.designer/xpm/new_attribute.png</normaloff >../../../../../.designer/xpm/new_attribute.png</iconset >
<normaloff >../../../../../../. designer/xpm/new_attribute.png</normaloff >../ ../../../../../.designer/xpm/new_attribute.png</iconset >
</property >
<property name =" shortcut"
<string >Ctrl+N</string >
Expand All
@@ -290,7 +290,7 @@
</property >
<property name =" icon"
<iconset >
<normaloff >../../../../../.designer/xpm/delete_attribute.png</normaloff >../../../../../.designer/xpm/delete_attribute.png</iconset >
<normaloff >../../../../../../. designer/xpm/delete_attribute.png</normaloff >../ ../../../../../.designer/xpm/delete_attribute.png</iconset >
</property >
<property name =" shortcut"
<string >Ctrl+X</string >
Expand Down
Expand Up
@@ -365,7 +365,7 @@
</widget >
<widget class =" QWidget" name =" tabWidgetPage4"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/general.png</normaloff >:/images/themes/default/propertyicons/general.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -737,7 +737,7 @@
</widget >
<widget class =" QWidget" name =" tabWidgetPage5"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/metadata.png</normaloff >:/images/themes/default/propertyicons/metadata.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -822,7 +822,7 @@
</widget >
<widget class =" QWidget" name =" tabWidgetPage6"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/action.png</normaloff >:/images/themes/default/propertyicons/action.png</iconset >
</attribute >
<attribute name =" title"
Expand All
@@ -849,7 +849,7 @@
</widget >
<widget class =" QWidget" name =" mJoinPage"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/join.png</normaloff >:/images/themes/default/propertyicons/join.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -883,7 +883,7 @@
<string />
</property >
<property name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/symbologyAdd.png</normaloff >:/images/themes/default/symbologyAdd.png</iconset >
</property >
</widget >
Expand All
@@ -894,7 +894,7 @@
<string />
</property >
<property name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/symbologyRemove.png</normaloff >:/images/themes/default/symbologyRemove.png</iconset >
</property >
</widget >
Expand Down
Expand Up
@@ -942,7 +942,7 @@
</widget >
<widget class =" QWidget" name =" mDiagramPage"
<attribute name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/propertyicons/diagram.png</normaloff >:/images/themes/default/propertyicons/diagram.png</iconset >
</attribute >
<attribute name =" title"
Expand Down
Expand Up
@@ -1182,104 +1182,6 @@
</layout >
</widget >
</item >
<item row =" 2" column =" 0" colspan =" 6"
<widget class =" QGroupBox" name =" mSizeGroupBox"
<property name =" title"
<string >Size</string >
</property >
<layout class =" QGridLayout" name =" gridLayout_12"
<item row =" 0" column =" 0"
<widget class =" QCheckBox" name =" mFixedSizeCheckBox"
<property name =" text"
<string >Fixed size</string >
</property >
</widget >
</item >
<item row =" 0" column =" 1"
<widget class =" QDoubleSpinBox" name =" mDiagramSizeSpinBox"
<property name =" maximum"
<double >9999999.990000000223517</double >
</property >
</widget >
</item >
<item row =" 0" column =" 3"
<spacer name =" horizontalSpacer_2"
<property name =" orientation"
<enum >Qt::Horizontal</enum >
</property >
<property name =" sizeHint" stdset =" 0"
<size >
<width >335</width >
<height >20</height >
</size >
</property >
</spacer >
</item >
<item row =" 1" column =" 0" colspan =" 4"
<widget class =" QLabel" name =" mLinearlyScalingLabel"
<property name =" text"
<string >Scale linearly between 0 and the following attribute value / diagram size:</string >
</property >
<property name =" wordWrap"
<bool >true</bool >
</property >
</widget >
</item >
<item row =" 2" column =" 0" colspan =" 4"
<layout class =" QHBoxLayout" name =" mLinearlyScalingLayout"
<item >
<widget class =" QLabel" name =" mSizeAttributeLabel"
<property name =" text"
<string >Attribute</string >
</property >
</widget >
</item >
<item >
<widget class =" QComboBox" name =" mSizeAttributeComboBox"
</item >
<item >
<widget class =" QPushButton" name =" mFindMaximumValueButton"
<property name =" text"
<string >Find maximum value</string >
</property >
</widget >
</item >
<item >
<widget class =" QLineEdit" name =" mValueLineEdit"
</item >
<item >
<widget class =" QLabel" name =" mSizeLabel"
<property name =" text"
<string >Size</string >
</property >
</widget >
</item >
<item >
<widget class =" QSpinBox" name =" mSizeSpinBox"
<property name =" maximum"
<number >10000000</number >
</property >
</widget >
</item >
</layout >
</item >
<item row =" 0" column =" 2"
<layout class =" QHBoxLayout" name =" horizontalLayout_12"
<item >
<widget class =" QLabel" name =" mDiagramUnitsLabel"
<property name =" text"
<string >Size units</string >
</property >
</widget >
</item >
<item >
<widget class =" QComboBox" name =" mDiagramUnitComboBox"
</item >
</layout >
</item >
</layout >
</widget >
</item >
<item row =" 3" column =" 0" colspan =" 6"
<widget class =" QGroupBox" name =" mPlacementGroupBox"
<property name =" title"
Expand Down
Expand Up
@@ -1375,6 +1277,20 @@
</item >
</layout >
</item >
<item row =" 2" column =" 0"
<layout class =" QHBoxLayout" name =" horizontalLayout_14"
<item >
<widget class =" QLabel" name =" mLabelPlacementLabel"
<property name =" text"
<string >Label placement:</string >
</property >
</widget >
</item >
<item >
<widget class =" QComboBox" name =" mLabelPlacementComboBox"
</item >
</layout >
</item >
</layout >
</widget >
</item >
Expand Down
Expand Up
@@ -1420,7 +1336,7 @@
<string />
</property >
<property name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/symbologyRemove.png</normaloff >:/images/themes/default/symbologyRemove.png</iconset >
</property >
</widget >
Expand All
@@ -1437,7 +1353,7 @@
<string />
</property >
<property name =" icon"
<iconset resource =" ../../images/images.qrc"
<iconset resource =" ../../../../Quantum-GIS/ images/images.qrc"
<normaloff >:/images/themes/default/symbologyAdd.png</normaloff >:/images/themes/default/symbologyAdd.png</iconset >
</property >
</widget >
Expand All
@@ -1459,6 +1375,104 @@
</column >
</widget >
</item >
<item row =" 2" column =" 0" colspan =" 6"
<widget class =" QGroupBox" name =" mSizeGroupBox"
<property name =" title"
<string >Size</string >
</property >
<layout class =" QGridLayout" name =" gridLayout_12"
<item row =" 0" column =" 0"
<widget class =" QCheckBox" name =" mFixedSizeCheckBox"
<property name =" text"
<string >Fixed size</string >
</property >
</widget >
</item >
<item row =" 0" column =" 1"
<widget class =" QDoubleSpinBox" name =" mDiagramSizeSpinBox"
<property name =" maximum"
<double >9999999.990000000223517</double >
</property >
</widget >
</item >
<item row =" 0" column =" 3"
<spacer name =" horizontalSpacer_2"
<property name =" orientation"
<enum >Qt::Horizontal</enum >
</property >
<property name =" sizeHint" stdset =" 0"
<size >
<width >335</width >
<height >20</height >
</size >
</property >
</spacer >
</item >
<item row =" 1" column =" 0" colspan =" 4"
<widget class =" QLabel" name =" mLinearlyScalingLabel"
<property name =" text"
<string >Scale linearly between 0 and the following attribute value / diagram size:</string >
</property >
<property name =" wordWrap"
<bool >true</bool >
</property >
</widget >
</item >
<item row =" 2" column =" 0" colspan =" 4"
<layout class =" QHBoxLayout" name =" mLinearlyScalingLayout"
<item >
<widget class =" QLabel" name =" mSizeAttributeLabel"
<property name =" text"
<string >Attribute</string >
</property >
</widget >
</item >
<item >
<widget class =" QComboBox" name =" mSizeAttributeComboBox"
</item >
<item >
<widget class =" QPushButton" name =" mFindMaximumValueButton"
<property name =" text"
<string >Find maximum value</string >
</property >
</widget >
</item >
<item >
<widget class =" QLineEdit" name =" mValueLineEdit"
</item >
<item >
<widget class =" QLabel" name =" mSizeLabel"
<property name =" text"
<string >Size</string >
</property >
</widget >
</item >
<item >
<widget class =" QSpinBox" name =" mSizeSpinBox"
<property name =" maximum"
<number >10000000</number >
</property >
</widget >
</item >
</layout >
</item >
<item row =" 0" column =" 2"
<layout class =" QHBoxLayout" name =" horizontalLayout_12"
<item >
<widget class =" QLabel" name =" mDiagramUnitsLabel"
<property name =" text"
<string >Size units</string >
</property >
</widget >
</item >
<item >
<widget class =" QComboBox" name =" mDiagramUnitComboBox"
</item >
</layout >
</item >
</layout >
</widget >
</item >
</layout >
</widget >
</widget >
Expand All
@@ -1485,7 +1499,7 @@
<tabstop >pbnQueryBuilder</tabstop >
</tabstops >
<resources >
<include location =" ../../images/images.qrc"
<include location =" ../../../../Quantum-GIS/ images/images.qrc"
</resources >
<connections >
<connection >
Expand Down