[QGIS Commit] r12246 - in trunk/qgis/src: app/composer ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Nov 25 04:25:59 EST 2009
Author: mhugent
Date: 2009-11-25 04:25:53 -0500 (Wed, 25 Nov 2009)
New Revision: 12246
Modified:
trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
trunk/qgis/src/app/composer/qgscomposerlegendwidget.h
trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
Log:
Fix for broken connection of composer legend widget buttons (ticket 2143)
Modified: trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp 2009-11-24 21:00:32 UTC (rev 12245)
+++ trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp 2009-11-25 09:25:53 UTC (rev 12246)
@@ -198,7 +198,7 @@
}
}
-void QgsComposerLegendWidget::on_mMoveDownPushButton_clicked()
+void QgsComposerLegendWidget::on_mMoveDownToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
@@ -248,7 +248,7 @@
}
}
-void QgsComposerLegendWidget::on_mMoveUpPushButton_clicked()
+void QgsComposerLegendWidget::on_mMoveUpToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
@@ -299,7 +299,7 @@
}
}
-void QgsComposerLegendWidget::on_mRemovePushButton_clicked()
+void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
{
QStandardItemModel* itemModel = qobject_cast<QStandardItemModel *>( mItemTreeView->model() );
if ( !itemModel )
Modified: trunk/qgis/src/app/composer/qgscomposerlegendwidget.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerlegendwidget.h 2009-11-24 21:00:32 UTC (rev 12245)
+++ trunk/qgis/src/app/composer/qgscomposerlegendwidget.h 2009-11-25 09:25:53 UTC (rev 12246)
@@ -48,9 +48,9 @@
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();
Modified: trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2009-11-24 21:00:32 UTC (rev 12245)
+++ trunk/qgis/src/ui/qgscomposerlegendwidgetbase.ui 2009-11-25 09:25:53 UTC (rev 12246)
@@ -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">
@@ -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">
@@ -176,7 +176,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>334</width>
+ <width>330</width>
<height>390</height>
</rect>
</property>
@@ -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>
More information about the QGIS-commit
mailing list