Message ID | 20190313150717.21345-4-ykaradzhov@vmware.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 69c7996b96ad080e3f96eecec027e0a9ed941af5 |
Headers | show |
Series | Add dialog for loading user-defined plugins | expand |
On Wed, Mar 13, 2019 at 5:08 PM Yordan Karadzhov <ykaradzhov@vmware.com> wrote: > > The menu action in Tools that is used to manage all registered > plugins is renamed in order to avoid confusion with the "Add plugins" > menu action, implemented in the previous patch. > > Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> > --- > kernel-shark/src/KsMainWindow.cpp | 10 +++++----- > kernel-shark/src/KsMainWindow.hpp | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp > index 6428d4d..f165797 100644 > --- a/kernel-shark/src/KsMainWindow.cpp > +++ b/kernel-shark/src/KsMainWindow.cpp > @@ -58,7 +58,7 @@ KsMainWindow::KsMainWindow(QWidget *parent) > _clearAllFilters("Clear all filters", this), > _cpuSelectAction("CPUs", this), > _taskSelectAction("Tasks", this), > - _pluginsAction("Plugins", this), > + _managePluginsAction("Manage plugins", this), > _addPluginsAction("Add plugins", this), > _captureAction("Record", this), > _colorAction(this), > @@ -228,10 +228,10 @@ void KsMainWindow::_createActions() > this, &KsMainWindow::_taskSelect); > > /* Tools menu */ > - _pluginsAction.setShortcut(tr("Ctrl+P")); > - _pluginsAction.setStatusTip("Manage plugins"); > + _managePluginsAction.setShortcut(tr("Ctrl+P")); > + _managePluginsAction.setStatusTip("Manage plugins"); > > - connect(&_pluginsAction, &QAction::triggered, > + connect(&_managePluginsAction, &QAction::triggered, > this, &KsMainWindow::_pluginSelect); > > _addPluginsAction.setStatusTip("Add plugins"); > @@ -341,7 +341,7 @@ void KsMainWindow::_createMenus() > > /* Tools menu */ > tools = menuBar()->addMenu("Tools"); > - tools->addAction(&_pluginsAction); > + tools->addAction(&_managePluginsAction); > tools->addAction(&_addPluginsAction); > tools->addAction(&_captureAction); > tools->addSeparator(); > diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp > index 1e6d619..a93382a 100644 > --- a/kernel-shark/src/KsMainWindow.hpp > +++ b/kernel-shark/src/KsMainWindow.hpp > @@ -130,7 +130,7 @@ private: > QAction _taskSelectAction; > > // Tools menu. > - QAction _pluginsAction; > + QAction _managePluginsAction; > > QAction _addPluginsAction; > > -- > 2.19.1 > All 4 patches look good modulo a typo in this patch commit message (:s/manu/menu/g) Reviewed-by: Slavomir Kaslev <kaslevs@vmware.com> Thanks!
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 6428d4d..f165797 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -58,7 +58,7 @@ KsMainWindow::KsMainWindow(QWidget *parent) _clearAllFilters("Clear all filters", this), _cpuSelectAction("CPUs", this), _taskSelectAction("Tasks", this), - _pluginsAction("Plugins", this), + _managePluginsAction("Manage plugins", this), _addPluginsAction("Add plugins", this), _captureAction("Record", this), _colorAction(this), @@ -228,10 +228,10 @@ void KsMainWindow::_createActions() this, &KsMainWindow::_taskSelect); /* Tools menu */ - _pluginsAction.setShortcut(tr("Ctrl+P")); - _pluginsAction.setStatusTip("Manage plugins"); + _managePluginsAction.setShortcut(tr("Ctrl+P")); + _managePluginsAction.setStatusTip("Manage plugins"); - connect(&_pluginsAction, &QAction::triggered, + connect(&_managePluginsAction, &QAction::triggered, this, &KsMainWindow::_pluginSelect); _addPluginsAction.setStatusTip("Add plugins"); @@ -341,7 +341,7 @@ void KsMainWindow::_createMenus() /* Tools menu */ tools = menuBar()->addMenu("Tools"); - tools->addAction(&_pluginsAction); + tools->addAction(&_managePluginsAction); tools->addAction(&_addPluginsAction); tools->addAction(&_captureAction); tools->addSeparator(); diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp index 1e6d619..a93382a 100644 --- a/kernel-shark/src/KsMainWindow.hpp +++ b/kernel-shark/src/KsMainWindow.hpp @@ -130,7 +130,7 @@ private: QAction _taskSelectAction; // Tools menu. - QAction _pluginsAction; + QAction _managePluginsAction; QAction _addPluginsAction;
The menu action in Tools that is used to manage all registered plugins is renamed in order to avoid confusion with the "Add plugins" menu action, implemented in the previous patch. Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> --- kernel-shark/src/KsMainWindow.cpp | 10 +++++----- kernel-shark/src/KsMainWindow.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)