projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created a custom about box with scrollable space for the supported list
[pulseview.git]
/
mainwindow.cpp
diff --git
a/mainwindow.cpp
b/mainwindow.cpp
index 02a85876811ff9662c3293216432304d852e5d2d..45d415dd16114ffefa38735a95f82b37b9d7ccf6 100644
(file)
--- a/
mainwindow.cpp
+++ b/
mainwindow.cpp
@@
-18,9
+18,25
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+extern "C" {
+#include <sigrokdecode.h>
+}
+
+#include "about.h"
+
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
+extern "C" {
+/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <glib.h>
+#include <libsigrok/libsigrok.h>
+}
+
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
@@
-32,3
+48,9
@@
MainWindow::~MainWindow()
{
delete ui;
}
{
delete ui;
}
+
+void MainWindow::on_actionAbout_triggered()
+{
+ About dlg(this);
+ dlg.exec();
+}