diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index cb942082e6..a851f342d2 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -667,6 +667,41 @@ ElementItem* ElementItemDelegate::getElementtItem(const QModelIndex& index) cons } /* Filter element list widget ------------------------------------------------------ */ +namespace SketcherGui { +class ElementFilterList : public QListWidget +{ + Q_OBJECT + +public: + explicit ElementFilterList(QWidget* parent = nullptr); + ~ElementFilterList() override; + +protected: + void changeEvent(QEvent* e) override; + virtual void languageChange(); + +private: + using filterItemRepr = std::pair; // {filter item text, filter item level} + inline static const std::vector filterItems = { + {QT_TR_NOOP("Normal"),0}, + {QT_TR_NOOP("Construction"),0}, + {QT_TR_NOOP("Internal"),0}, + {QT_TR_NOOP("External"),0}, + {QT_TR_NOOP("All types"),0}, + {QT_TR_NOOP("Point"),1}, + {QT_TR_NOOP("Line"),1}, + {QT_TR_NOOP("Circle"),1}, + {QT_TR_NOOP("Ellipse"),1}, + {QT_TR_NOOP("Arc of circle"),1}, + {QT_TR_NOOP("Arc of ellipse"),1}, + {QT_TR_NOOP("Arc of hyperbola"),1}, + {QT_TR_NOOP("Arc of parabola"),1}, + {QT_TR_NOOP("B-Spline"),1} + }; + +}; +} // namespace SketcherGui + enum class GeoFilterType { NormalGeos, ConstructionGeos, diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index ede72efd5a..5392d0fe85 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -55,8 +55,6 @@ enum class SubElementType { none }; - - class ElementView : public QListWidget { Q_OBJECT @@ -111,38 +109,7 @@ private: void changeLayer(int layer); }; -class ElementFilterList : public QListWidget -{ - Q_OBJECT - -public: - explicit ElementFilterList(QWidget* parent = nullptr); - ~ElementFilterList() override; - -protected: - void changeEvent(QEvent* e) override; - virtual void languageChange(); - -private: - using filterItemRepr = std::pair; // {filter item text, filter item level} - inline static const std::vector filterItems = { - {QT_TR_NOOP("Normal"),0}, - {QT_TR_NOOP("Construction"),0}, - {QT_TR_NOOP("Internal"),0}, - {QT_TR_NOOP("External"),0}, - {QT_TR_NOOP("All types"),0}, - {QT_TR_NOOP("Point"),1}, - {QT_TR_NOOP("Line"),1}, - {QT_TR_NOOP("Circle"),1}, - {QT_TR_NOOP("Ellipse"),1}, - {QT_TR_NOOP("Arc of circle"),1}, - {QT_TR_NOOP("Arc of ellipse"),1}, - {QT_TR_NOOP("Arc of hyperbola"),1}, - {QT_TR_NOOP("Arc of parabola"),1}, - {QT_TR_NOOP("B-Spline"),1} - }; - -}; +class ElementFilterList; class TaskSketcherElements : public Gui::TaskView::TaskBox, public Gui::SelectionObserver {