projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move run/stop button from the menu bar to the tab widget
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 088efa2f73cb6a8597cd6b4ea517bbbe40409a39..e5a7adce5483969690015e655606ef09b69318be 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-78,9
+78,7
@@
private:
static const char *SettingSaveDirectory;
public:
static const char *SettingSaveDirectory;
public:
- MainBar(Session &session, pv::MainWindow &main_window,
- std::string open_file_name = std::string(),
- std::string open_file_format = std::string());
+ MainBar(Session &session, pv::MainWindow &main_window);
Session &session(void) const;
Session &session(void) const;
@@
-90,6
+88,12
@@
public:
void reset_device_selector();
void reset_device_selector();
+ void select_device(std::shared_ptr<devices::Device> device);
+
+ void load_init_file(const std::string &file_name,
+ const std::string &format);
+
+ QAction* action_new_view() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
@@
-104,8
+108,6
@@
public:
private:
void run_stop();
private:
void run_stop();
- void select_device(std::shared_ptr<devices::Device> device);
-
void select_init_device();
void load_file(QString file_name,
void select_init_device();
void load_file(QString file_name,
@@
-113,9
+115,6
@@
private:
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
- void load_init_file(const std::string &file_name,
- const std::string &format);
-
void save_selection_to_file();
void update_sample_rate_selector();
void save_selection_to_file();
void update_sample_rate_selector();
@@
-127,6
+126,7
@@
private:
void session_error(const QString text, const QString info_text);
void session_error(const QString text, const QString info_text);
+ QAction *const action_new_view_;
QAction *const action_open_;
QAction *const action_save_as_;
QAction *const action_save_selection_as_;
QAction *const action_open_;
QAction *const action_save_as_;
QAction *const action_save_selection_as_;
@@
-149,12
+149,14
@@
private Q_SLOTS:
void import_file(std::shared_ptr<sigrok::InputFormat> format);
void on_device_selected();
void import_file(std::shared_ptr<sigrok::InputFormat> format);
void on_device_selected();
+ void on_device_changed();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_sample_count_changed();
void on_sample_rate_changed();
- void on_run_stop();
void on_config_changed();
void on_config_changed();
+ void on_actionNewView_triggered();
+
void on_actionOpen_triggered();
void on_actionSaveAs_triggered();
void on_actionSaveSelectionAs_triggered();
void on_actionOpen_triggered();
void on_actionSaveAs_triggered();
void on_actionSaveSelectionAs_triggered();
@@
-171,9
+173,14
@@
private Q_SLOTS:
void on_actionViewShowCursors_triggered();
void on_actionViewShowCursors_triggered();
+ void on_always_zoom_to_fit_changed(bool state);
+
protected:
bool eventFilter(QObject *watched, QEvent *event);
protected:
bool eventFilter(QObject *watched, QEvent *event);
+Q_SIGNALS:
+ void new_view(Session *session);
+
private:
Session &session_;
private:
Session &session_;
@@
-192,14
+199,6
@@
private:
bool sample_count_supported_;
bool sample_count_supported_;
- QIcon icon_red_;
- QIcon icon_green_;
- QIcon icon_grey_;
- QToolButton run_stop_button_;
- QAction *run_stop_button_action_;
-
- QToolButton menu_button_;
-
#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
#endif
#ifdef ENABLE_DECODE
QMenu *const menu_decoders_add_;
#endif