Skip to content

Commit 854358d

Browse files
author
mhugent
committedNov 24, 2009
Tool box for composer shape widget. Tab rename in label widget
git-svn-id: http://svn.osgeo.org/qgis/trunk@12238 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent b511494 commit 854358d

File tree

3 files changed

+66
-42
lines changed

3 files changed

+66
-42
lines changed
 

‎src/app/composer/qgscomposerlabelwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label );
31-
toolBox->addItem( itemPropertiesWidget, tr( "Item properties" ) );
31+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3232

3333
if ( mComposerLabel )
3434
{

‎src/app/composer/qgscomposershapewidget.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape ): QWidget( 0 ), mComposerShape( composerShape )
2424
{
2525
setupUi( this );
26+
27+
//add widget for general composer item properties
2628
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerShape );
27-
gridLayout->addWidget( itemPropertiesWidget, 6, 0, 1, 1 );
29+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
2830

2931
blockAllSignals( true );
3032

‎src/ui/qgscomposershapewidgetbase.ui

Lines changed: 62 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,75 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>162</width>
10-
<height>193</height>
9+
<width>219</width>
10+
<height>236</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout">
16+
<layout class="QGridLayout" name="gridLayout_2">
1717
<item row="0" column="0">
18-
<widget class="QComboBox" name="mShapeComboBox"/>
19-
</item>
20-
<item row="1" column="0">
21-
<widget class="QPushButton" name="mOutlineColorButton">
22-
<property name="text">
23-
<string>Shape outline color...</string>
24-
</property>
25-
</widget>
26-
</item>
27-
<item row="2" column="0">
28-
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
29-
<property name="prefix">
30-
<string>Outline width </string>
31-
</property>
32-
</widget>
33-
</item>
34-
<item row="3" column="0">
35-
<widget class="QCheckBox" name="mTransparentCheckBox">
36-
<property name="text">
37-
<string>Transparent fill</string>
38-
</property>
39-
</widget>
40-
</item>
41-
<item row="4" column="0">
42-
<widget class="QPushButton" name="mFillColorButton">
43-
<property name="text">
44-
<string>Shape fill Color...</string>
45-
</property>
46-
</widget>
47-
</item>
48-
<item row="5" column="0">
49-
<widget class="QSpinBox" name="mRotationSpinBox">
50-
<property name="prefix">
51-
<string comment="Rotation" extracomment="Rotation">Rotation </string>
52-
</property>
53-
<property name="maximum">
54-
<number>359</number>
18+
<widget class="QToolBox" name="toolBox">
19+
<property name="currentIndex">
20+
<number>0</number>
5521
</property>
22+
<widget class="QWidget" name="Shape">
23+
<property name="geometry">
24+
<rect>
25+
<x>0</x>
26+
<y>0</y>
27+
<width>201</width>
28+
<height>192</height>
29+
</rect>
30+
</property>
31+
<attribute name="label">
32+
<string>Shape</string>
33+
</attribute>
34+
<layout class="QGridLayout" name="gridLayout">
35+
<item row="0" column="0">
36+
<widget class="QComboBox" name="mShapeComboBox"/>
37+
</item>
38+
<item row="1" column="0">
39+
<widget class="QPushButton" name="mOutlineColorButton">
40+
<property name="text">
41+
<string>Shape outline color...</string>
42+
</property>
43+
</widget>
44+
</item>
45+
<item row="2" column="0">
46+
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
47+
<property name="prefix">
48+
<string>Outline width </string>
49+
</property>
50+
</widget>
51+
</item>
52+
<item row="3" column="0">
53+
<widget class="QCheckBox" name="mTransparentCheckBox">
54+
<property name="text">
55+
<string>Transparent fill</string>
56+
</property>
57+
</widget>
58+
</item>
59+
<item row="4" column="0">
60+
<widget class="QPushButton" name="mFillColorButton">
61+
<property name="text">
62+
<string>Shape fill Color...</string>
63+
</property>
64+
</widget>
65+
</item>
66+
<item row="5" column="0">
67+
<widget class="QSpinBox" name="mRotationSpinBox">
68+
<property name="prefix">
69+
<string comment="Rotation" extracomment="Rotation">Rotation </string>
70+
</property>
71+
<property name="maximum">
72+
<number>359</number>
73+
</property>
74+
</widget>
75+
</item>
76+
</layout>
77+
</widget>
5678
</widget>
5779
</item>
5880
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.