From a1d02eaabe0c5d14b9ac4cabfa3dd2dbecd52239 Mon Sep 17 00:00:00 2001 From: mrexodia Date: Sun, 4 Sep 2016 23:12:10 +0200 Subject: [PATCH] GUI: fixed watchdog menu --- src/gui/Src/Gui/WatchView.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gui/Src/Gui/WatchView.cpp b/src/gui/Src/Gui/WatchView.cpp index de95dec5..69bd68e8 100644 --- a/src/gui/Src/Gui/WatchView.cpp +++ b/src/gui/Src/Gui/WatchView.cpp @@ -151,17 +151,18 @@ void WatchView::setupContextMenu() { return getRowCount() != 0; }); - QMenu* watchdogMenu = new QMenu(tr("Watchdog"), this); - watchdogMenu->addAction(makeAction(DIcon("close-all-tabs.png"), tr("Disabled"), SLOT(watchdogDisableSlot()))); - watchdogMenu->addSeparator(); - watchdogMenu->addAction(makeAction(tr("Changed"), SLOT(watchdogChangedSlot()))); - watchdogMenu->addAction(makeAction(tr("Not changed"), SLOT(watchdogUnchangedSlot()))); - watchdogMenu->addAction(makeAction(tr("Is true"), SLOT(watchdogIsTrueSlot()))); - watchdogMenu->addAction(makeAction(tr("Is false"), SLOT(watchdogIsFalseSlot()))); - mMenu->addMenu(watchdogMenu, [this](QMenu*) + MenuBuilder* watchdogBuilder = new MenuBuilder(this, [this](QMenu*) { return getRowCount() != 0; }); + QMenu* watchdogMenu = new QMenu(tr("Watchdog"), this); + watchdogBuilder->addAction(makeAction(DIcon("close-all-tabs.png"), tr("Disabled"), SLOT(watchdogDisableSlot()))); + watchdogBuilder->addSeparator(); + watchdogBuilder->addAction(makeAction(tr("Changed"), SLOT(watchdogChangedSlot()))); + watchdogBuilder->addAction(makeAction(tr("Not changed"), SLOT(watchdogUnchangedSlot()))); + watchdogBuilder->addAction(makeAction(tr("Is true"), SLOT(watchdogIsTrueSlot()))); + watchdogBuilder->addAction(makeAction(tr("Is false"), SLOT(watchdogIsFalseSlot()))); + mMenu->addMenu(watchdogMenu, watchdogBuilder); } QString WatchView::getSelectedId()