Skip to content

Commit

Permalink
Tool box for composer shape widget. Tab rename in label widget
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12238 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Nov 24, 2009
1 parent b511494 commit 854358d
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerlabelwidget.cpp
View file
Expand Up @@ -28,7 +28,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg

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

if ( mComposerLabel )
{
Expand Down
4 changes: 3 additions & 1 deletion src/app/composer/qgscomposershapewidget.cpp
View file
Expand Up @@ -23,8 +23,10 @@
QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape ): QWidget( 0 ), mComposerShape( composerShape )
{
setupUi( this );

//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerShape );
gridLayout->addWidget( itemPropertiesWidget, 6, 0, 1, 1 );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );

blockAllSignals( true );

Expand Down
102 changes: 62 additions & 40 deletions src/ui/qgscomposershapewidgetbase.ui
View file
Expand Up @@ -6,53 +6,75 @@
<rect>
<x>0</x>
<y>0</y>
<width>162</width>
<height>193</height>
<width>219</width>
<height>236</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QComboBox" name="mShapeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mOutlineColorButton">
<property name="text">
<string>Shape outline color...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string>Outline width </string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mTransparentCheckBox">
<property name="text">
<string>Transparent fill</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="mFillColorButton">
<property name="text">
<string>Shape fill Color...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QSpinBox" name="mRotationSpinBox">
<property name="prefix">
<string comment="Rotation" extracomment="Rotation">Rotation </string>
</property>
<property name="maximum">
<number>359</number>
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="Shape">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>201</width>
<height>192</height>
</rect>
</property>
<attribute name="label">
<string>Shape</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QComboBox" name="mShapeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mOutlineColorButton">
<property name="text">
<string>Shape outline color...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string>Outline width </string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mTransparentCheckBox">
<property name="text">
<string>Transparent fill</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="mFillColorButton">
<property name="text">
<string>Shape fill Color...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QSpinBox" name="mRotationSpinBox">
<property name="prefix">
<string comment="Rotation" extracomment="Rotation">Rotation </string>
</property>
<property name="maximum">
<number>359</number>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 854358d

Please sign in to comment.