remove QgsScrollAreaWidgetPlugin from custom widgets

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
This commit is contained in:
Denis Rouzaud 2017-07-24 10:45:32 +02:00
parent b842043c96
commit 500175b8e8
3 changed files with 7 additions and 5 deletions

View File

@ -50,6 +50,8 @@ pluginType = MODULE
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 "", []

View File

@ -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
)

View File

@ -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 ) );
}