LibGUI: Add a GToolBar class that can be populated with GActions.

The same action can be added to both a menu and a toolbar.
Use this to put a toolbar into FileManager. This is pretty neat. :^)

1 files changed, 22 insertions, 3 deletions

diff --git a/LibGUI/GAction.h b/LibGUI/GAction.h
index 6e2bea0404..64797fedf7 100644
--- a/LibGUI/GAction.h
+++ b/LibGUI/GAction.h
@@ -2,22 +2,41 @@
 
 #include <AK/AKString.h>
 #include <AK/Function.h>
+#include <AK/Retainable.h>
+#include <AK/RetainPtr.h>
+#include <SharedGraphics/GraphicsBitmap.h>
 
-class GAction {
+class GAction : public Retainable<GAction> {
 public:
-    GAction(const String& text, Function<void(const GAction&)> = nullptr);
-    GAction(const String& text, const String& custom_data = String(), Function<void(const GAction&)> = nullptr);
+    static RetainPtr<GAction> create(const String& text, Function<void(const GAction&)> callback)
+    {
+        return adopt(*new GAction(text, move(callback)));
+    }
+    static RetainPtr<GAction> create(const String& text, const String& custom_data, Function<void(const GAction&)> callback)
+    {
+        return adopt(*new GAction(text, custom_data, move(callback)));
+    }
+    static RetainPtr<GAction> create(const String& text, RetainPtr<GraphicsBitmap>&& icon, Function<void(const GAction&)> callback)
+    {
+        return adopt(*new GAction(text, move(icon), move(callback)));
+    }
     ~GAction();
 
     String text() const { return m_text; }
     String custom_data() const { return m_custom_data; }
+    const GraphicsBitmap* icon() const { return m_icon.ptr(); }
 
     Function<void(GAction&)> on_activation;
 
     void activate();
 
 private:
+    GAction(const String& text, Function<void(const GAction&)> = nullptr);
+    GAction(const String& text, RetainPtr<GraphicsBitmap>&& icon, Function<void(const GAction&)> = nullptr);
+    GAction(const String& text, const String& custom_data = String(), Function<void(const GAction&)> = nullptr);
+
     String m_text;
     String m_custom_data;
+    RetainPtr<GraphicsBitmap> m_icon;
 };