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

diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index eccad5d..3b99154 100644 (file)
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -1,10 +1,18 @@
 #include "mainwidget.h"
 
 #include <QGridLayout>
+#include <QPushButton>
 
 MainWidget::MainWidget (QWidget *parent)
     : QWidget(parent)
 {
     layout = new QGridLayout(this);
+
+    for (int i = 0; i < BUTTON_COUNT; ++i)
+    {
+        buttons[i] = new QPushButton(this);
+        layout->addWidget(buttons[i], i/3, i%3);
+    }
+    this->setLayout(layout);
 }
 

diff --git a/src/mainwidget.h b/src/mainwidget.h
index 6475818..912445a 100644 (file)
--- a/src/mainwidget.h
+++ b/src/mainwidget.h
@@ -1,6 +1,11 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
+#include <QWidget>
+
+class QGridLayout;
+class QPushButton;
+
 class MainWidget : public QWidget
 {
     Q_OBJECT
@@ -8,8 +13,10 @@ public:
     MainWidget (QWidget *parent = NULL);
 
 private:
-    QLayout *layout;
-}
+    static const int BUTTON_COUNT = 6;
+    QGridLayout *layout;
+    QPushButton *buttons[BUTTON_COUNT];
+};
 
 #endif