Skip to content
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.

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

Allow to show or hide menu items #134

Merged
merged 3 commits into from
Oct 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# https://EditorConfig.org -*- ini -*-
# This is a unified way to tell all your editors
# about the proper indentation style in this repo.
#
# Emacs: https://github.com/editorconfig/editorconfig-emacs#readme
# Vim: https://github.com/editorconfig/editorconfig-vim#readme
# VS Code: https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig

# don't continue looking in upper directories, this is the top level
root = true

[*.{h,cc}]
indent_style = tab
indent_size = 4
tab_width = 8
88 changes: 56 additions & 32 deletions src/YQMenuBar.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ YQMenuBar::rebuildMenuTree()
for ( YItemIterator it = itemsBegin(); it != itemsEnd(); ++it )
{
YMenuItem * item = dynamic_cast<YMenuItem *>( *it );
YUI_CHECK_PTR( item );
YUI_CHECK_PTR( item );

if ( ! item->isMenu() )
YUI_THROW( YUIException( "YQMenuBar: Only menus allowed on toplevel." ) );
if ( ! item->isMenu() )
YUI_THROW( YUIException( "YQMenuBar: Only menus allowed on toplevel." ) );

QMenu * menu = QMenuBar::addMenu( fromUTF8( item->label() ));
item->setUiItem( menu );
QMenu * menu = QMenuBar::addMenu( fromUTF8( item->label() ));
item->setUiItem( menu );

connect( menu, &pclass(menu)::triggered,
this, &pclass(this)::menuEntryActivated );
connect( menu, &pclass(menu)::triggered,
this, &pclass(this)::menuEntryActivated );

// Recursively add menu content
rebuildMenuTree( menu, item->childrenBegin(), item->childrenEnd() );
// Recursively add menu content
rebuildMenuTree( menu, item->childrenBegin(), item->childrenEnd() );
}
}

Expand All @@ -96,20 +96,20 @@ YQMenuBar::rebuildMenuTree( QMenu * parentMenu, YItemIterator begin, YItemIterat
for ( YItemIterator it = begin; it != end; ++it )
{
YMenuItem * item = dynamic_cast<YMenuItem *>( *it );
YUI_CHECK_PTR( item );
YUI_CHECK_PTR( item );
QIcon icon;

if ( item->hasIconName() )
icon = YQUI::ui()->loadIcon( item->iconName() );

if ( item->isSeparator() )
{
parentMenu->addSeparator();
}
if ( item->isSeparator() )
{
parentMenu->addSeparator();
}
else if ( item->isMenu() )
{
QMenu * subMenu = parentMenu->addMenu( fromUTF8( item->label() ));
item->setUiItem( subMenu );
item->setUiItem( subMenu );

if ( ! icon.isNull() )
subMenu->setIcon( icon );
Expand All @@ -121,12 +121,12 @@ YQMenuBar::rebuildMenuTree( QMenu * parentMenu, YItemIterator begin, YItemIterat
}
else // Plain menu item (leaf item)
{
QAction * action = parentMenu->addAction( fromUTF8( item->label() ) );
item->setUiItem( action );
_actionMap[ action ] = item;
QAction * action = parentMenu->addAction( fromUTF8( item->label() ) );
item->setUiItem( action );
_actionMap[ action ] = item;

if ( ! icon.isNull() )
action->setIcon( icon );
if ( ! icon.isNull() )
action->setIcon( icon );
}
}
}
Expand All @@ -136,11 +136,11 @@ void
YQMenuBar::menuEntryActivated( QAction * action )
{
if ( _actionMap.contains( action ) )
_selectedItem = _actionMap[ action ];
_selectedItem = _actionMap[ action ];

if ( _selectedItem )
{
// yuiDebug() << "Selected menu entry \"" << fromUTF8( _selectedItem->label() ) << "\"" << endl;
// yuiDebug() << "Selected menu entry \"" << fromUTF8( _selectedItem->label() ) << "\"" << endl;

/*
* Defer the real returnNow() until all popup related events have been
Expand Down Expand Up @@ -180,23 +180,47 @@ YQMenuBar::setItemEnabled( YMenuItem * item, bool enabled )

if ( qObj )
{
QMenu * menu = qobject_cast<QMenu *>( qObj );
QMenu * menu = qobject_cast<QMenu *>( qObj );

if ( menu )
menu->setEnabled( enabled );
else
{
QAction * action = qobject_cast<QAction *>( qObj );
if ( menu )
menu->setEnabled( enabled );
else
{
QAction * action = qobject_cast<QAction *>( qObj );

if ( action )
action->setEnabled( enabled );
}
if ( action )
action->setEnabled( enabled );
}
}

YMenuWidget::setItemEnabled( item, enabled );
}


void
YQMenuBar::setItemVisible( YMenuItem * item, bool visible )
{
QObject * qObj = static_cast<QObject *>( item->uiItem() );

if ( qObj )
{
QMenu * menu = qobject_cast<QMenu *>( qObj );

if ( menu )
menu->menuAction()->setVisible( visible );
joseivanlopez marked this conversation as resolved.
Show resolved Hide resolved
else
{
QAction * action = qobject_cast<QAction *>( qObj );

if ( action )
action->setVisible( visible );
}
}

YMenuWidget::setItemVisible( item, visible );
}


void
YQMenuBar::setEnabled( bool enabled )
{
Expand Down Expand Up @@ -236,7 +260,7 @@ void
YQMenuBar::activateItem( YMenuItem * item )
{
if ( item )
YQUI::ui()->sendEvent( new YMenuEvent( item ) );
YQUI::ui()->sendEvent( new YMenuEvent( item ) );
}


Expand Down
9 changes: 8 additions & 1 deletion src/YQMenuBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class YQMenuBar : public QMenuBar, public YMenuBar
/**
* Rebuild the displayed menu tree from the internally stored YMenuItems.
*
* Implemented from YMenuBar.
* Implemented from YMenuWidget.
**/
virtual void rebuildMenuTree();

Expand Down Expand Up @@ -96,6 +96,13 @@ class YQMenuBar : public QMenuBar, public YMenuBar
**/
virtual void setItemEnabled( YMenuItem * item, bool enabled );

/**
* Show or hide an item.
*
* Reimplemented from YMenuWidget.
**/
virtual void setItemVisible( YMenuItem * item, bool visible );

/**
* Activate the item selected in the tree. Can be used in tests to simulate
* user input.
Expand Down