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

…sored by City of Uster, Switzerland)
qgis · Sep 17, 2014 · 05524d7 · 05524d7
1 parent 9fd7390
commit 05524d7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/python/core/composer/qgscomposerattributetablev2.sip b/python/core/composer/qgscomposerattributetablev2.sip
@@ -1,3 +1,4 @@
+
 /**Helper class for sorting tables, takes into account sorting column and ascending / descending*/
 class QgsComposerAttributeTableCompareV2
 {

diff --git a/python/core/composer/qgscomposertablev2.sip b/python/core/composer/qgscomposertablev2.sip
@@ -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

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -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 );

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -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>