Skip to content

Add GroupTitleSmall to Description #5881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2025
Merged

Add GroupTitleSmall to Description #5881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb1d1f
Add GroupTitleSmall to Description
JorisGoosen May 8, 2025
484e8c6
fix margins and only show icon if specified
JorisGoosen May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Desktop/components/JASP/Theme/Theme.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 11 additions & 8 deletions Desktop/components/JASP/Widgets/CustomMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
}
}
Expand Down
4 changes: 2 additions & 2 deletions Desktop/modules/analysisentry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
8 changes: 5 additions & 3 deletions Desktop/modules/description/entrybase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() + "'" : "" )
Expand Down Expand Up @@ -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();

Expand Down
9 changes: 5 additions & 4 deletions Desktop/modules/description/entrybase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions Desktop/modules/dynamicmodules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
2 changes: 1 addition & 1 deletion Modules/jaspTestModule
Open in desktop
Submodule jaspTestModule updated 1 files
+2 −1 inst/Description.qml
13 changes: 13 additions & 0 deletions QMLComponents/jasptheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
7 changes: 7 additions & 0 deletions QMLComponents/jasptheme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -464,6 +468,8 @@ class JaspTheme : public QQuickItem

void columnTypeScaleHoveredChanged();

void fontGroupTitleSmallChanged();

public slots:
void setRibbonScaleHovered(float ribbonScaleHovered);
void setWhite(QColor white);
Expand Down Expand Up @@ -738,6 +744,7 @@ private slots:
_fontRCode,
_fontCode,
_fontGroupTitle,
_fontGroupTitleSmall,
_fontPrefOptionsGroupTitle,
_fontALTNavTag;

Expand Down
Loading