Skip to content

Commit

Permalink
Fix for broken connection of composer legend widget buttons (ticket 2…
Browse files Browse the repository at this point in the history
…143)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12246 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Nov 25, 2009
1 parent c404848 commit b4f09a2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposerlegendwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void QgsComposerLegendWidget::on_mBoxSpaceSpinBox_valueChanged( double d )
}
}

void QgsComposerLegendWidget::on_mMoveDownPushButton_clicked()
void QgsComposerLegendWidget::on_mMoveDownToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
Expand Down Expand Up @@ -248,7 +248,7 @@ void QgsComposerLegendWidget::on_mMoveDownPushButton_clicked()
}
}

void QgsComposerLegendWidget::on_mMoveUpPushButton_clicked()
void QgsComposerLegendWidget::on_mMoveUpToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
Expand Down Expand Up @@ -299,7 +299,7 @@ void QgsComposerLegendWidget::on_mMoveUpPushButton_clicked()
}
}

void QgsComposerLegendWidget::on_mRemovePushButton_clicked()
void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
Expand Down
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposerlegendwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
void on_mBoxSpaceSpinBox_valueChanged( double d );

//item manipulation
void on_mMoveDownPushButton_clicked();
void on_mMoveUpPushButton_clicked();
void on_mRemovePushButton_clicked();
void on_mMoveDownToolButton_clicked();
void on_mMoveUpToolButton_clicked();
void on_mRemoveToolButton_clicked();
void on_mEditPushButton_clicked();
void on_mUpdatePushButton_clicked();
void on_mUpdateAllPushButton_clicked();
Expand Down
16 changes: 8 additions & 8 deletions src/ui/qgscomposerlegendwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>352</width>
<height>472</height>
<width>348</width>
<height>468</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
Expand All @@ -48,8 +48,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>390</height>
<width>180</width>
<height>347</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -176,7 +176,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<width>330</width>
<height>390</height>
</rect>
</property>
Expand All @@ -198,21 +198,21 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="mMoveDownPushButton">
<widget class="QToolButton" name="mMoveDownToolButton">
<property name="text">
<string>v</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="mMoveUpPushButton_2">
<widget class="QToolButton" name="mMoveUpToolButton">
<property name="text">
<string>^</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="toolButton">
<widget class="QToolButton" name="mRemoveToolButton">
<property name="text">
<string>X</string>
</property>
Expand Down

0 comments on commit b4f09a2

Please sign in to comment.