MainBar: Remove empty menu button

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 483dd79ba413d99f1295dcb80c42cf8e29568308..b21d5a9fe57a80874b31b1f56ebebe1eaa984822 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -116,8 +116,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg"),
        run_stop_button_(this),
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg"),
        run_stop_button_(this),

-       run_stop_button_action_(nullptr),
-       menu_button_(this)
+       run_stop_button_action_(nullptr)

 #ifdef ENABLE_DECODE
        , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
 #ifdef ENABLE_DECODE
        , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif


@@ -313,12 +312,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
        addWidget(add_decoder_button);
 #endif
 
        addWidget(add_decoder_button);
 #endif
 

-       QWidget *const spacer = new QWidget();
-       spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-       addWidget(spacer);
-
-       addWidget(&menu_button_);
-

        sample_count_.installEventFilter(this);
        sample_rate_.installEventFilter(this);
 
        sample_count_.installEventFilter(this);
        sample_rate_.installEventFilter(this);
 

diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp
index d39cb5e412b09a0ba02e4d6a25097b9d4698419e..bb467ec68144d4928d41d890a850fac77d5b241b 100644 (file)
--- a/pv/toolbars/mainbar.hpp
+++ b/pv/toolbars/mainbar.hpp
@@ -210,8 +210,6 @@ private:
        QToolButton run_stop_button_;
        QAction *run_stop_button_action_;
 
        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