This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: qv4l2: Add capture toggle and close hotkeys to CaptureWin Author: David Fries <da...@fries.net> Date: Sat Sep 18 17:24:56 2021 -0500 It can be inconvenient to stop or start the stream when the capture window obscures most or all of the application window. Register the current application window stream toggle QAction to the capture window as well. Register a more standard Control-W to close the window. Add both to the context menu to allow them to be visible and discovered. Signed-off-by: David Fries <da...@fries.net> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/qv4l2/capture-win.cpp | 23 +++++++++++++++++++---- utils/qv4l2/capture-win.h | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=f0dee8a3ee59d638e91d3b03c9c4c824bff0b6dc diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp index 5667e7e77ddf..8add18f84899 100644 --- a/utils/qv4l2/capture-win.cpp +++ b/utils/qv4l2/capture-win.cpp @@ -44,9 +44,6 @@ CaptureWin::CaptureWin(ApplicationWindow *aw) : m_appWin(aw) { setWindowTitle("V4L2 Capture"); - m_hotkeyClose = new QShortcut(Qt::CTRL+Qt::Key_W, this); - connect(m_hotkeyClose, SIGNAL(activated()), this, SLOT(close())); - connect(new QShortcut(Qt::Key_Q, this), SIGNAL(activated()), this, SLOT(close())); m_hotkeyScaleReset = new QShortcut(Qt::CTRL+Qt::Key_F, this); connect(m_hotkeyScaleReset, SIGNAL(activated()), this, SLOT(resetSize())); connect(aw->m_resetScalingAct, SIGNAL(triggered()), this, SLOT(resetSize())); @@ -55,9 +52,25 @@ CaptureWin::CaptureWin(ApplicationWindow *aw) : m_hotkeyToggleFullscreen = new QShortcut(Qt::Key_F, this); connect(m_hotkeyToggleFullscreen, SIGNAL(activated()), aw->m_makeFullScreenAct, SLOT(toggle())); m_exitFullScreen = new QAction(QIcon(":/fullscreenexit.png"), "Exit Fullscreen", this); + m_exitFullScreen->setShortcut(m_hotkeyToggleFullscreen->key()); connect(m_exitFullScreen, SIGNAL(triggered()), this, SLOT(escape())); m_enterFullScreen = new QAction(QIcon(":/fullscreen.png"), "Show Fullscreen", this); + m_enterFullScreen ->setShortcut(m_hotkeyToggleFullscreen->key()); connect(m_enterFullScreen, SIGNAL(triggered()), this, SLOT(fullScreen())); + // Add the action to allow the hotkey to start/stop the stream + addAction(m_appWin->m_capStartAct); + + m_closeWindowAct = new QAction(QIcon(":/fileclose.png"), "&Close Window", this); + m_closeWindowAct->setStatusTip("Close"); + QList<QKeySequence> shortcuts; + // More standard close window shortcut + shortcuts << Qt::CTRL+Qt::Key_W; + // Historic qv4l2 shortcut + shortcuts << Qt::Key_Q; + m_closeWindowAct->setShortcuts(shortcuts); + addAction(m_closeWindowAct); + connect(m_closeWindowAct, SIGNAL(triggered()), this, SLOT(close())); + m_frame.format = 0; m_frame.size.setWidth(0); m_frame.size.setHeight(0); @@ -84,7 +97,6 @@ CaptureWin::~CaptureWin() layout()->removeWidget(this); delete layout(); - delete m_hotkeyClose; delete m_hotkeyScaleReset; } @@ -365,6 +377,8 @@ void CaptureWin::customMenuRequested(QPoint pos) menu->addAction(m_enterFullScreen); } + menu->addAction(m_appWin->m_capStartAct); + menu->addAction(m_appWin->m_capStepAct); menu->addAction(m_appWin->m_resetScalingAct); if (m_appWin->m_useBlendingAct) menu->addAction(m_appWin->m_useBlendingAct); @@ -376,6 +390,7 @@ void CaptureWin::customMenuRequested(QPoint pos) menu->addMenu(m_appWin->m_overrideXferFuncMenu); menu->addMenu(m_appWin->m_overrideYCbCrEncMenu); menu->addMenu(m_appWin->m_overrideQuantizationMenu); + menu->addAction(m_closeWindowAct); menu->popup(mapToGlobal(pos)); } diff --git a/utils/qv4l2/capture-win.h b/utils/qv4l2/capture-win.h index c16fa7cea1cd..f6ca6f2baf44 100644 --- a/utils/qv4l2/capture-win.h +++ b/utils/qv4l2/capture-win.h @@ -78,6 +78,7 @@ public: void makeFullScreen(bool); QAction *m_exitFullScreen; QAction *m_enterFullScreen; + QAction *m_closeWindowAct; /** * @brief Set a frame into the capture window. @@ -214,7 +215,6 @@ private: ApplicationWindow *m_appWin; static double m_pixelAspectRatio; static CropMethod m_cropMethod; - QShortcut *m_hotkeyClose; QShortcut *m_hotkeyScaleReset; QShortcut *m_hotkeyExitFullscreen; QShortcut *m_hotkeyToggleFullscreen; _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
