jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve window title when handling modules and add new shortcuts

Browse Source
This commit is contained in:
jfmcarreira
2015-09-27 04:15:10 +01:00
parent 21a628b66d
commit e5d9adf521
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ModulesHandle.cpp
+12 -13
View File
@@ -335,10 +335,6 @@ Void ModulesHandle::activateModule()
return;
}
QString windowName;
windowName.append( QStringLiteral( "Module " ) );
windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
for( Int i = 0; i < videoSubWindowList.size(); i++ )
{
pcCurrAppModuleIf->m_pcSubWindow[i] = videoSubWindowList.at( i );
@@ -357,13 +353,16 @@ Void ModulesHandle::activateModule()
Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() | bTmpForceNewWindow;
QString windowName;
VideoSubWindow* pcModuleSubWindow = NULL;
if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_PROCESSING_MODULE )
{
if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
{
pcModuleSubWindow = new VideoSubWindow( VideoSubWindow::MODULE_SUBWINDOW );
pcModuleSubWindow->setWindowName( windowName );
windowName.append( QStringLiteral( "Module " ) );
windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
connect( pcModuleSubWindow->getViewArea(), SIGNAL( selectionChanged( QRect ) ), m_appModuleVideo, SLOT( updateSelectionArea( QRect ) ) );
connect( pcModuleSubWindow, SIGNAL( zoomFactorChanged_SWindow( const double, const QPoint ) ), m_appModuleVideo,
@@ -372,14 +371,6 @@ Void ModulesHandle::activateModule()
pcCurrAppModuleIf->m_pcDisplaySubWindow = pcModuleSubWindow;
}
else
{
QString windowName = videoSubWindowList.at( 0 )->getWindowName();
windowName.append( QStringLiteral( " - Module " ) );
windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
videoSubWindowList.at( 0 )->setWindowName( windowName );
}
}
else if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_MEASUREMENT_MODULE )
{
@@ -439,9 +430,17 @@ Void ModulesHandle::activateModule()
if( pcModuleSubWindow )
{
pcModuleSubWindow->setWindowName( windowName );
m_pcMainWindowManager->addSubWindow( pcModuleSubWindow );
pcModuleSubWindow->show();
}
else
{
windowName = videoSubWindowList.at( 0 )->getWindowName();
windowName.append( QStringLiteral( " - Module " ) );
windowName.append( pcCurrAppModuleIf->m_pcModule->m_pchModuleName );
videoSubWindowList.at( 0 )->setWindowName( windowName );
}
m_pcPlaYUVerAppModuleIfList.append( pcCurrAppModuleIf );