Skip to content

Commit b1c4a83

Browse files
author
Arunmozhi
committed
fixed a button issues in widgets
1 parent aeec55e commit b1c4a83

5 files changed

+30
-122
lines changed

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

-48
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,6 @@ QgsPointPatternFillSymbolLayerWidget::QgsPointPatternFillSymbolLayerWidget( cons
11671167
QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 )
11681168
{
11691169
setupUi( this );
1170-
updateMarkerIcon();
11711170
}
11721171

11731172

@@ -1183,23 +1182,13 @@ void QgsPointPatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* lay
11831182
mVerticalDistanceSpinBox->setValue( mLayer->distanceY() );
11841183
mHorizontalDisplacementSpinBox->setValue( mLayer->displacementX() );
11851184
mVerticalDisplacementSpinBox->setValue( mLayer->displacementY() );
1186-
updateMarkerIcon();
11871185
}
11881186

11891187
QgsSymbolLayerV2* QgsPointPatternFillSymbolLayerWidget::symbolLayer()
11901188
{
11911189
return mLayer;
11921190
}
11931191

1194-
void QgsPointPatternFillSymbolLayerWidget::updateMarkerIcon()
1195-
{
1196-
if ( mLayer )
1197-
{
1198-
QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mLayer->subSymbol(), mChangeMarkerButton->iconSize() );
1199-
mChangeMarkerButton->setIcon( icon );
1200-
}
1201-
}
1202-
12031192
void QgsPointPatternFillSymbolLayerWidget::on_mHorizontalDistanceSpinBox_valueChanged( double d )
12041193
{
12051194
if ( mLayer )
@@ -1236,23 +1225,6 @@ void QgsPointPatternFillSymbolLayerWidget::on_mVerticalDisplacementSpinBox_value
12361225
}
12371226
}
12381227

1239-
void QgsPointPatternFillSymbolLayerWidget::on_mChangeMarkerButton_clicked()
1240-
{
1241-
if ( !mLayer )
1242-
{
1243-
return;
1244-
}
1245-
1246-
QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
1247-
if ( dlg.exec() == QDialog::Rejected )
1248-
{
1249-
return;
1250-
}
1251-
1252-
updateMarkerIcon();
1253-
emit changed();
1254-
}
1255-
12561228
/////////////
12571229

12581230
QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent )
@@ -1362,8 +1334,6 @@ QgsCentroidFillSymbolLayerV2Widget::QgsCentroidFillSymbolLayerV2Widget( const Qg
13621334
mLayer = NULL;
13631335

13641336
setupUi( this );
1365-
1366-
connect( btnChangeMarker, SIGNAL( clicked() ), this, SLOT( setMarker() ) );
13671337
}
13681338

13691339
void QgsCentroidFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
@@ -1373,28 +1343,10 @@ void QgsCentroidFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
13731343

13741344
// layer type is correct, we can do the cast
13751345
mLayer = static_cast<QgsCentroidFillSymbolLayerV2*>( layer );
1376-
1377-
// set values
1378-
updateMarker();
13791346
}
13801347

13811348
QgsSymbolLayerV2* QgsCentroidFillSymbolLayerV2Widget::symbolLayer()
13821349
{
13831350
return mLayer;
13841351
}
13851352

1386-
void QgsCentroidFillSymbolLayerV2Widget::setMarker()
1387-
{
1388-
QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), mVectorLayer, this );
1389-
if ( dlg.exec() == 0 )
1390-
return;
1391-
updateMarker();
1392-
1393-
emit changed();
1394-
}
1395-
1396-
void QgsCentroidFillSymbolLayerV2Widget::updateMarker()
1397-
{
1398-
QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mLayer->subSymbol(), btnChangeMarker->iconSize() );
1399-
btnChangeMarker->setIcon( icon );
1400-
}

‎src/gui/symbology-ng/qgssymbollayerv2widget.h

-7
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,12 @@ class GUI_EXPORT QgsPointPatternFillSymbolLayerWidget: public QgsSymbolLayerV2Wi
328328

329329
protected:
330330
QgsPointPatternFillSymbolLayer* mLayer;
331-
void updateMarkerIcon();
332331

333332
private slots:
334333
void on_mHorizontalDistanceSpinBox_valueChanged( double d );
335334
void on_mVerticalDistanceSpinBox_valueChanged( double d );
336335
void on_mHorizontalDisplacementSpinBox_valueChanged( double d );
337336
void on_mVerticalDisplacementSpinBox_valueChanged( double d );
338-
void on_mChangeMarkerButton_clicked();
339337
};
340338

341339
/////////
@@ -391,12 +389,7 @@ class GUI_EXPORT QgsCentroidFillSymbolLayerV2Widget : public QgsSymbolLayerV2Wid
391389
virtual void setSymbolLayer( QgsSymbolLayerV2* layer );
392390
virtual QgsSymbolLayerV2* symbolLayer();
393391

394-
public slots:
395-
void setMarker();
396-
397392
protected:
398-
void updateMarker();
399-
400393
QgsCentroidFillSymbolLayerV2* mLayer;
401394
};
402395

‎src/gui/symbology-ng/qgssymbolslistwidget.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
8282
connect( btnAddToStyle, SIGNAL( clicked() ), this, SLOT( addSymbolToStyle() ) );
8383
btnAddToStyle->setIcon( QIcon( QgsApplication::defaultThemePath() + "symbologyAdd.png" ) );
8484

85+
// Set symbol color in btnColor
86+
updateSymbolColor();
87+
8588
}
8689

8790

‎src/ui/symbollayer/widget_centroidfill.ui

+1-24
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>366</width>
9+
<width>368</width>
1010
<height>242</height>
1111
</rect>
1212
</property>
@@ -16,26 +16,6 @@
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
1818
<layout class="QHBoxLayout" name="horizontalLayout">
19-
<item>
20-
<widget class="QLabel" name="label">
21-
<property name="text">
22-
<string>Marker</string>
23-
</property>
24-
</widget>
25-
</item>
26-
<item>
27-
<widget class="QPushButton" name="btnChangeMarker">
28-
<property name="sizePolicy">
29-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
30-
<horstretch>0</horstretch>
31-
<verstretch>0</verstretch>
32-
</sizepolicy>
33-
</property>
34-
<property name="text">
35-
<string>Change</string>
36-
</property>
37-
</widget>
38-
</item>
3919
<item>
4020
<spacer>
4121
<property name="orientation">
@@ -69,9 +49,6 @@
6949
</item>
7050
</layout>
7151
</widget>
72-
<tabstops>
73-
<tabstop>btnChangeMarker</tabstop>
74-
</tabstops>
7552
<resources/>
7653
<connections/>
7754
</ui>

‎src/ui/symbollayer/widget_pointpatternfill.ui

+26-43
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,15 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>243</width>
9+
<width>283</width>
1010
<height>152</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<widget class="QLabel" name="mMarkerLabel">
19-
<property name="frameShape">
20-
<enum>QFrame::NoFrame</enum>
21-
</property>
22-
<property name="text">
23-
<string>Marker</string>
24-
</property>
25-
</widget>
26-
</item>
2717
<item row="0" column="1">
28-
<widget class="QPushButton" name="mChangeMarkerButton">
29-
<property name="text">
30-
<string>Change</string>
31-
</property>
32-
</widget>
33-
</item>
34-
<item row="1" column="0">
35-
<widget class="QLabel" name="mHorizontalDistanceLabel">
36-
<property name="text">
37-
<string>Horizontal distance</string>
38-
</property>
39-
</widget>
40-
</item>
41-
<item row="1" column="1">
4218
<widget class="QDoubleSpinBox" name="mHorizontalDistanceSpinBox">
4319
<property name="decimals">
4420
<number>5</number>
@@ -48,14 +24,17 @@
4824
</property>
4925
</widget>
5026
</item>
51-
<item row="2" column="0">
52-
<widget class="QLabel" name="mVerticalDistanceLabel">
53-
<property name="text">
54-
<string>Vertical distance</string>
27+
<item row="3" column="1">
28+
<widget class="QDoubleSpinBox" name="mVerticalDisplacementSpinBox">
29+
<property name="decimals">
30+
<number>5</number>
31+
</property>
32+
<property name="maximum">
33+
<double>999999999.990000009536743</double>
5534
</property>
5635
</widget>
5736
</item>
58-
<item row="2" column="1">
37+
<item row="1" column="1">
5938
<widget class="QDoubleSpinBox" name="mVerticalDistanceSpinBox">
6039
<property name="decimals">
6140
<number>5</number>
@@ -65,14 +44,28 @@
6544
</property>
6645
</widget>
6746
</item>
68-
<item row="3" column="0">
47+
<item row="2" column="0">
6948
<widget class="QLabel" name="mHorizontalDisplacementLabel">
7049
<property name="text">
7150
<string>Horizontal displacement</string>
7251
</property>
7352
</widget>
7453
</item>
75-
<item row="3" column="1">
54+
<item row="0" column="0">
55+
<widget class="QLabel" name="mHorizontalDistanceLabel">
56+
<property name="text">
57+
<string>Horizontal distance</string>
58+
</property>
59+
</widget>
60+
</item>
61+
<item row="1" column="0">
62+
<widget class="QLabel" name="mVerticalDistanceLabel">
63+
<property name="text">
64+
<string>Vertical distance</string>
65+
</property>
66+
</widget>
67+
</item>
68+
<item row="2" column="1">
7669
<widget class="QDoubleSpinBox" name="mHorizontalDisplacementSpinBox">
7770
<property name="decimals">
7871
<number>5</number>
@@ -82,23 +75,13 @@
8275
</property>
8376
</widget>
8477
</item>
85-
<item row="4" column="0">
78+
<item row="3" column="0">
8679
<widget class="QLabel" name="mVerticalDisplacementLabel">
8780
<property name="text">
8881
<string>Vertical displacement</string>
8982
</property>
9083
</widget>
9184
</item>
92-
<item row="4" column="1">
93-
<widget class="QDoubleSpinBox" name="mVerticalDisplacementSpinBox">
94-
<property name="decimals">
95-
<number>5</number>
96-
</property>
97-
<property name="maximum">
98-
<double>999999999.990000009536743</double>
99-
</property>
100-
</widget>
101-
</item>
10285
</layout>
10386
</widget>
10487
<resources/>

0 commit comments

Comments
 (0)