X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.hpp;h=810cab27919f3cca59ed450710ec9701d1bb8e17;hb=519a6ed82d88f63fe5353f84ec9ebb775d1e9e95;hp=d39cb5e412b09a0ba02e4d6a25097b9d4698419e;hpb=c9da51187f8db0c9822d544a0253e0e7a58945d7;p=pulseview.git
diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index d39cb5e..810cab2 100644
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -14,15 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include
-
+#include
#include
#include
@@ -35,17 +33,20 @@
#include
#include
+#include
#include
#include
#include
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(std::shared_ptr)
+Q_DECLARE_METATYPE(shared_ptr)
class QAction;
@@ -54,9 +55,15 @@ namespace pv {
class MainWindow;
class Session;
+namespace views {
+namespace trace {
+class View;
+}
+}
+
namespace toolbars {
-class MainBar : public QToolBar
+class MainBar : public pv::views::trace::StandardBar
{
Q_OBJECT
@@ -78,9 +85,8 @@ private:
static const char *SettingSaveDirectory;
public:
- MainBar(Session &session, pv::MainWindow &main_window);
-
- Session &session(void) const;
+ MainBar(Session &session, QWidget *parent,
+ pv::views::trace::View *view);
void update_device_list();
@@ -88,34 +94,19 @@ public:
void reset_device_selector();
- void select_device(std::shared_ptr 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_save_selection_as() const;
QAction* action_connect() const;
- QAction* action_quit() const;
- QAction* action_view_zoom_in() const;
- QAction* action_view_zoom_out() const;
- QAction* action_view_zoom_fit() 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();
- void load_file(QString file_name,
- std::shared_ptr format = nullptr,
- const std::map &options =
- std::map());
-
void save_selection_to_file();
void update_sample_rate_selector();
@@ -125,40 +116,29 @@ private:
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_save_selection_as_;
QAction *const action_connect_;
- QAction *const action_view_zoom_in_;
- QAction *const action_view_zoom_out_;
- QAction *const action_view_zoom_fit_;
- QAction *const action_view_zoom_one_to_one_;
- QAction *const action_view_show_cursors_;
private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
- void capture_state_changed(int state);
-
void add_decoder(srd_decoder *decoder);
- void export_file(std::shared_ptr format,
+ void export_file(shared_ptr format,
bool selection_only = false);
- void import_file(std::shared_ptr format);
+ void import_file(shared_ptr format);
void on_device_selected();
void on_device_changed();
+ void on_capture_state_changed(int state);
void on_sample_count_changed();
void on_sample_rate_changed();
- void on_run_stop();
void on_config_changed();
- void on_actionNewSession_triggered();
void on_actionNewView_triggered();
void on_actionOpen_triggered();
@@ -167,27 +147,16 @@ private Q_SLOTS:
void on_actionConnect_triggered();
- void on_actionViewZoomIn_triggered();
-
- void on_actionViewZoomOut_triggered();
-
- void on_actionViewZoomFit_triggered();
-
- void on_actionViewZoomOneToOne_triggered();
-
- void on_actionViewShowCursors_triggered();
-
- void on_always_zoom_to_fit_changed(bool state);
-
protected:
+ void add_toolbar_widgets();
+
bool eventFilter(QObject *watched, QEvent *event);
Q_SIGNALS:
- void new_session();
void new_view(Session *session);
private:
- Session &session_;
+ QToolButton *open_button_, *save_button_;
pv::widgets::DeviceToolButton device_selector_;
@@ -204,15 +173,8 @@ private:
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
+ QToolButton *add_decoder_button_;
QMenu *const menu_decoders_add_;
#endif
};