Added SigView

diff --git a/mainwindow.ui b/mainwindow.ui
index 647ac2b8d04f577f238ca146adac8092196cc71f..566c6dab234241a366a138f630bb5a44610c4ba7 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -34,7 +34,16 @@
    </widget>
    <addaction name="menu_Help"/>
   </widget>
-  <widget class="QWidget" name="centralWidget" />
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="SigView" name="sigView" native="true"/>
+    </item>
+   </layout>
+  </widget>
   <widget class="QStatusBar" name="statusBar" />
   <action name="actionAbout">
    <property name="text">
@@ -43,8 +52,13 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources>
-  <include location="sigrok-qt2.qrc"/>
- </resources>
+ <customwidgets>
+  <customwidget>
+   <class>SigView</class>
+   <extends>QAbstractScrollArea</extends>
+   <header>sigview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
  <connections/>
 </ui>

diff --git a/sigrok-qt2.pro b/sigrok-qt2.pro
index b10f6cbb81158ed038debfa41295e8eca6e4119f..ac5ea48ff94582e349b2b457a4c3572b60c4f2d5 100644 (file)
--- a/sigrok-qt2.pro
+++ b/sigrok-qt2.pro
@@ -15,10 +15,12 @@ DEFINES      += APP_VERSION=\\\"$$VERSION\\\"
 
 SOURCES += main.cpp\
         mainwindow.cpp \
-    about.cpp
+    about.cpp \
+    sigview.cpp
 
 HEADERS  += mainwindow.h \
-    about.h
+    about.h \
+    sigview.h
 
 FORMS    += mainwindow.ui \
     about.ui

diff --git a/sigview.cpp b/sigview.cpp
new file mode 100644 (file)
index 0000000..ac7e76c
--- /dev/null
+++ b/sigview.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "sigview.h"
+
+SigView::SigView(QWidget *parent) :
+       QAbstractScrollArea(parent)
+{
+}

diff --git a/sigview.h b/sigview.h
new file mode 100644 (file)
index 0000000..318104b
--- /dev/null
+++ b/sigview.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef SIGVIEW_H
+#define SIGVIEW_H
+
+#include <QAbstractScrollArea>
+
+class SigView : public QAbstractScrollArea
+{
+       Q_OBJECT
+public:
+       explicit SigView(QWidget *parent = 0);
+       
+signals:
+       
+public slots:
+       
+};
+
+#endif // SIGVIEW_H