qv4l2: added icon and moved label

For auto generated buttons, the text of the button
is now used as labels and the buttons are now
QToolButtons with enter key icons

Signed-off-by: Anton Arbring <aarbring@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff --git a/utils/qv4l2/ctrl-tab.cpp b/utils/qv4l2/ctrl-tab.cpp
index 0adbd4a..46a22b5 100644 (file)
--- a/utils/qv4l2/ctrl-tab.cpp
+++ b/utils/qv4l2/ctrl-tab.cpp
@@ -32,6 +32,7 @@
 #include <QComboBox>
 #include <QCheckBox>
 #include <QPushButton>
+#include <QToolButton>
 #include <QToolTip>
 
 #include <math.h>
@@ -59,7 +60,8 @@ static bool is_valid_type(__u32 type)
 
 void ApplicationWindow::addWidget(QGridLayout *grid, QWidget *w, Qt::Alignment align)
 {
-       if (m_col % 2)
+       QToolButton *tb;
+       if (m_col % 2 && !(tb = qobject_cast<QToolButton*>(w)))
                w->setMinimumWidth(m_minWidth);
        if (w->sizeHint().width() > m_maxw[m_col])
                m_maxw[m_col] = w->sizeHint().width();
@@ -371,8 +373,10 @@ void ApplicationWindow::addCtrl(QGridLayout *grid, const v4l2_queryctrl &qctrl)
                break;
 
        case V4L2_CTRL_TYPE_BUTTON:
-               addLabel(grid, "");
-               m_widgetMap[qctrl.id] = new QPushButton((char *)qctrl.name, p);
+               addLabel(grid, (char *)qctrl.name);
+               QToolButton *button;
+               m_widgetMap[qctrl.id] = button = new QToolButton(p);
+               button->setIcon(QIcon(":/enterbutt.png"));
                addWidget(grid, m_widgetMap[qctrl.id]);
                connect(m_widgetMap[qctrl.id], SIGNAL(clicked()),
                                m_sigMapper, SLOT(map()));

diff --git a/utils/qv4l2/enterbutt.png b/utils/qv4l2/enterbutt.png
new file mode 100644 (file)
index 0000000..911d0b0
Binary files /dev/null and b/utils/qv4l2/enterbutt.png differ

diff --git a/utils/qv4l2/qv4l2.qrc b/utils/qv4l2/qv4l2.qrc
index 7ccbfe6..469423b 100644 (file)
--- a/utils/qv4l2/qv4l2.qrc
+++ b/utils/qv4l2/qv4l2.qrc
@@ -8,5 +8,6 @@
        <file>saveraw.png</file>
        <file>video-television.png</file>
        <file>qv4l2.png</file>
+       <file>enterbutt.png</file>
     </qresource>
 </RCC>