Work on tutorial plugin

ManiVaultStudio · Dec 10, 2024 · eade633 · eade633
1 parent a222152
commit eade633
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/ManiVault/src/actions/OptionAction.cpp b/ManiVault/src/actions/OptionAction.cpp
@@ -388,8 +388,8 @@ void OptionAction::ComboBoxWidget::paintEvent(QPaintEvent* paintEvent)
 
     initStyleOption(&styleOptionComboBox);
 
-    if (_optionAction->getCurrentIndex() == -1)
-        styleOptionComboBox.currentIcon = Application::getIconFont("FontAwesome").getIcon("list");
+    //if (_optionAction->getCurrentIndex() == -1)
+    //    styleOptionComboBox.currentIcon = Application::getIconFont("FontAwesome").getIcon("list");
 
     painter->drawComplexControl(QStyle::CC_ComboBox, styleOptionComboBox);
 

diff --git a/ManiVault/src/actions/OptionsAction.cpp b/ManiVault/src/actions/OptionsAction.cpp
@@ -277,10 +277,7 @@ QVariantMap OptionsAction::toVariantMap() const
 
 OptionsAction::ComboBoxWidget::ComboBoxWidget(QWidget* parent, OptionsAction* optionsAction, const std::int32_t& widgetFlags) :
     QWidget(parent),
-    _optionsAction(optionsAction),
-    _layout(),
-    _comboBox(),
-    _completer()
+    _optionsAction(optionsAction)
 {
     auto comboBoxCheckableTableView = new CheckableTableView(this);
 
@@ -339,7 +336,7 @@ OptionsAction::ComboBoxWidget::ComboBoxWidget(QWidget* parent, OptionsAction* op
     setLayout(&_layout);
 }
 
-void OptionsAction::ComboBoxWidget::updateCurrentText()
+void OptionsAction::ComboBoxWidget::updateCurrentText() const
 {
     const auto selectedOptions = _optionsAction->getSelectedOptions();
 
@@ -544,9 +541,6 @@ void OptionsAction::TagsViewWidget::TagLabel::mousePressEvent(QMouseEvent* event
         case Type::SelectInvert:
             _optionsAction->selectInvert();
             break;
-
-        default:
-            break;
     }
 }
 
@@ -589,9 +583,6 @@ void OptionsAction::TagsViewWidget::TagLabel::updateStyle()
         case Type::SelectInvert:
             setToolTip("Click to invert the options selection");
             break;
-
-        default:
-            break;
     }
 
     setStyleSheet(QString("QLabel#Tag { \

diff --git a/ManiVault/src/actions/OptionsAction.h b/ManiVault/src/actions/OptionsAction.h
@@ -122,17 +122,17 @@ class CORE_EXPORT OptionsAction : public WidgetAction
          * @param target Object of which an event occurred
          * @param event The event that took place
          */
-        bool eventFilter(QObject* target, QEvent* event);
+        bool eventFilter(QObject* target, QEvent* event) override;
 
         /** Updates the line edit text to the joined selected strings */
-        void updateCurrentText();
+        void updateCurrentText() const;
 
     protected:
         OptionsAction*          _optionsAction;     /** Pointer to owning options action */
         QHBoxLayout             _layout;            /** Horizontal layout */
         QComboBox               _comboBox;          /** Combobox for selecting options */
         QCompleter              _completer;         /** For inline searching */
-
+        
         friend class OptionsAction;
     };
 

diff --git a/ManiVault/src/plugins/TutorialPlugin/src/TutorialPlugin.cpp b/ManiVault/src/plugins/TutorialPlugin/src/TutorialPlugin.cpp
@@ -28,8 +28,10 @@ TutorialPlugin::TutorialPlugin(const PluginFactory* factory) :
 
     auto& tagsFilterAction = _learningCenterTutorialsFilterModel.getTagsFilterAction();
 
-    tagsFilterAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::NoLabelInGroup, true);
-    tagsFilterAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup, true);
+    tagsFilterAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::NoLabelInGroup);
+    //tagsFilterAction.setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup, true);
+    tagsFilterAction.setDefaultWidgetFlags(OptionsAction::Tags | OptionsAction::Selection);
+    tagsFilterAction.setPopupSizeHint(QSize(640, 180));
 
     _horizontalGroupAction.addAction(&_tutorialPickerAction);
     _horizontalGroupAction.addAction(&tagsFilterAction, OptionsAction::Tags | OptionsAction::Selection);