17 changes: 9 additions & 8 deletions src/gui/symbology-ng/qgssymbollayerv2widget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,14 @@ class QgsLinePatternFillSymbolLayer;

class GUI_EXPORT QgsLinePatternFillSymbolLayerWidget : public QgsSymbolLayerV2Widget, private Ui::WidgetLinePatternFill
{
Q_OBJECT
Q_OBJECT

public:

QgsLinePatternFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = NULL );
static QgsSymbolLayerV2Widget* create( const QgsVectorLayer* vl ) { return new QgsLinePatternFillSymbolLayerWidget( vl ); }

virtual void setSymbolLayer( QgsSymbolLayerV2* layer);
virtual void setSymbolLayer( QgsSymbolLayerV2* layer );
virtual QgsSymbolLayerV2* symbolLayer();

protected:
Expand All @@ -286,6 +286,7 @@ class GUI_EXPORT QgsLinePatternFillSymbolLayerWidget : public QgsSymbolLayerV2Wi
void on_mAngleSpinBox_valueChanged( double d );
void on_mDistanceSpinBox_valueChanged( double d );
void on_mLineWidthSpinBox_valueChanged( double d );
void on_mOffsetSpinBox_valueChanged( double d );
void on_mColorPushButton_clicked();
void on_mOutlinePushButton_clicked();
};
Expand All @@ -298,24 +299,24 @@ class QgsPointPatternFillSymbolLayer;

class GUI_EXPORT QgsPointPatternFillSymbolLayerWidget: public QgsSymbolLayerV2Widget, private Ui::WidgetPointPatternFill
{
Q_OBJECT
Q_OBJECT

public:
QgsPointPatternFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = NULL );
static QgsSymbolLayerV2Widget* create( const QgsVectorLayer* vl ) { return new QgsPointPatternFillSymbolLayerWidget( vl ); }

virtual void setSymbolLayer( QgsSymbolLayerV2* layer);
virtual void setSymbolLayer( QgsSymbolLayerV2* layer );
virtual QgsSymbolLayerV2* symbolLayer();

protected:
QgsPointPatternFillSymbolLayer* mLayer;
void updateMarkerIcon();

private slots:
void on_mHorizontalDistanceSpinBox_valueChanged ( double d );
void on_mVerticalDistanceSpinBox_valueChanged ( double d );
void on_mHorizontalDisplacementSpinBox_valueChanged ( double d );
void on_mVerticalDisplacementSpinBox_valueChanged ( double d );
void on_mHorizontalDistanceSpinBox_valueChanged( double d );
void on_mVerticalDistanceSpinBox_valueChanged( double d );
void on_mHorizontalDisplacementSpinBox_valueChanged( double d );
void on_mVerticalDisplacementSpinBox_valueChanged( double d );
void on_mChangeMarkerButton_clicked();
};

Expand Down
22 changes: 18 additions & 4 deletions src/ui/symbollayer/widget_linepatternfill.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,34 +56,48 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mColorLabel">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Change</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="mOutlineLabel">
<property name="text">
<string>Outline</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QPushButton" name="mOutlinePushButton">
<property name="text">
<string>Change</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mOffsetLabel">
<property name="text">
<string>Offset</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="mOffsetSpinBox">
<property name="minimum">
<double>-99.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down