Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irw

diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index 7f909ea..3b34f1b 100644 (file)
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -3,7 +3,7 @@
 #include <QInputDialog>
 #include <QPainter>
 #include <QGridLayout>
-#include <QPushButton>
+#include <QToolButton>
 
 #include "settingsdlg.h"
 
@@ -32,9 +32,8 @@ MainWidget::MainWidget (QWidget *parent)
 
     for (int i = 0; i < BUTTON_COUNT; ++i)
     {
-        QPushButton *button = new QPushButton(
-                QIcon(QString(iconNames[i])), 
-                QString(buttonTitles[i]), this);
+        QToolButton *button = new QToolButton(this);
+        button->setIcon(QIcon(QString(iconNames[i]))); 
         buttons[i] = button;
         button->setPalette(QPalette(QColor(0, 0, 0, 192)));
         layout->addWidget(button, i%2, i/2);

diff --git a/src/mainwidget.h b/src/mainwidget.h
index 526299d..404bef7 100644 (file)
--- a/src/mainwidget.h
+++ b/src/mainwidget.h
@@ -6,7 +6,7 @@
 #include "irctrl.h"
 
 class QGridLayout;
-class QPushButton;
+class QToolButton;
 
 class MainWidget : public QWidget
 {
@@ -23,7 +23,7 @@ protected:
 private:
     static const int BUTTON_COUNT = 6;
     QGridLayout *layout;
-    QPushButton *buttons[BUTTON_COUNT];
+    QToolButton *buttons[BUTTON_COUNT];
     IrCtrl irCtrl;
 };