From fd5dcc0e1a58131983238107a09d6e234aec6b42 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 16 Nov 2019 01:45:09 +0000 Subject: [PATCH] Do not show modules with API 3 in CalypApp --- app/ModulesHandle.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp index 45be5a5..ced67d0 100644 --- a/app/ModulesHandle.cpp +++ b/app/ModulesHandle.cpp @@ -24,6 +24,8 @@ #include "ModulesHandle.h" +#include + #include "MainWindow.h" #include "ModulesHandleOptDialog.h" #include "SubWindowHandle.h" @@ -32,8 +34,6 @@ #include "VideoSubWindow.h" #include "modules/CalypModulesFactory.h" -#include - ModulesHandle::ModulesHandle( QWidget* parent, SubWindowHandle* windowManager, VideoHandle* moduleVideo ) : QWidget( parent ), m_pcParent( parent ), m_pcMainWindowManager( windowManager ), m_appModuleVideo( moduleVideo ) { @@ -112,20 +112,23 @@ void ModulesHandle::buildMenu() ModuleIfinternalName = QString::fromLocal8Bit( it->first ); currSubMenu = NULL; - if( pcCurrModuleIf->m_pchModuleCategory ) + if( pcCurrModuleIf->m_iModuleAPI <= CLP_MODULE_API_2 ) { - for( int j = 0; j < m_pcModulesSubMenuList.size(); j++ ) + if( pcCurrModuleIf->m_pchModuleCategory ) { - if( m_pcModulesSubMenuList.at( j )->title() == QString( pcCurrModuleIf->m_pchModuleCategory ) ) + for( int j = 0; j < m_pcModulesSubMenuList.size(); j++ ) { - currSubMenu = m_pcModulesSubMenuList.at( j ); - break; + if( m_pcModulesSubMenuList.at( j )->title() == QString( pcCurrModuleIf->m_pchModuleCategory ) ) + { + currSubMenu = m_pcModulesSubMenuList.at( j ); + break; + } + } + if( !currSubMenu ) + { + currSubMenu = m_pcModulesMenu->addMenu( pcCurrModuleIf->m_pchModuleCategory ); + m_pcModulesSubMenuList.append( currSubMenu ); } - } - if( !currSubMenu ) - { - currSubMenu = m_pcModulesMenu->addMenu( pcCurrModuleIf->m_pchModuleCategory ); - m_pcModulesSubMenuList.append( currSubMenu ); } }