Skip to content
Permalink
Browse files

[composer] Remove gui controls for adding deprecated table item (spon…

…sored

by City of Uster, Switzerland)
  • Loading branch information
nyalldawson committed Sep 17, 2014
1 parent 9fd7390 commit 05524d7017911719c9be0b358b00e083aea39b8b
@@ -1,3 +1,4 @@

/**Helper class for sorting tables, takes into account sorting column and ascending / descending*/
class QgsComposerAttributeTableCompareV2
{
@@ -8,7 +8,7 @@ typedef QList< QVariant > QgsComposerTableRow;
* for a QgsComposerTable
* \note Added in version 2.5
*/
typedef QList< QgsComposerTableRow > QgsComposerTableContents;
typedef QList< QList< QVariant > > QgsComposerTableContents;

/**List of column definitions for a QgsComposerTable
* \note Added in version 2.5
@@ -167,7 +167,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
toggleActionGroup->addAction( mActionAddTriangle );
toggleActionGroup->addAction( mActionAddEllipse );
toggleActionGroup->addAction( mActionAddArrow );
toggleActionGroup->addAction( mActionAddTable );
//toggleActionGroup->addAction( mActionAddTable );
toggleActionGroup->addAction( mActionAddAttributeTable );
toggleActionGroup->addAction( mActionAddHtml );
toggleActionGroup->setExclusive( true );
@@ -355,7 +355,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
layoutMenu->addAction( mActionAddNewLegend );
layoutMenu->addAction( mActionAddImage );
layoutMenu->addAction( mActionAddArrow );
layoutMenu->addAction( mActionAddTable );
//layoutMenu->addAction( mActionAddTable );
layoutMenu->addAction( mActionAddAttributeTable );
layoutMenu->addSeparator();
layoutMenu->addAction( mActionSelectMoveItem );
@@ -35,6 +35,29 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QScrollArea" name="scrollArea">
<property name="geometry">
<rect>
<x>280</x>
<y>110</y>
<width>120</width>
<height>80</height>
</rect>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>118</width>
<height>78</height>
</rect>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
@@ -117,7 +140,6 @@
<addaction name="mActionAddNewLegend"/>
<addaction name="mActionAddNewScalebar"/>
<addaction name="mActionAddArrow"/>
<addaction name="mActionAddTable"/>
<addaction name="mActionAddAttributeTable"/>
<addaction name="mActionAddHtml"/>
</widget>
@@ -961,8 +983,8 @@
</action>
</widget>
<resources>
<include location="../../images/images.qrc"/>
<include location="../../python/plugins/fTools/resources.qrc"/>
<include location="../../images/images.qrc"/>
</resources>
<connections/>
</ui>

0 comments on commit 05524d7

Please sign in to comment.
You can’t perform that action at this time.