projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected project name in header comments
[pulseview.git]
/
mainwindow.h
diff --git
a/mainwindow.h
b/mainwindow.h
index 3ae04c43956a31043535fd72d3da894633d85624..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,11
+26,20
@@
#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 QMenuBar;
+class QMenu;
+class QVBoxLayout;
+class QStatusBar;
+class QToolBar;
+class QWidget;
class MainWindow : public QMainWindow
{
class MainWindow : public QMainWindow
{
@@
-38,21
+47,43
@@
class MainWindow : public QMainWindow
public:
explicit MainWindow(QWidget *parent = 0);
public:
explicit MainWindow(QWidget *parent = 0);
- ~MainWindow();
private:
private:
-
Ui::MainWindow *ui
;
+
void setup_ui()
;
- SamplingBar *_sampling_bar;
+private:
+
+ SigSession _session;
+ pv::view::View *_view;
+
+ QAction *_action_open;
+ QAction *_action_view_zoom_in;
+ QAction *_action_view_zoom_out;
+ QAction *_action_about;
- SigSession session;
- SigView *view;
+ QMenuBar *_menu_bar;
+ QMenu *_menu_file;
+ QMenu *_menu_view;
+ QMenu *_menu_help;
+
+ QWidget *_central_widget;
+ QVBoxLayout *_vertical_layout;
+
+ QToolBar *_toolbar;
+ SamplingBar *_sampling_bar;
+ QStatusBar *_status_bar;
private slots:
void on_actionOpen_triggered();
private slots:
void on_actionOpen_triggered();
+ void on_actionViewZoomIn_triggered();
+
+ void on_actionViewZoomOut_triggered();
+
void on_actionAbout_triggered();
void on_actionAbout_triggered();
+
+ void run_stop();
};
#endif // MAINWINDOW_H
};
#endif // MAINWINDOW_H