From 4089766a1fbbd0e333c01f8e336ba58776b2ea85 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 21 May 2024 15:14:46 +0200 Subject: [PATCH] QtViewer: fix compilation issue onWindows and implement shortcut ALT+Q --- src/LightApp/LightApp_Application.cxx | 2 +- src/LightApp/resources/LightApp.xml | 1 + src/QtViewer/QtViewer_ViewFrame.cxx | 2 +- src/SUIT/resources/action_assets.json | 19 ++++++++++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 63e2510f3..a83faafc4 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -836,7 +836,7 @@ void LightApp_Application::createActions() createActionForViewer( NewPV3DViewId, newWinMenu, QString::number( 8 ) ); #endif #ifndef DISABLE_QTVIEWER - createActionForViewer( NewQtViewId, newWinMenu, QString::number( 9 ), Qt::ALT+Qt::Key_Q ); + createActionForViewer( NewQtViewId, newWinMenu, QString::number( 9 ) ); #endif createAction( RenameId, desk, false /*toggle*/, "/PRP_RENAME", diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml index d831db007..3ba6a36e5 100644 --- a/src/LightApp/resources/LightApp.xml +++ b/src/LightApp/resources/LightApp.xml @@ -289,6 +289,7 @@ + diff --git a/src/QtViewer/QtViewer_ViewFrame.cxx b/src/QtViewer/QtViewer_ViewFrame.cxx index 9a0277e8f..8014160ed 100644 --- a/src/QtViewer/QtViewer_ViewFrame.cxx +++ b/src/QtViewer/QtViewer_ViewFrame.cxx @@ -400,7 +400,7 @@ void QtViewer_ViewFrame::hideEvent( QHideEvent* theEvent ) */ QString QtViewer_ViewFrame::filter() const { - QStringList filters = SUIT_ViewWindow::filter().split( ";;", Qt::SkipEmptyParts ); + QStringList filters = SUIT_ViewWindow::filter().split( ";;", QString::SkipEmptyParts ); filters << tr("POSTSCRIPT_FILES"); return filters.join( ";;" ); } diff --git a/src/SUIT/resources/action_assets.json b/src/SUIT/resources/action_assets.json index 70952aaec..14bbfeff2 100644 --- a/src/SUIT/resources/action_assets.json +++ b/src/SUIT/resources/action_assets.json @@ -373,6 +373,23 @@ } } }, + "/PRP_CREATE_NEW_WINDOW_FOR_VIEWER_9": { + "iconPath": "", + "langDependentAssets": { + "en": { + "name": "QtView view", + "tooltip": "Create new QtView view" + }, + "fr": { + "name": "QtView view", + "tooltip": "Créer une nouvelle QtView view" + }, + "ja": { + "name": "QtView view", + "tooltip": "新しい QtView view を作成します。" + } + } + }, "/PRP_DESK_CATALOG_GENERATOR": { "iconPath": "", "langDependentAssets": { @@ -713,4 +730,4 @@ } } } -} \ No newline at end of file +} -- 2.39.2