Skip to content
Snippets Groups Projects
Commit 1a10d084 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

action lists moved up

parent b3f3ab86
No related branches found
No related tags found
1 merge request!2297frame actions -> global pointer
...@@ -124,7 +124,7 @@ void MaskEditingFrame::setJobOrDatafileItem(QObject* item) ...@@ -124,7 +124,7 @@ void MaskEditingFrame::setJobOrDatafileItem(QObject* item)
QList<QAction*> MaskEditingFrame::actionList() QList<QAction*> MaskEditingFrame::actionList()
{ {
return m_actions->providedActions(); return {m_actions->reset_view, m_actions->toggle_panel};
} }
void MaskEditingFrame::updateFrame() void MaskEditingFrame::updateFrame()
......
...@@ -98,7 +98,7 @@ void Plot2DWithProjectionFrame::setJobOrDatafileItem(QObject* item) ...@@ -98,7 +98,7 @@ void Plot2DWithProjectionFrame::setJobOrDatafileItem(QObject* item)
QList<QAction*> Plot2DWithProjectionFrame::actionList() QList<QAction*> Plot2DWithProjectionFrame::actionList()
{ {
return m_actions->providedActions(); return {m_actions->reset_view, m_actions->toggle_panel};
} }
void Plot2DWithProjectionFrame::updateFrame() void Plot2DWithProjectionFrame::updateFrame()
......
...@@ -48,8 +48,3 @@ MaskEditorActions::MaskEditorActions() ...@@ -48,8 +48,3 @@ MaskEditorActions::MaskEditorActions()
save_plot->setIcon(QIcon(":/images/content-save-outline.svg")); save_plot->setIcon(QIcon(":/images/content-save-outline.svg"));
save_plot->setToolTip("Save Plot"); save_plot->setToolTip("Save Plot");
} }
QList<QAction*> MaskEditorActions::providedActions()
{
return {reset_view, toggle_panel};
}
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORACTIONS_H #define BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORACTIONS_H
#include <QAction> #include <QAction>
#include <QList>
#include <QObject> #include <QObject>
//! Defines actions for MaskEditor which are related to selected MaskItem (toggle mask value, //! Defines actions for MaskEditor which are related to selected MaskItem (toggle mask value,
...@@ -28,8 +27,6 @@ class MaskEditorActions : public QObject { ...@@ -28,8 +27,6 @@ class MaskEditorActions : public QObject {
public: public:
MaskEditorActions(); MaskEditorActions();
QList<QAction*> providedActions();
QAction* toggle_mask_value; QAction* toggle_mask_value;
QAction* bring_to_front; QAction* bring_to_front;
QAction* send_to_back; QAction* send_to_back;
......
...@@ -33,8 +33,3 @@ ProjectionActions::ProjectionActions() ...@@ -33,8 +33,3 @@ ProjectionActions::ProjectionActions()
remove_selected->setToolTip("Remove selected (Del)"); remove_selected->setToolTip("Remove selected (Del)");
remove_selected->setShortcuts(QKeySequence::Delete); remove_selected->setShortcuts(QKeySequence::Delete);
} }
QList<QAction*> ProjectionActions::providedActions()
{
return {reset_view, toggle_panel};
}
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONACTIONS_H #define BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONACTIONS_H
#include <QAction> #include <QAction>
#include <QList>
//! Provides various actions for ProjectionsEditor. //! Provides various actions for ProjectionsEditor.
...@@ -24,8 +23,6 @@ class ProjectionActions { ...@@ -24,8 +23,6 @@ class ProjectionActions {
public: public:
ProjectionActions(); ProjectionActions();
QList<QAction*> providedActions();
QAction* reset_view; QAction* reset_view;
QAction* toggle_panel; QAction* toggle_panel;
QAction* remove_selected; QAction* remove_selected;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment