sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:qgis/Quantum-GIS

Browse Source
This commit is contained in:
Tim Sutton 2012-09-06 16:00:15 +02:00
commit e690048b46
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/qgsdiagrampropertiesbase.ui
View File

@ -674,7 +674,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QPushButton" name="mEngineSettingsButton"> <widget class="QPushButton" name="mEngineSettingsButton">
<property name="text"> <property name="text">
<string>PAL engine settings</string> <string>Automated placement settings</string>
</property> </property>
</widget> </widget>
</item> </item>

53
src/ui/qgsengineconfigdialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>316</width>
<height>307</height> <height>328</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -205,18 +205,45 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="chkShowAllLabels"> <layout class="QGridLayout" name="gridLayout_2">
<property name="text"> <property name="verticalSpacing">
<string>Show all labels and features (i.e. including colliding objects)</string> <number>6</number>
</property> </property>
</widget> <item row="0" column="1">
</item> <widget class="QLabel" name="label_5">
<item> <property name="text">
<widget class="QCheckBox" name="chkShowCandidates"> <string>Show all labels and features for all layers</string>
<property name="text"> </property>
<string>Show candidates (for debugging)</string> </widget>
</property> </item>
</widget> <item row="0" column="0">
<widget class="QCheckBox" name="chkShowAllLabels">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="chkShowCandidates">
<property name="text">
<string>Show candidates (for debugging)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>(i.e. including colliding objects)</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">

2
src/ui/qgslabelingguibase.ui
View File

@ -1562,7 +1562,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Engine settings</string> <string>Automated placement settings</string>
</property> </property>
</widget> </widget>
</item> </item>