Hackfest2019: Get rid of deprecated InkSelectOneAction

9 files changed, 24 insertions, 4 deletions

diff --git a/src/ui/toolbar/arc-toolbar.h b/src/ui/toolbar/arc-toolbar.h
index 08acc136b..b0b04500b 100644
--- a/src/ui/toolbar/arc-toolbar.h
+++ b/src/ui/toolbar/arc-toolbar.h
@@ -32,7 +32,6 @@
 
 #include <gtkmm/adjustment.h>
 
-class InkSelectOneAction;
 class SPDesktop;
 class SPItem;
 
diff --git a/src/ui/toolbar/lpe-toolbar.cpp b/src/ui/toolbar/lpe-toolbar.cpp
index 067687f02..ef5a2ce1c 100644
--- a/src/ui/toolbar/lpe-toolbar.cpp
+++ b/src/ui/toolbar/lpe-toolbar.cpp
@@ -173,6 +173,12 @@ LPEToolbar::LPEToolbar(SPDesktop *desktop)
     show_all();
 }
 
+void
+LPEToolbar::set_mode(int mode)
+{
+    _mode_buttons[mode]->set_active();
+}
+
 GtkWidget *
 LPEToolbar::create(SPDesktop *desktop)
 {
diff --git a/src/ui/toolbar/lpe-toolbar.h b/src/ui/toolbar/lpe-toolbar.h
index 1609f3915..23647a73c 100644
--- a/src/ui/toolbar/lpe-toolbar.h
+++ b/src/ui/toolbar/lpe-toolbar.h
@@ -92,6 +92,7 @@ protected:
 
 public:
     static GtkWidget * create(SPDesktop *desktop);
+    void set_mode(int mode);
 };
 
 }
diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp
index e405b914f..87682b127 100644
--- a/src/ui/toolbar/select-toolbar.cpp
+++ b/src/ui/toolbar/select-toolbar.cpp
@@ -37,7 +37,6 @@
 
 #include "ui/icon-names.h"
 #include "ui/widget/combo-tool-item.h"
-#include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/spin-button-tool-item.h"
 #include "ui/widget/unit-tracker.h"
 
diff --git a/src/ui/toolbar/spray-toolbar.cpp b/src/ui/toolbar/spray-toolbar.cpp
index 620351a99..9e7c4e820 100644
--- a/src/ui/toolbar/spray-toolbar.cpp
+++ b/src/ui/toolbar/spray-toolbar.cpp
@@ -528,6 +528,12 @@ SprayToolbar::on_pref_toggled(Gtk::ToggleToolButton *btn,
     prefs->setBool(path, active);
 }
 
+void
+SprayToolbar::set_mode(int mode)
+{
+    _mode_buttons[mode]->set_active();
+}
+
 }
 }
 }
diff --git a/src/ui/toolbar/spray-toolbar.h b/src/ui/toolbar/spray-toolbar.h
index 8c8d9172b..4587cf033 100644
--- a/src/ui/toolbar/spray-toolbar.h
+++ b/src/ui/toolbar/spray-toolbar.h
@@ -97,6 +97,8 @@ protected:
 
 public:
     static GtkWidget * create(SPDesktop *desktop);
+
+    void set_mode(int mode);
 };
 }
 }
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index a86927199..4b9b0f160 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -56,7 +56,6 @@
 #include "ui/icon-names.h"
 #include "ui/tools/text-tool.h"
 #include "ui/widget/combo-tool-item.h"
-#include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/spin-button-tool-item.h"
 #include "ui/widget/unit-tracker.h"
 
@@ -2150,7 +2149,7 @@ TextToolbar::selection_changed(Inkscape::Selection * /*selection*/, bool subsele
 
         Glib::RefPtr<Gtk::ListStore> store = _align_item->get_store();
         Gtk::TreeModel::Row row = *(store->get_iter("3"));  // Justify entry
-        InkSelectOneActionColumns columns;
+        UI::Widget::ComboToolItemColumns columns;
         row[columns.col_sensitive] = isFlow;
 
         int activeButton = 0;
diff --git a/src/ui/toolbar/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp
index 16c9b6009..dc5352ccf 100644
--- a/src/ui/toolbar/tweak-toolbar.cpp
+++ b/src/ui/toolbar/tweak-toolbar.cpp
@@ -243,6 +243,12 @@ TweakToolbar::TweakToolbar(SPDesktop *desktop)
     }
 }
 
+void
+TweakToolbar::set_mode(int mode)
+{
+    _mode_buttons[mode]->set_active();
+}
+
 GtkWidget *
 TweakToolbar::create(SPDesktop *desktop)
 {
diff --git a/src/ui/toolbar/tweak-toolbar.h b/src/ui/toolbar/tweak-toolbar.h
index 8995c64e2..cd1c7d048 100644
--- a/src/ui/toolbar/tweak-toolbar.h
+++ b/src/ui/toolbar/tweak-toolbar.h
@@ -79,6 +79,8 @@ protected:
 
 public:
     static GtkWidget * create(SPDesktop *desktop);
+
+    void set_mode(int mode);
 };
 }
 }