remove QgsScrollAreaWidgetPlugin from custom widgets

3nids · 3nids · commit 500175b8e8aa · 2017-07-24T10:45:42.000+02:00
it had to be removed form the widget list in uic plugin. It might be better to provide the real list of implemented widgets rather than the full gui list. fixes #16428
diff --git a/python/custom_widgets/qgis_customwidgets.py b/python/custom_widgets/qgis_customwidgets.py
@@ -50,6 +50,8 @@
 def moduleInformation():
     try:
         import qgis.gui
-        return "qgis.gui", dir(qgis.gui)
+        widget_list=dir(qgis.gui)
+        widget_list.remove('QgsScrollArea')
+        return "qgis.gui", widget_list
     except ImportError:
         return "", []
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -36,7 +36,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
   qgsrelationreferencewidgetplugin.cpp
   qgsscalerangewidgetplugin.cpp
   qgsscalewidgetplugin.cpp
-  qgsscrollareawidgetplugin.cpp
+#  qgsscrollareawidgetplugin.cpp
   qgsspinboxplugin.cpp
 )
 
@@ -66,7 +66,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
   qgsrelationreferencewidgetplugin.h
   qgsscalerangewidgetplugin.h
   qgsscalewidgetplugin.h
-  qgsscrollareawidgetplugin.h
+#  qgsscrollareawidgetplugin.h
   qgsspinboxplugin.h
 )
 
diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp
@@ -39,7 +39,7 @@
 #include "qgsrelationreferencewidgetplugin.h"
 #include "qgsscalerangewidgetplugin.h"
 #include "qgsscalewidgetplugin.h"
-#include "qgsscrollareawidgetplugin.h"
+//#include "qgsscrollareawidgetplugin.h"
 #include "qgsspinboxplugin.h"
 
 
@@ -69,7 +69,7 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
   mWidgets.append( new QgsRelationReferenceWidgetPlugin( this ) );
   mWidgets.append( new QgsScaleRangeWidgetPlugin( this ) );
   mWidgets.append( new QgsScaleWidgetPlugin( this ) );
-  mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) );
+//  mWidgets.append( new QgsScrollAreaWidgetPlugin( this ) ); // this is causing troubles at the moment
   mWidgets.append( new QgsSpinBoxPlugin( this ) );
 }
 

-Original file line number
+Diff line change
 def moduleInformation():
     try:
         import qgis.gui
 -        return "qgis.gui", dir(qgis.gui)
 +        widget_list=dir(qgis.gui)
 +        widget_list.remove('QgsScrollArea')Collapse commentComment on line R54
3nids commented on Jul 24, 2017 
3nids
on Jul 24, 2017
MemberAuthor
@nyalldawson there it was....
Code has comments. Press enter to view.
 +        return "qgis.gui", widget_list
     except ImportError:
         return "", []