projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
mainwindow.h
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index 47704c2fc8f7abe1ab614c33f684ba4a87f1d513..94a6c42eab08bf0e0b0994448c02a4eb7c1864a7 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-22,21
+22,15
@@
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <QMainWindow>
#include <QMainWindow>
-#include <QSignalMapper>
#include "sigsession.h"
#include "sigsession.h"
-class QAction;
-class QMenuBar;
-class QMenu;
+struct srd_decoder;
+
class QVBoxLayout;
class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
namespace pv {
namespace pv {
@@
-51,6
+45,10
@@
namespace view {
class View;
}
class View;
}
+namespace widgets {
+class DecoderMenu;
+}
+
class MainWindow : public QMainWindow
{
Q_OBJECT
class MainWindow : public QMainWindow
{
Q_OBJECT
@@
-63,28
+61,27
@@
public:
private:
void setup_ui();
private:
void setup_ui();
+ void save_ui_settings();
+
+ void restore_ui_settings();
+
void session_error(const QString text, const QString info_text);
/**
void session_error(const QString text, const QString info_text);
/**
- * Updates the device list in the sampling bar, and updates the
- * selection.
- * @param selected_device The device to select, or NULL if the
- * first device in the device list should be selected.
+ * Updates the device list in the sampling bar
*/
*/
- void update_device_list(
- struct sr_dev_inst *selected_device = NULL);
+ void update_device_list();
- static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
- void setup_add_decoders(QMenu *parent);
+ void closeEvent(QCloseEvent *event);
-private
slots
:
+private
Q_SLOTS
:
void load_file(QString file_name);
void load_file(QString file_name);
-
void show_session_error(
const QString text, const QString info_text);
void on_actionOpen_triggered();
void show_session_error(
const QString text, const QString info_text);
void on_actionOpen_triggered();
+ void on_actionSaveAs_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
@@
-93,46
+90,43
@@
private slots:
void on_actionViewZoomOut_triggered();
void on_actionViewZoomOut_triggered();
+ void on_actionViewZoomFit_triggered();
+
+ void on_actionViewZoomOneToOne_triggered();
+
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
- void add_decoder(
QObject *action
);
+ void add_decoder(
srd_decoder *decoder
);
void run_stop();
void capture_state_changed(int state);
private:
void run_stop();
void capture_state_changed(int state);
private:
- DeviceManager &_device_manager;
-
- SigSession _session;
-
-
pv::view::View *_view
;
+ /**
+ * Name of the setting used to remember the directory
+ * containing the last file that was opened.
+ */
+
static const char *SettingOpenDirectory
;
- QMenuBar *_menu_bar;
- QMenu *_menu_file;
- QAction *_action_open;
- QAction *_action_connect;
-
QAction *_action_quit
;
+ /**
+ * Name of the setting used to remember the directory
+ * containing the last file that was saved.
+ */
+
static const char *SettingSaveDirectory
;
- QMenu *_menu_view;
- QAction *_action_view_zoom_in;
- QAction *_action_view_zoom_out;
- QAction *_action_view_show_cursors;
+ DeviceManager &device_manager_;
- QMenu *_menu_decoders;
- QMenu *_menu_decoders_add;
- QSignalMapper _decoders_add_mapper;
+ SigSession session_;
- QMenu *_menu_help;
- QAction *_action_about;
+ pv::view::View *view_;
- QWidget *
_central_widget
;
- QVBoxLayout *
_vertical_layout
;
+ QWidget *
central_widget_
;
+ QVBoxLayout *
vertical_layout_
;
- QToolBar *_toolbar;
- toolbars::SamplingBar *_sampling_bar;
+ toolbars::SamplingBar *sampling_bar_;
};
} // namespace pv
};
} // namespace pv