Skip to content

Commit cd1a432

Browse files
author
mhugent
committed
Composer grid map widget is a dock widget now
git-svn-id: http://svn.osgeo.org/qgis/trunk@11797 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b05e60f commit cd1a432

1 file changed

Lines changed: 164 additions & 156 deletions

File tree

‎src/ui/qgscomposermapwidgetbase.ui‎

Lines changed: 164 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>466</width>
10-
<height>649</height>
9+
<width>472</width>
10+
<height>657</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -255,162 +255,170 @@
255255
</widget>
256256
</item>
257257
<item row="6" column="0">
258-
<widget class="QGroupBox" name="mGridGroupBox">
259-
<property name="title">
258+
<widget class="QDockWidget" name="mGridDockWidget">
259+
<property name="floating">
260+
<bool>true</bool>
261+
</property>
262+
<property name="features">
263+
<set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
264+
</property>
265+
<property name="windowTitle">
260266
<string>Grid</string>
261267
</property>
262-
<layout class="QGridLayout" name="gridLayout">
263-
<item row="0" column="0">
264-
<widget class="QCheckBox" name="mGridCheckBox">
265-
<property name="text">
266-
<string>Show grid</string>
267-
</property>
268-
</widget>
269-
</item>
270-
<item row="1" column="0">
271-
<widget class="QLabel" name="mGridTypeLabel">
272-
<property name="text">
273-
<string>Grid type:</string>
274-
</property>
275-
</widget>
276-
</item>
277-
<item row="1" column="1" colspan="2">
278-
<widget class="QComboBox" name="mGridTypeComboBox"/>
279-
</item>
280-
<item row="2" column="0">
281-
<widget class="QLabel" name="mIntervalXLabel">
282-
<property name="text">
283-
<string>Interval X:</string>
284-
</property>
285-
</widget>
286-
</item>
287-
<item row="2" column="1" colspan="2">
288-
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
289-
<property name="maximum">
290-
<double>999999.000000000000000</double>
291-
</property>
292-
</widget>
293-
</item>
294-
<item row="2" column="3">
295-
<widget class="QLabel" name="mIntervalYLabel">
296-
<property name="text">
297-
<string>Interval Y:</string>
298-
</property>
299-
</widget>
300-
</item>
301-
<item row="2" column="4">
302-
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
303-
<property name="maximum">
304-
<double>9999999.000000000000000</double>
305-
</property>
306-
</widget>
307-
</item>
308-
<item row="3" column="0">
309-
<widget class="QLabel" name="mOffsetXLabel">
310-
<property name="text">
311-
<string>Offset X:</string>
312-
</property>
313-
</widget>
314-
</item>
315-
<item row="3" column="1" colspan="2">
316-
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
317-
<property name="maximum">
318-
<double>9999999.000000000000000</double>
319-
</property>
320-
</widget>
321-
</item>
322-
<item row="3" column="3">
323-
<widget class="QLabel" name="mOffsetYLabel">
324-
<property name="text">
325-
<string>Offset Y:</string>
326-
</property>
327-
</widget>
328-
</item>
329-
<item row="3" column="4">
330-
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
331-
<property name="maximum">
332-
<double>9999999.000000000000000</double>
333-
</property>
334-
</widget>
335-
</item>
336-
<item row="4" column="0">
337-
<widget class="QLabel" name="mLineWidthLabel">
338-
<property name="text">
339-
<string>Line width:</string>
340-
</property>
341-
</widget>
342-
</item>
343-
<item row="4" column="1" colspan="2">
344-
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
345-
</item>
346-
<item row="4" column="3">
347-
<widget class="QLabel" name="mLineColorLabel">
348-
<property name="text">
349-
<string>Line color:</string>
350-
</property>
351-
</widget>
352-
</item>
353-
<item row="4" column="4">
354-
<widget class="QgsColorButton" name="mLineColorButton">
355-
<property name="sizePolicy">
356-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
357-
<horstretch>0</horstretch>
358-
<verstretch>0</verstretch>
359-
</sizepolicy>
360-
</property>
361-
<property name="text">
362-
<string/>
363-
</property>
364-
</widget>
365-
</item>
366-
<item row="5" column="0" colspan="2">
367-
<widget class="QCheckBox" name="mDrawAnnotationCheckBox">
368-
<property name="text">
369-
<string>Draw annotation</string>
370-
</property>
371-
</widget>
372-
</item>
373-
<item row="6" column="0" colspan="2">
374-
<widget class="QLabel" name="mAnnotationPositionLabel">
375-
<property name="text">
376-
<string>Annotation position:</string>
377-
</property>
378-
</widget>
379-
</item>
380-
<item row="6" column="2">
381-
<widget class="QComboBox" name="mAnnotationPositionComboBox"/>
382-
</item>
383-
<item row="6" column="3">
384-
<widget class="QLabel" name="mAnnotationDirectionLabel">
385-
<property name="frameShape">
386-
<enum>QFrame::NoFrame</enum>
387-
</property>
388-
<property name="text">
389-
<string>Annotation direction:</string>
390-
</property>
391-
</widget>
392-
</item>
393-
<item row="6" column="4">
394-
<widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
395-
</item>
396-
<item row="7" column="0" colspan="2">
397-
<widget class="QLabel" name="mDistanceToFrameLabel">
398-
<property name="text">
399-
<string>Distance to map frame:</string>
400-
</property>
401-
</widget>
402-
</item>
403-
<item row="7" column="2">
404-
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
405-
</item>
406-
<item row="7" column="4">
407-
<widget class="QPushButton" name="mAnnotationFontButton">
408-
<property name="text">
409-
<string>Font...</string>
410-
</property>
411-
</widget>
412-
</item>
413-
</layout>
268+
<widget class="QWidget" name="dockWidgetContents">
269+
<layout class="QGridLayout" name="gridLayout">
270+
<item row="0" column="0">
271+
<widget class="QCheckBox" name="mGridCheckBox">
272+
<property name="text">
273+
<string>Show grid</string>
274+
</property>
275+
</widget>
276+
</item>
277+
<item row="1" column="0">
278+
<widget class="QLabel" name="mGridTypeLabel">
279+
<property name="text">
280+
<string>Grid type:</string>
281+
</property>
282+
</widget>
283+
</item>
284+
<item row="1" column="1" colspan="3">
285+
<widget class="QComboBox" name="mGridTypeComboBox"/>
286+
</item>
287+
<item row="2" column="0">
288+
<widget class="QLabel" name="mIntervalXLabel">
289+
<property name="text">
290+
<string>Interval X:</string>
291+
</property>
292+
</widget>
293+
</item>
294+
<item row="2" column="1" colspan="3">
295+
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
296+
<property name="maximum">
297+
<double>999999.000000000000000</double>
298+
</property>
299+
</widget>
300+
</item>
301+
<item row="2" column="5">
302+
<widget class="QLabel" name="mIntervalYLabel">
303+
<property name="text">
304+
<string>Interval Y:</string>
305+
</property>
306+
</widget>
307+
</item>
308+
<item row="2" column="6">
309+
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
310+
<property name="maximum">
311+
<double>9999999.000000000000000</double>
312+
</property>
313+
</widget>
314+
</item>
315+
<item row="3" column="0">
316+
<widget class="QLabel" name="mOffsetXLabel">
317+
<property name="text">
318+
<string>Offset X:</string>
319+
</property>
320+
</widget>
321+
</item>
322+
<item row="3" column="1" colspan="3">
323+
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
324+
<property name="maximum">
325+
<double>9999999.000000000000000</double>
326+
</property>
327+
</widget>
328+
</item>
329+
<item row="3" column="5">
330+
<widget class="QLabel" name="mOffsetYLabel">
331+
<property name="text">
332+
<string>Offset Y:</string>
333+
</property>
334+
</widget>
335+
</item>
336+
<item row="3" column="6">
337+
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
338+
<property name="maximum">
339+
<double>9999999.000000000000000</double>
340+
</property>
341+
</widget>
342+
</item>
343+
<item row="4" column="0">
344+
<widget class="QLabel" name="mLineWidthLabel">
345+
<property name="text">
346+
<string>Line width:</string>
347+
</property>
348+
</widget>
349+
</item>
350+
<item row="4" column="1" colspan="3">
351+
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
352+
</item>
353+
<item row="4" column="4" colspan="2">
354+
<widget class="QLabel" name="mLineColorLabel">
355+
<property name="text">
356+
<string>Line color:</string>
357+
</property>
358+
</widget>
359+
</item>
360+
<item row="4" column="6">
361+
<widget class="QgsColorButton" name="mLineColorButton">
362+
<property name="sizePolicy">
363+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
364+
<horstretch>0</horstretch>
365+
<verstretch>0</verstretch>
366+
</sizepolicy>
367+
</property>
368+
<property name="text">
369+
<string/>
370+
</property>
371+
</widget>
372+
</item>
373+
<item row="5" column="0" colspan="2">
374+
<widget class="QCheckBox" name="mDrawAnnotationCheckBox">
375+
<property name="text">
376+
<string>Draw annotation</string>
377+
</property>
378+
</widget>
379+
</item>
380+
<item row="6" column="0" colspan="2">
381+
<widget class="QLabel" name="mAnnotationPositionLabel">
382+
<property name="text">
383+
<string>Annotation position:</string>
384+
</property>
385+
</widget>
386+
</item>
387+
<item row="6" column="2" colspan="2">
388+
<widget class="QComboBox" name="mAnnotationPositionComboBox"/>
389+
</item>
390+
<item row="6" column="5">
391+
<widget class="QLabel" name="mAnnotationDirectionLabel">
392+
<property name="frameShape">
393+
<enum>QFrame::NoFrame</enum>
394+
</property>
395+
<property name="text">
396+
<string>Annotation direction:</string>
397+
</property>
398+
</widget>
399+
</item>
400+
<item row="6" column="6">
401+
<widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
402+
</item>
403+
<item row="7" column="0" colspan="3">
404+
<widget class="QLabel" name="mDistanceToFrameLabel">
405+
<property name="text">
406+
<string>Distance to map frame:</string>
407+
</property>
408+
</widget>
409+
</item>
410+
<item row="7" column="3" colspan="2">
411+
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
412+
</item>
413+
<item row="7" column="6">
414+
<widget class="QPushButton" name="mAnnotationFontButton">
415+
<property name="text">
416+
<string>Font...</string>
417+
</property>
418+
</widget>
419+
</item>
420+
</layout>
421+
</widget>
414422
</widget>
415423
</item>
416424
<item row="7" column="0">

0 commit comments

Comments
 (0)