Skip to content

Commit

Permalink
Make QTextLabels word wrap to allow for longer text (useful for some …
Browse files Browse the repository at this point in the history 
…languages

that have longer text in map composer labels).


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7626 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Nov 20, 2007
1 parent d8c92c5 commit 2e0da00
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 5 deletions.
26 changes: 25 additions & 1 deletion src/ui/qgscomposermapbase.ui
View file
Expand Up @@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>292</width>
<height>386</height>
<height>417</height>
</rect>
</property>
<property name="sizePolicy" >
Expand Down Expand Up @@ -96,6 +96,9 @@
<property name="text" >
<string>Scale:</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="2" >
Expand Down Expand Up @@ -143,6 +146,9 @@
<property name="text" >
<string>Set</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mCalculateComboBox</cstring>
</property>
Expand Down Expand Up @@ -173,6 +179,9 @@
<property name="text" >
<string>Height</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mHeightLineEdit</cstring>
</property>
Expand All @@ -186,6 +195,9 @@
<property name="text" >
<string>Width</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mWidthLineEdit</cstring>
</property>
Expand All @@ -199,6 +211,9 @@
<property name="text" >
<string>Line width scale</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mWidthScaleLineEdit</cstring>
</property>
Expand All @@ -209,6 +224,9 @@
<property name="text" >
<string>Symbol scale</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mSymbolScaleLineEdit</cstring>
</property>
Expand All @@ -219,6 +237,9 @@
<property name="text" >
<string>Font size scale</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mFontScaleLineEdit</cstring>
</property>
Expand All @@ -236,6 +257,9 @@
<property name="text" >
<string>Preview</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mPreviewModeComboBox</cstring>
</property>
Expand Down
13 changes: 11 additions & 2 deletions src/ui/qgscomposerpicturebase.ui
View file
Expand Up @@ -42,15 +42,15 @@
<widget class="QPushButton" name="mPictureBrowseButton" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>50</width>
<width>150</width>
<height>32767</height>
</size>
</property>
Expand Down Expand Up @@ -118,6 +118,9 @@
<property name="text" >
<string>Width</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mWidthLineEdit</cstring>
</property>
Expand All @@ -136,6 +139,9 @@
<property name="text" >
<string>Height</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mHeightLineEdit</cstring>
</property>
Expand All @@ -154,6 +160,9 @@
<property name="text" >
<string>Angle</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mAngleLineEdit</cstring>
</property>
Expand Down
20 changes: 19 additions & 1 deletion src/ui/qgscomposerscalebarbase.ui
View file
Expand Up @@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>261</width>
<width>303</width>
<height>487</height>
</rect>
</property>
Expand Down Expand Up @@ -40,6 +40,9 @@
<property name="text" >
<string>Line width</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mLineWidthSpinBox</cstring>
</property>
Expand Down Expand Up @@ -84,6 +87,9 @@
<property name="text" >
<string>Unit label</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mUnitLabelLineEdit</cstring>
</property>
Expand Down Expand Up @@ -120,6 +126,9 @@
<property name="text" >
<string>Map</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mMapComboBox</cstring>
</property>
Expand All @@ -130,6 +139,9 @@
<property name="text" >
<string>Segment size</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mSegmentLengthLineEdit</cstring>
</property>
Expand All @@ -146,6 +158,9 @@
<property name="text" >
<string>Map units per scalebar unit</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mMapUnitsPerUnitLineEdit</cstring>
</property>
Expand All @@ -156,6 +171,9 @@
<property name="text" >
<string>Number of segments</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mNumSegmentsLineEdit</cstring>
</property>
Expand Down
11 changes: 10 additions & 1 deletion src/ui/qgscomposervectorlegendbase.ui
View file
Expand Up @@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>216</width>
<width>285</width>
<height>419</height>
</rect>
</property>
Expand Down Expand Up @@ -52,6 +52,9 @@
<property name="text" >
<string>Preview</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mPreviewModeComboBox</cstring>
</property>
Expand Down Expand Up @@ -88,6 +91,9 @@
<property name="text" >
<string>Map</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mMapComboBox</cstring>
</property>
Expand All @@ -106,6 +112,9 @@
<property name="text" >
<string>Title</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
<property name="buddy" >
<cstring>mTitleLineEdit</cstring>
</property>
Expand Down

0 comments on commit 2e0da00

Please sign in to comment.