Add GroupTitleSmall to Description (#5881)

* Add GroupTitleSmall to Description

Implements jasp-stats/INTERNAL-jasp#2317

* fix margins and only show icon if specified

Author: JorisGoosen

Desktop/components/JASP/Theme/Theme.qml

@@ -49,6 +49,11 @@ JaspTheme
 	fontGroupTitle.pixelSize:							Math.round(14 * uiScale)
 	fontGroupTitle.family:								preferencesModel.interfaceFont
 	fontGroupTitle.weight:								Font.Medium
+	
+	fontGroupTitleSmall.bold:							true
+	fontGroupTitleSmall.pixelSize:						Math.round(12 * uiScale)
+	fontGroupTitleSmall.family:							preferencesModel.interfaceFont
+	fontGroupTitleSmall.weight:							Font.Medium
 
 	fontALTNavTag.bold:									true
 	fontALTNavTag.pixelSize:							Math.round(15 * uiScale)

Desktop/components/JASP/Widgets/CustomMenu.qml

@@ -176,7 +176,7 @@ FocusScope
 		z		: menuShadow.z + 1
 		color	: jaspTheme.fileMenuColorBackground
 		focus	: true
-		width	: column.maxWidth + (itemScrollbar.visible ? itemScrollbar.width : 0)
+		width	: column.maxWidth + jaspTheme.menuPadding + itemScrollbar.width
 		height	: menuOffset.y + column.maxHeight > menuMaxPos.y ? menuMaxPos.y - menuOffset.y : column.maxHeight
 
 		MouseArea
@@ -238,7 +238,7 @@ FocusScope
 			anchors.fill			: parent
 			anchors.topMargin		: jaspTheme.menuPadding / 2
 			anchors.leftMargin		: jaspTheme.menuPadding / 2
-			anchors.rightMargin		: itemScrollbar.width + anchors.margins
+			anchors.rightMargin		: itemScrollbar.width + jaspTheme.menuPadding / 2
 			clip					: true
 			boundsBehavior			: Flickable.StopAtBounds
 			contentWidth			: column.width
@@ -315,9 +315,9 @@ FocusScope
 														? jaspTheme.buttonColorHovered
 														: "transparent"
 
-								property bool itemEnabled: menu.props.hasOwnProperty("enabled") ? menu.props["enabled"][index] : (model.modelData !== undefined || model.isEnabled)
-								property int padding: 4 + (menu.hasIcons ? 1 : 0) + (menuItemShortcut.text ? 1 : 0)
-								property double initWidth: (menu.hasIcons ? menuItemImage.width : 0) + menuItemText.implicitWidth + menuItemShortcut.implicitWidth + menu._iconPad * padding
+								property bool	itemEnabled:	menu.props.hasOwnProperty("enabled") ? menu.props["enabled"][index] : (model.modelData !== undefined || model.isEnabled)
+								property int	padding:		4 + (menu.hasIcons ? 1 : 0) + (menuItemShortcut.text ? 1 : 0)
+								property double initWidth:		(menu.hasIcons ? menuItemImage.width : 0) + menuItemText.implicitWidth + menuItemShortcut.implicitWidth + menu._iconPad * padding
 
 								Image
 								{
@@ -381,7 +381,7 @@ FocusScope
 							{
 								id		: menuItem
 								width	: initWidth
-								height	: (isSmall ? 0.5 : 1) * jaspTheme.menuGroupTitleHeight
+								height	: (isSmall ? 0.666 : 1) * jaspTheme.menuGroupTitleHeight
 
 								property double initWidth: menuItemImage.width + menuItemText.implicitWidth + 15 * preferencesModel.uiScale
 
@@ -410,12 +410,15 @@ FocusScope
 								{
 									id					: menuItemText
 									text				: model.modelData !== undefined ? model.modelData.substring(3) : displayText
-									font				: jaspTheme.fontGroupTitle
+									font				: isSmall ? jaspTheme.fontGroupTitleSmall : jaspTheme.fontGroupTitle
 									color				: jaspTheme.textEnabled
+									verticalAlignment	: Text.AlignVCenter
 									anchors
 									{
-										left			: menuItemImage.right
+										left			: menuItemImage.visible ? menuItemImage.right : parent.left
+										right			: parent.right
 										leftMargin		: menu._iconPad
+										rightMargin		: menu._iconPad
 										verticalCenter	: parent.verticalCenter
 									}
 								}

Desktop/modules/analysisentry.cpp

@@ -65,8 +65,8 @@ std::string AnalysisEntry::qmlFilePath() const
 std::string AnalysisEntry::icon() const
 {
 	if(_icon == "")
-		return _isGroupTitle ? fq(JaspTheme::currentIconPath()) + "large-arrow-right.png" : "";
-
+		return "";
+	
 	return _dynamicModule  ? "file:" + _dynamicModule->iconFilePath(_icon) : fq(JaspTheme::currentIconPath()) + _icon;
 }
 

Desktop/modules/description/entrybase.cpp

@@ -39,8 +39,9 @@ QString EntryBase::toString() const
 {
 	switch(_entryType)
 	{
-	case EntryType::separator:	return "-- separator --";
-	case EntryType::groupTitle:	return	"-- groupTitle '" + title() + "' icon: '" + icon() + "' --";
+	case EntryType::separator:			return "-- separator --";
+	case EntryType::groupTitle:			return	"-- groupTitle '"		+ title() + "' icon: '" + icon() + "' --";
+	case EntryType::groupTitleSmall:	return	"-- groupTitleSmall '"	+ title() + "' icon: '" + icon() + "' --";
 	case EntryType::analysis:
 		return	"-- analysis '"		+ title()
 				+ ( menu() != title() ? " menu: '" + menu() + "'" : "" )
@@ -174,7 +175,8 @@ AnalysisEntry * EntryBase::convertToAnalysisEntry(bool requiresDataDefault, bool
 	entry->_isEnabled		= _enabled;
 	entry->_isAnalysis		= _entryType == EntryType::analysis;
 	entry->_isSeparator		= _entryType == EntryType::separator;
-	entry->_isGroupTitle	= _entryType == EntryType::groupTitle;
+	entry->_isGroupTitle	= _entryType == EntryType::groupTitle || _entryType == EntryType::groupTitleSmall;
+	entry->_smallIcon		= _entryType == EntryType::groupTitleSmall;
 	entry->_hasWrapper		= _description->hasWrappers() || _hasWrapper;
 	entry->_dynamicModule	= _description->dynMod();
 

Desktop/modules/description/entrybase.h

@@ -36,7 +36,7 @@ class EntryBase : public DescriptionChildBase
 	Q_PROPERTY(bool			hasWrapper		READ hasWrapper			WRITE setHasWrapper			NOTIFY hasWrapperChanged		)
 
 public:
-	enum class EntryType {unknown, separator, groupTitle, analysis};
+	enum class EntryType {unknown, separator, groupTitle, groupTitleSmall, analysis};
 	Q_ENUM(EntryType);
 
 	EntryBase(EntryType entryType);
@@ -108,8 +108,9 @@ public: \
 		{}\
 }
 
-MAKE_ENTRY_CLASS(Separator,		separator);
-MAKE_ENTRY_CLASS(AnalysisItem,	analysis);
-MAKE_ENTRY_CLASS(GroupTitle,	groupTitle);
+MAKE_ENTRY_CLASS(Separator,			separator);
+MAKE_ENTRY_CLASS(AnalysisItem,		analysis);
+MAKE_ENTRY_CLASS(GroupTitle,		groupTitle);
+MAKE_ENTRY_CLASS(GroupTitleSmall,	groupTitleSmall);
 }
 #endif // ENTRYBASE_H

Desktop/modules/dynamicmodules.cpp

@@ -902,6 +902,7 @@ void DynamicModules::registerQMLTypes()
 	qmlRegisterType<Modules::AnalysisItem>						("JASP.Module", 1, 0, "Analysis"						);
 	qmlRegisterType<Modules::Separator>							("JASP.Module", 1, 0, "Separator"						);
 	qmlRegisterType<Modules::GroupTitle>						("JASP.Module", 1, 0, "GroupTitle"						);
+	qmlRegisterType<Modules::GroupTitleSmall>					("JASP.Module", 1, 0, "GroupTitleSmall"					);
 	qmlRegisterType<Modules::Upgrades>							("JASP.Module", 1, 0, "Upgrades"						);
 	qmlRegisterType<Modules::Upgrade>							("JASP.Module", 1, 0, "Upgrade"							);
 	qmlRegisterType<Modules::ChangeJS>							("JASP.Module", 1, 0, "ChangeJS"						);

Modules/jaspTestModule

@@ -1331,3 +1331,16 @@ void JaspTheme::setColumnTypeScaleHovered(float newColumnTypeScaleHovered)
 	_columnTypeScaleHovered = newColumnTypeScaleHovered;
 	emit columnTypeScaleHoveredChanged();
 }
+
+QFont JaspTheme::fontGroupTitleSmall() const
+{
+	return _fontGroupTitleSmall;
+}
+
+void JaspTheme::setFontGroupTitleSmall(const QFont &newFontGroupTitleSmall)
+{
+	if (_fontGroupTitleSmall == newFontGroupTitleSmall)
+		return;
+	_fontGroupTitleSmall = newFontGroupTitleSmall;
+	emit fontGroupTitleSmallChanged();
+}

QMLComponents/jasptheme.cpp

@@ -167,6 +167,7 @@ class JaspTheme : public QQuickItem
 	Q_PROPERTY(QFont              fontLabel                       READ fontLabel                       WRITE setFontLabel                       NOTIFY fontLabelChanged                       )
 	Q_PROPERTY(QFont              fontRibbon                      READ fontRibbon                      WRITE setFontRibbon                      NOTIFY fontRibbonChanged                      )
 	Q_PROPERTY(QFont              fontGroupTitle                  READ fontGroupTitle                  WRITE setFontGroupTitle                  NOTIFY fontGroupTitleChanged                  )
+	Q_PROPERTY(QFont              fontGroupTitleSmall             READ fontGroupTitleSmall             WRITE setFontGroupTitleSmall             NOTIFY fontGroupTitleSmallChanged             )
 	Q_PROPERTY(QFont              fontPrefOptionsGroupTitle       READ fontPrefOptionsGroupTitle       WRITE setFontPrefOptionsGroupTitle       NOTIFY fontPrefOptionsGroupTitleChanged       )
 	Q_PROPERTY(QFont              fontALTNavTag                   READ fontALTNavTag                   WRITE setFontALTNavTag                   NOTIFY fontALTNavTagChanged                   )
 
@@ -327,6 +328,9 @@ class JaspTheme : public QQuickItem
 	float columnTypeScaleHovered() const;
 	void setColumnTypeScaleHovered(float newColumnTypeScaleHovered);
 
+	QFont fontGroupTitleSmall() const;
+	void setFontGroupTitleSmall(const QFont &newFontGroupTitleSmall);
+	
 signals:
 	void currentThemeReady(JaspTheme * newTheme);
 	void uiScaleChanged(float uiScale);
@@ -464,6 +468,8 @@ class JaspTheme : public QQuickItem
 
 	void columnTypeScaleHoveredChanged();
 
+	void fontGroupTitleSmallChanged();
+	
 public slots:
 	void setRibbonScaleHovered(float ribbonScaleHovered);
 	void setWhite(QColor white);
@@ -738,6 +744,7 @@ private slots:
 						_fontRCode,
 						_fontCode,
 						_fontGroupTitle,
+						_fontGroupTitleSmall,
 						_fontPrefOptionsGroupTitle,
 						_fontALTNavTag;