Skip to content

Commit e351381

Browse files
author
mhugent
committed
Fix for broken connection of composer legend widget buttons (ticket 2143)
git-svn-id: http://svn.osgeo.org/qgis/trunk@12246 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 849546b commit e351381

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/app/composer/qgscomposerlegendwidget.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void QgsComposerLegendWidget::on_mBoxSpaceSpinBox_valueChanged( double d )
198198
}
199199
}
200200

201-
void QgsComposerLegendWidget::on_mMoveDownPushButton_clicked()
201+
void QgsComposerLegendWidget::on_mMoveDownToolButton_clicked()
202202
{
203203
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
204204
if ( !itemModel )
@@ -248,7 +248,7 @@ void QgsComposerLegendWidget::on_mMoveDownPushButton_clicked()
248248
}
249249
}
250250

251-
void QgsComposerLegendWidget::on_mMoveUpPushButton_clicked()
251+
void QgsComposerLegendWidget::on_mMoveUpToolButton_clicked()
252252
{
253253
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
254254
if ( !itemModel )
@@ -299,7 +299,7 @@ void QgsComposerLegendWidget::on_mMoveUpPushButton_clicked()
299299
}
300300
}
301301

302-
void QgsComposerLegendWidget::on_mRemovePushButton_clicked()
302+
void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
303303
{
304304
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
305305
if ( !itemModel )

src/app/composer/qgscomposerlegendwidget.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
4848
void on_mBoxSpaceSpinBox_valueChanged( double d );
4949

5050
//item manipulation
51-
void on_mMoveDownPushButton_clicked();
52-
void on_mMoveUpPushButton_clicked();
53-
void on_mRemovePushButton_clicked();
51+
void on_mMoveDownToolButton_clicked();
52+
void on_mMoveUpToolButton_clicked();
53+
void on_mRemoveToolButton_clicked();
5454
void on_mEditPushButton_clicked();
5555
void on_mUpdatePushButton_clicked();
5656
void on_mUpdateAllPushButton_clicked();

src/ui/qgscomposerlegendwidgetbase.ui

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<rect>
3434
<x>0</x>
3535
<y>0</y>
36-
<width>352</width>
37-
<height>472</height>
36+
<width>348</width>
37+
<height>468</height>
3838
</rect>
3939
</property>
4040
<layout class="QGridLayout" name="gridLayout_3">
@@ -48,8 +48,8 @@
4848
<rect>
4949
<x>0</x>
5050
<y>0</y>
51-
<width>334</width>
52-
<height>390</height>
51+
<width>180</width>
52+
<height>347</height>
5353
</rect>
5454
</property>
5555
<attribute name="label">
@@ -176,7 +176,7 @@
176176
<rect>
177177
<x>0</x>
178178
<y>0</y>
179-
<width>334</width>
179+
<width>330</width>
180180
<height>390</height>
181181
</rect>
182182
</property>
@@ -198,21 +198,21 @@
198198
</widget>
199199
</item>
200200
<item row="1" column="0">
201-
<widget class="QToolButton" name="mMoveDownPushButton">
201+
<widget class="QToolButton" name="mMoveDownToolButton">
202202
<property name="text">
203203
<string>v</string>
204204
</property>
205205
</widget>
206206
</item>
207207
<item row="1" column="1">
208-
<widget class="QToolButton" name="mMoveUpPushButton_2">
208+
<widget class="QToolButton" name="mMoveUpToolButton">
209209
<property name="text">
210210
<string>^</string>
211211
</property>
212212
</widget>
213213
</item>
214214
<item row="1" column="2">
215-
<widget class="QToolButton" name="toolButton">
215+
<widget class="QToolButton" name="mRemoveToolButton">
216216
<property name="text">
217217
<string>X</string>
218218
</property>

0 commit comments

Comments
 (0)