projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial manual connect dialog with a serial port selector
[pulseview.git]
/
pv
/
mainwindow.h
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index 61a8456fe802582b80b1b22e982eaa18d40d1520..993c608493a39a6b4a1b4a1f75486ee822985e57 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-46,7
+46,8
@@
class MainWindow : public QMainWindow
Q_OBJECT
public:
Q_OBJECT
public:
- explicit MainWindow(QWidget *parent = 0);
+ explicit MainWindow(const char *open_file_name = NULL,
+ QWidget *parent = 0);
private:
void setup_ui();
private:
void setup_ui();
@@
-56,16
+57,19
@@
private:
SigSession _session;
pv::view::View *_view;
SigSession _session;
pv::view::View *_view;
+ QMenuBar *_menu_bar;
+ QMenu *_menu_file;
QAction *_action_open;
QAction *_action_open;
+ QAction *_action_connect;
+ QAction *_action_quit;
+
+ QMenu *_menu_view;
QAction *_action_view_zoom_in;
QAction *_action_view_zoom_out;
QAction *_action_view_show_cursors;
QAction *_action_view_zoom_in;
QAction *_action_view_zoom_out;
QAction *_action_view_show_cursors;
- QAction *_action_about;
- QMenuBar *_menu_bar;
- QMenu *_menu_file;
- QMenu *_menu_view;
QMenu *_menu_help;
QMenu *_menu_help;
+ QAction *_action_about;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
@@
-74,8
+78,12
@@
private:
SamplingBar *_sampling_bar;
private slots:
SamplingBar *_sampling_bar;
private slots:
+ void load_file(QString file_name);
void on_actionOpen_triggered();
void on_actionOpen_triggered();
+ void on_actionQuit_triggered();
+
+ void on_actionConnect_triggered();
void on_actionViewZoomIn_triggered();
void on_actionViewZoomIn_triggered();