Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
3nids committed Jul 24, 2017
1 parent b842043 commit 500175b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion python/custom_widgets/qgis_customwidgets.py
Expand Up @@ -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')

This comment has been minimized.

Copy link
@3nids

3nids Jul 24, 2017

Author Member

@nyalldawson there it was....

return "qgis.gui", widget_list
except ImportError:
return "", []
4 changes: 2 additions & 2 deletions src/customwidgets/CMakeLists.txt
Expand Up @@ -36,7 +36,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
qgsrelationreferencewidgetplugin.cpp
qgsscalerangewidgetplugin.cpp
qgsscalewidgetplugin.cpp
qgsscrollareawidgetplugin.cpp
# qgsscrollareawidgetplugin.cpp
qgsspinboxplugin.cpp
)

Expand Down Expand Up @@ -66,7 +66,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
qgsrelationreferencewidgetplugin.h
qgsscalerangewidgetplugin.h
qgsscalewidgetplugin.h
qgsscrollareawidgetplugin.h
# qgsscrollareawidgetplugin.h
qgsspinboxplugin.h
)

Expand Down
4 changes: 2 additions & 2 deletions src/customwidgets/qgiscustomwidgets.cpp
Expand Up @@ -39,7 +39,7 @@
#include "qgsrelationreferencewidgetplugin.h"
#include "qgsscalerangewidgetplugin.h"
#include "qgsscalewidgetplugin.h"
#include "qgsscrollareawidgetplugin.h"
//#include "qgsscrollareawidgetplugin.h"
#include "qgsspinboxplugin.h"


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

Expand Down

4 comments on commit 500175b

@Gustry
Copy link
Contributor

@Gustry Gustry commented on 500175b Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whaou, thanks a lot, I will be able to use Processing again!

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch @3nids!

@Gustry
Copy link
Contributor

@Gustry Gustry commented on 500175b Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3nids I shouldn't have this kind of UI anymore?
screen shot 2017-07-24 at 23 42 35

Or did I miss something? Thanks

@3nids
Copy link
Member Author

@3nids 3nids commented on 500175b Jul 24, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.