Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for stock menu items to wxQt

Browse Source 
Sets the new QAction's text and shortcut properties to the
values provided by the corresponding wxGetStockXXX() functions.

Closes https://github.com/wxWidgets/wxWidgets/pull/613
This commit is contained in:
René J.V. Bertin
2017-11-22 19:58:48 +01:00
committed by Vadim Zeitlin
parent 04209e3a3e
commit 10201c2732
1 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/qt/menu.cpp
View File

@@ -11,6 +11,7 @@
#include "wx/menu.h" #include "wx/menu.h"
#include "wx/qt/private/utils.h" #include "wx/qt/private/utils.h"
#include "wx/qt/private/converter.h" #include "wx/qt/private/converter.h"
#include "wx/stockitem.h"
#include <QtWidgets/QMenu> #include <QtWidgets/QMenu>
#include <QtWidgets/QMenuBar> #include <QtWidgets/QMenuBar>
@@ -56,23 +57,48 @@ static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previous
{ {
QMenu *qtMenu = menu->GetHandle(); QMenu *qtMenu = menu->GetHandle();
QAction *itemAction = item->GetHandle(); QAction *itemAction = item->GetHandle();
if ( item->GetKind() == wxITEM_RADIO ) switch ( item->GetKind() )
{ {
// If the previous menu item is a radio item then add this item to the case wxITEM_RADIO:
// same action group, otherwise start a new group: // If the previous menu item is a radio item then add this item to the
// same action group, otherwise start a new group:
if ( previousItem != NULL && previousItem->GetKind() == wxITEM_RADIO ) if ( previousItem != NULL && previousItem->GetKind() == wxITEM_RADIO )
{
QAction *previousItemAction = previousItem->GetHandle();
QActionGroup *previousItemActionGroup = previousItemAction->actionGroup();
wxASSERT_MSG( previousItemActionGroup != NULL, "An action group should have been setup" );
previousItemActionGroup->addAction( itemAction );
}
else
{
QActionGroup *actionGroup = new QActionGroup( qtMenu );
actionGroup->addAction( itemAction );
wxASSERT_MSG( itemAction->actionGroup() == actionGroup, "Must be the same action group" );
}
break;
case wxITEM_NORMAL:
{ {
QAction *previousItemAction = previousItem->GetHandle(); wxWindowID id = item->GetId();
QActionGroup *previousItemActionGroup = previousItemAction->actionGroup(); if ( wxIsStockID( id ) )
wxASSERT_MSG( previousItemActionGroup != NULL, "An action group should have been setup" ); {
previousItemActionGroup->addAction( itemAction ); itemAction->setText( wxQtConvertString( wxGetStockLabel( id ) ) );
} wxAcceleratorEntry accel = wxGetStockAccelerator( id );
else QString shortcut;
{ if ( id == wxID_EXIT )
QActionGroup *actionGroup = new QActionGroup( qtMenu ); {
actionGroup->addAction( itemAction ); shortcut = QStringLiteral("Ctrl+Q");
wxASSERT_MSG( itemAction->actionGroup() == actionGroup, "Must be the same action group" ); }
else if ( accel.IsOk() )
{
shortcut = wxQtConvertString( accel.ToRawString() );
}
if ( !shortcut.isEmpty() )
{
itemAction->setShortcut( QKeySequence( shortcut ) );
}
}
break;
} }
} }
// Insert the action into the actual menu: // Insert the action into the actual menu: