This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: qv4l2: improve statusbar behavior. Author: Hans Verkuil <[email protected]> Date: Sun Jun 10 10:29:51 2012 +0200 When capturing don't overwrite the statusbar with the frame number/rate if it is showing something else (like a statustip from a control). Signed-off-by: Hans Verkuil <[email protected]> utils/qv4l2/qv4l2.cpp | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=601ca1c7d542855b0d5503ea8592468164057884 diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index 059b03f..341d812 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -150,6 +150,7 @@ void ApplicationWindow::setDevice(const QString &device, bool rawOpen) if (QWidget *current = m_tabs->currentWidget()) { current->show(); } + statusBar()->clearMessage(); m_tabs->show(); m_tabs->setFocus(); m_convertData = v4lconvert_create(fd(), NULL, @@ -254,7 +255,7 @@ void ApplicationWindow::capFrame() if (err == -1 && m_frame == 0) error(v4lconvert_get_error_message(m_convertData)); - QString status; + QString status, curStatus; struct timeval tv, res; if (m_frame == 0) @@ -270,7 +271,9 @@ void ApplicationWindow::capFrame() status = QString("Frame: %1 Fps: %2").arg(++m_frame).arg(m_fps); if (m_showFrames) m_capture->setImage(*m_capImage, status); - statusBar()->showMessage(status); + curStatus = statusBar()->currentMessage(); + if (curStatus.isEmpty() || curStatus.startsWith("Frame: ")) + statusBar()->showMessage(status); if (m_frame == 1) refresh(); } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
