Cherry Picking (lyn1751) (#1854)
* Cherry Picking (lyn1751) Problem with DCO so we need to cherry pick this branch. Signed-off-by: aaguilea <aaguilea@amazon.com> * Cherry picking #2 Signed-off-by: aaguilea <aaguilea@amazon.com> * Cherry picking 3 Signed-off-by: aaguilea <aaguilea@amazon.com> * Changed variables reverseurls This was just changing some name variables. Signed-off-by: aaguilea <aaguilea@amazon.com> * Changes from past PR Signed-off-by: aaguilea <aaguilea@amazon.com> * changes from past PR and fixed small bug: Also removed some legacy code from Resources.h Signed-off-by: aaguilea <aaguilea@amazon.com> * couple of changes from actual PR Signed-off-by: aaguilea <aaguilea@amazon.com> * fixed copyright issues for AR Signed-off-by: aaguilea <aaguilea@amazon.com>
This commit is contained in:
committed by
GitHub
parent
a3d14e217e
commit
4f523e496f
@@ -300,8 +300,13 @@ public:
|
||||
|
||||
void AddAction(QAction* action);
|
||||
void AddAction(int id, QAction* action);
|
||||
void AddAction(AZ::Crc32 id, QAction* action);
|
||||
|
||||
void RemoveAction(QAction* action);
|
||||
|
||||
ActionWrapper AddAction(int id, const QString& name);
|
||||
ActionWrapper AddAction(AZ::Crc32, const QString& name);
|
||||
|
||||
bool HasAction(QAction*) const;
|
||||
bool HasAction(int id) const;
|
||||
|
||||
@@ -310,6 +315,7 @@ public:
|
||||
|
||||
// AzToolsFramework::EditorActionRequests
|
||||
void AddActionViaBus(int id, QAction* action) override;
|
||||
void AddActionViaBusCrc(AZ::Crc32 id, QAction* action) override;
|
||||
void RemoveActionViaBus(QAction* action) override;
|
||||
void EnableDefaultActions() override;
|
||||
void DisableDefaultActions() override;
|
||||
@@ -413,6 +419,7 @@ protected:
|
||||
|
||||
void AddAction(int id, QAction* action);
|
||||
ActionManager::ActionWrapper AddAction(int id, const QString& name);
|
||||
ActionManager::ActionWrapper AddAction(AZ::Crc32 id, const QString& name);
|
||||
void AddSeparator();
|
||||
|
||||
void UpdateAllActions();
|
||||
|
||||
Reference in New Issue
Block a user