Skip to content

Add makeItems helper to AbstractMenuModel #344

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

Open
ajuncosa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add makeItems helper to AbstractMenuModel #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions framework/uicomponents/qml/Muse/UiComponents/abstractmenumodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,19 @@ MenuItem* AbstractMenuModel::makeSeparator()
return item;
}

MenuItemList AbstractMenuModel::makeItems(const MenuCommandList& commands)
{
MenuItemList list;
for (const auto& command : commands) {
if (command.has_value()) {
list.append(makeMenuItem(command.value()));
} else {
list.append(makeSeparator());
}
}
return list;
}

void AbstractMenuModel::subscribeOnChanges()
{
if (m_subscribedOnChanges) {
Expand Down
7 changes: 7 additions & 0 deletions framework/uicomponents/qml/Muse/UiComponents/abstractmenumodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
*/
#pragma once

#include <optional>
#include <vector>

#include <qqmlintegration.h>

#include <QAbstractListModel>
Expand All @@ -46,6 +49,9 @@
#endif

namespace muse::uicomponents {
using MenuCommandList = std::vector<std::optional<rcommand::Command> >;
inline constexpr std::optional<rcommand::Command> MENU_SEPARATOR = std::nullopt;

class AbstractMenuModel : public QAbstractListModel, public muse::Contextable, public async::Asyncable
{
Q_OBJECT
Expand Down Expand Up @@ -131,6 +137,7 @@ class AbstractMenuModel : public QAbstractListModel, public muse::Contextable, p
#endif

MenuItem* makeSeparator();
MenuItemList makeItems(const MenuCommandList& commands);

bool isIndexValid(int index) const;

Expand Down