Merge branch 'master' of https://github.com/EugenyP/netradiant-custom into EugenyP-master

This commit is contained in:
Garux 2023-07-21 11:43:31 +06:00
commit 06f34d4fc5

View File

@ -41,12 +41,13 @@ void PlugInMenu_Add( QMenu* plugin_menu, IPlugIn* pPlugIn ){
const char *menuText;
MenuStack menuStack;
std::size_t nCount = pPlugIn->getCommandCount();
{
globalErrorStream() << pPlugIn->getMenuName() << " count: " << nCount << "\n";
if (nCount > 1) {
menu = plugin_menu->addMenu( pPlugIn->getMenuName() );
menu->setTearOffEnabled( g_Layout_enableDetachableMenus.m_value );
std::size_t nCount = pPlugIn->getCommandCount();
{
while ( nCount > 0 )
{
menuText = pPlugIn->getCommandTitle( --nCount );
@ -88,6 +89,14 @@ void PlugInMenu_Add( QMenu* plugin_menu, IPlugIn* pPlugIn ){
if ( !menuStack.empty() ) {
globalErrorStream() << pPlugIn->getMenuName() << " mismatched > <. " << menuStack.size() << " submenu(s) not closed.\n";
}
} else if (nCount == 1) {
menuText = pPlugIn->getCommandTitle( --nCount );
if ( menuText != 0 && strlen( menuText ) > 0 ) {
create_menu_item_with_mnemonic( plugin_menu, menuText, pPlugIn->getGlobalCommand( nCount ) );
}
}
}
}