projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move file loading from MainBar to Session
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index d39cb5e412b09a0ba02e4d6a25097b9d4698419e..95959e1757212ae7d45738a60cdf649ddee9f02a 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-88,12
+88,6
@@
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_session() const;
QAction* action_new_view() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_new_view() const;
QAction* action_open() const;
QAction* action_save_as() const;
@@
-106,16
+100,13
@@
public:
QAction* action_view_zoom_one_to_one() const;
QAction* action_view_show_cursors() const;
QAction* action_view_zoom_one_to_one() const;
QAction* action_view_show_cursors() const;
+ void session_error(const QString text, const QString info_text);
+
private:
void run_stop();
void select_init_device();
private:
void run_stop();
void select_init_device();
- void load_file(QString file_name,
- std::shared_ptr<sigrok::InputFormat> format = nullptr,
- const std::map<std::string, Glib::VariantBase> &options =
- std::map<std::string, Glib::VariantBase>());
-
void save_selection_to_file();
void update_sample_rate_selector();
void save_selection_to_file();
void update_sample_rate_selector();
@@
-125,9
+116,6
@@
private:
void commit_sample_rate();
void commit_sample_count();
void commit_sample_rate();
void commit_sample_count();
- void session_error(const QString text, const QString info_text);
-
- QAction *const action_new_session_;
QAction *const action_new_view_;
QAction *const action_open_;
QAction *const action_save_as_;
QAction *const action_new_view_;
QAction *const action_open_;
QAction *const action_save_as_;
@@
-154,11
+142,9
@@
private Q_SLOTS:
void on_device_changed();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_device_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_actionNewSession_triggered();
void on_actionNewView_triggered();
void on_actionOpen_triggered();
void on_actionNewView_triggered();
void on_actionOpen_triggered();
@@
-183,7
+169,6
@@
protected:
bool eventFilter(QObject *watched, QEvent *event);
Q_SIGNALS:
bool eventFilter(QObject *watched, QEvent *event);
Q_SIGNALS:
- void new_session();
void new_view(Session *session);
private:
void new_view(Session *session);
private:
@@
-204,14
+189,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