NodeToolbar: GtkAction migration

1 files changed, 35 insertions, 14 deletions

diff --git a/src/ui/toolbar/node-toolbar.h b/src/ui/toolbar/node-toolbar.h
index f688173b6..fc603cbf5 100644
--- a/src/ui/toolbar/node-toolbar.h
+++ b/src/ui/toolbar/node-toolbar.h
@@ -33,21 +33,18 @@
 
 class SPDesktop;
 
-typedef struct _EgeAdjustmentAction EgeAdjustmentAction;
-typedef struct _GtkActionGroup GtkActionGroup;
-typedef struct _InkAction InkAction;
-
 namespace Inkscape {
 class Selection;
 
 namespace UI {
-class PrefPusher;
+class SimplePrefPusher;
 
 namespace Tools {
 class ToolBase;
 }
 
 namespace Widget {
+class SpinButtonToolItem;
 class UnitTracker;
 }
 
@@ -56,16 +53,22 @@ class NodeToolbar : public Toolbar {
 private:
     std::unique_ptr<UI::Widget::UnitTracker> _tracker;
 
-    std::unique_ptr<PrefPusher> _pusher_show_transform_handles;
-    std::unique_ptr<PrefPusher> _pusher_show_handles;
-    std::unique_ptr<PrefPusher> _pusher_show_outline;
-    std::unique_ptr<PrefPusher> _pusher_edit_clipping_paths;
-    std::unique_ptr<PrefPusher> _pusher_edit_masks;
+    std::unique_ptr<UI::SimplePrefPusher> _pusher_show_transform_handles;
+    std::unique_ptr<UI::SimplePrefPusher> _pusher_show_handles;
+    std::unique_ptr<UI::SimplePrefPusher> _pusher_show_outline;
+    std::unique_ptr<UI::SimplePrefPusher> _pusher_edit_clipping_paths;
+    std::unique_ptr<UI::SimplePrefPusher> _pusher_edit_masks;
+
+    Gtk::ToggleToolButton *_object_edit_clip_path_item;
+    Gtk::ToggleToolButton *_object_edit_mask_path_item;
+    Gtk::ToggleToolButton *_show_transform_handles_item;
+    Gtk::ToggleToolButton *_show_handles_item;
+    Gtk::ToggleToolButton *_show_helper_path_item;
 
-    InkAction *_nodes_lpeedit;
+    Gtk::ToolButton *_nodes_lpeedit_item;
 
-    EgeAdjustmentAction *_nodes_x_action;
-    EgeAdjustmentAction *_nodes_y_action;
+    UI::Widget::SpinButtonToolItem *_nodes_x_item;
+    UI::Widget::SpinButtonToolItem *_nodes_y_item;
 
     Glib::RefPtr<Gtk::Adjustment> _nodes_x_adj;
     Glib::RefPtr<Gtk::Adjustment> _nodes_y_adj;
@@ -81,12 +84,30 @@ private:
     void sel_modified(Inkscape::Selection *selection, guint /*flags*/);
     void coord_changed(gpointer shape_editor);
     void watch_ec(SPDesktop* desktop, Inkscape::UI::Tools::ToolBase* ec);
+    void edit_add();
+    void edit_add_min_x();
+    void edit_add_max_x();
+    void edit_add_min_y();
+    void edit_add_max_y();
+    void edit_delete();
+    void edit_join();
+    void edit_break();
+    void edit_join_segment();
+    void edit_delete_segment();
+    void edit_cusp();
+    void edit_smooth();
+    void edit_symmetrical();
+    void edit_auto();
+    void edit_toline();
+    void edit_tocurve();
+    void on_pref_toggled(Gtk::ToggleToolButton *item,
+                         const Glib::ustring&   path);
 
 protected:
     NodeToolbar(SPDesktop *desktop);
 
 public:
-    static GtkWidget * prep(SPDesktop *desktop, GtkActionGroup* mainActions);
+    static GtkWidget * create(SPDesktop *desktop);
 };
 }
 }