projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add initial NSIS file for building a win installer.
[pulseview.git]
/
mainwindow.h
diff --git
a/mainwindow.h
b/mainwindow.h
index 9605ccfbc832722daad20a69bfed278c0701ccce..c0a4248d29fc3e7779ca4a74357cb8edd57f0078 100644
(file)
--- a/
mainwindow.h
+++ b/
mainwindow.h
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-26,10
+26,11
@@
#include "sigsession.h"
class SamplingBar;
#include "sigsession.h"
class SamplingBar;
-class SigView;
-namespace Ui {
-class MainWindow;
+namespace pv {
+namespace view {
+class View;
+}
}
class QAction;
}
class QAction;
@@
-37,6
+38,7
@@
class QMenuBar;
class QMenu;
class QVBoxLayout;
class QStatusBar;
class QMenu;
class QVBoxLayout;
class QStatusBar;
+class QToolBar;
class QWidget;
class MainWindow : public QMainWindow
class QWidget;
class MainWindow : public QMainWindow
@@
-51,20
+53,23
@@
private:
private:
private:
-
SigSession _session;
SigSession _session;
-
Sig
View *_view;
+
pv::view::
View *_view;
QAction *_action_open;
QAction *_action_open;
+ QAction *_action_view_zoom_in;
+ QAction *_action_view_zoom_out;
QAction *_action_about;
QMenuBar *_menu_bar;
QMenu *_menu_file;
QAction *_action_about;
QMenuBar *_menu_bar;
QMenu *_menu_file;
+ QMenu *_menu_view;
QMenu *_menu_help;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
QMenu *_menu_help;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
+ QToolBar *_toolbar;
SamplingBar *_sampling_bar;
QStatusBar *_status_bar;
SamplingBar *_sampling_bar;
QStatusBar *_status_bar;
@@
-72,6
+77,10
@@
private slots:
void on_actionOpen_triggered();
void on_actionOpen_triggered();
+ void on_actionViewZoomIn_triggered();
+
+ void on_actionViewZoomOut_triggered();
+
void on_actionAbout_triggered();
void run_stop();
void on_actionAbout_triggered();
void run_stop();