X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=ce09284d7af565879083e560ddca5506f1799377;hp=b4b64f779de1419ac4686defedd67566c942aa5c;hb=f0d37dab05f9fb055a9af8a05d776d1a5b4b0909;hpb=7dd093df9796d08c9b15d494eeeb0f8cd3570591 diff --git a/pv/mainwindow.h b/pv/mainwindow.h index b4b64f77..ce09284d 100644 --- a/pv/mainwindow.h +++ b/pv/mainwindow.h @@ -26,7 +26,6 @@ #include #include -#include #include "sigsession.h" @@ -51,6 +50,10 @@ namespace view { class View; } +namespace widgets { +class DecoderMenu; +} + class MainWindow : public QMainWindow { Q_OBJECT @@ -75,7 +78,6 @@ private: struct sr_dev_inst *selected_device = NULL); static gint decoder_name_cmp(gconstpointer a, gconstpointer b); - void setup_add_decoders(QMenu *parent); private slots: void load_file(QString file_name); @@ -97,16 +99,12 @@ private slots: void on_actionAbout_triggered(); - void device_selected(); - - void add_decoder(QObject *action); + void add_decoder(srd_decoder *decoder); void run_stop(); void capture_state_changed(int state); - void view_selection_changed(); - private: DeviceManager &_device_manager; @@ -126,8 +124,7 @@ private: QAction *_action_view_show_cursors; QMenu *_menu_decoders; - QMenu *_menu_decoders_add; - QSignalMapper _decoders_add_mapper; + pv::widgets::DecoderMenu *_menu_decoders_add; QMenu *_menu_help; QAction *_action_about; @@ -137,7 +134,6 @@ private: QToolBar *_toolbar; toolbars::SamplingBar *_sampling_bar; - toolbars::ContextBar *_context_bar; }; } // namespace pv