diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-29 12:14:00 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-29 12:14:00 +0000 |
| commit | 87395dac2b9b1349688797ed0e81c0e9a94360ea (patch) | |
| tree | 7d808372cf2147616a4ede119f803ba3129862f2 /src/ui/toolbar/box3d-toolbar.h | |
| parent | Add missing icon (diff) | |
| download | inkscape-87395dac2b9b1349688797ed0e81c0e9a94360ea.tar.gz inkscape-87395dac2b9b1349688797ed0e81c0e9a94360ea.zip | |
Box3DToolbar: GtkAction migration
Diffstat (limited to 'src/ui/toolbar/box3d-toolbar.h')
| -rw-r--r-- | src/ui/toolbar/box3d-toolbar.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ui/toolbar/box3d-toolbar.h b/src/ui/toolbar/box3d-toolbar.h index f421e8c04..c5970bf3b 100644 --- a/src/ui/toolbar/box3d-toolbar.h +++ b/src/ui/toolbar/box3d-toolbar.h @@ -49,6 +49,10 @@ class Node; } namespace UI { +namespace Widget { +class SpinButtonToolItem; +} + namespace Tools { class ToolBase; } @@ -56,46 +60,42 @@ class ToolBase; namespace Toolbar { class Box3DToolbar : public Toolbar { private: - EgeAdjustmentAction *_angle_x_action; - EgeAdjustmentAction *_angle_y_action; - EgeAdjustmentAction *_angle_z_action; + UI::Widget::SpinButtonToolItem *_angle_x_item; + UI::Widget::SpinButtonToolItem *_angle_y_item; + UI::Widget::SpinButtonToolItem *_angle_z_item; Glib::RefPtr<Gtk::Adjustment> _angle_x_adj; Glib::RefPtr<Gtk::Adjustment> _angle_y_adj; Glib::RefPtr<Gtk::Adjustment> _angle_z_adj; - InkToggleAction *_vp_x_state_action; - InkToggleAction *_vp_y_state_action; - InkToggleAction *_vp_z_state_action; + Gtk::ToggleToolButton *_vp_x_state_item; + Gtk::ToggleToolButton *_vp_y_state_item; + Gtk::ToggleToolButton *_vp_z_state_item; XML::Node *_repr; bool _freeze; void angle_value_changed(Glib::RefPtr<Gtk::Adjustment> &adj, Proj::Axis axis); - static void vp_state_changed(GtkToggleAction *act, - Proj::Axis axis); + void vp_state_changed(Proj::Axis axis); void check_ec(SPDesktop* desktop, Inkscape::UI::Tools::ToolBase* ec); void selection_changed(Inkscape::Selection *selection); void resync_toolbar(Inkscape::XML::Node *persp_repr); void set_button_and_adjustment(Persp3D *persp, Proj::Axis axis, Glib::RefPtr<Gtk::Adjustment>& adj, - GtkAction *act, - GtkToggleAction *tact); + UI::Widget::SpinButtonToolItem *spin_btn, + Gtk::ToggleToolButton *toggle_btn); double normalize_angle(double a); sigc::connection _changed; protected: - Box3DToolbar(SPDesktop *desktop) - : Toolbar(desktop), - _repr(nullptr) - {} + Box3DToolbar(SPDesktop *desktop); ~Box3DToolbar() override; public: - static GtkWidget * prep(SPDesktop *desktop, GtkActionGroup* mainActions); + static GtkWidget * create(SPDesktop *desktop); static void event_attr_changed(Inkscape::XML::Node *repr, gchar const *name, gchar const *old_value, |