Refactor addtoicon and turn into more generic iconrenderer CellRenderer

5 files changed, 22 insertions, 23 deletions

diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp
index 3133ff279..0c00a6b76 100644
--- a/src/ui/dialog/attrdialog.cpp
+++ b/src/ui/dialog/attrdialog.cpp
@@ -16,7 +16,7 @@
 #include "document-undo.h"
 
 #include "helper/icon-loader.h"
-#include "ui/widget/addtoicon.h"
+#include "ui/widget/iconrenderer.h"
 
 #include "xml/node-event-vector.h"
 #include "xml/attribute-record.h"
@@ -65,14 +65,13 @@ AttrDialog::AttrDialog():
     _store = Gtk::ListStore::create(_attrColumns);
     _treeView.set_model(_store);
 
-    Inkscape::UI::Widget::AddToIcon * addRenderer = manage(new Inkscape::UI::Widget::AddToIcon());
-    addRenderer->property_active() = false;
+    Inkscape::UI::Widget::IconRenderer * addRenderer = manage(new Inkscape::UI::Widget::IconRenderer());
+    addRenderer->add_icon("edit-delete");
 
     _treeView.append_column("", *addRenderer);
     Gtk::TreeViewColumn *col = _treeView.get_column(0);
     if (col) {
         auto add_icon = Gtk::manage(sp_get_icon_image("list-add", GTK_ICON_SIZE_SMALL_TOOLBAR));
-        col->add_attribute(addRenderer->property_active(), _attrColumns._colUnsetAttr);
         col->set_clickable(true);
         col->set_widget(*add_icon);
         add_icon->set_tooltip_text(_("Add a new attribute"));
diff --git a/src/ui/dialog/attrdialog.h b/src/ui/dialog/attrdialog.h
index 448d8a804..c2efb66fc 100644
--- a/src/ui/dialog/attrdialog.h
+++ b/src/ui/dialog/attrdialog.h
@@ -43,11 +43,9 @@ public:
     class AttrColumns : public Gtk::TreeModel::ColumnRecord {
     public:
         AttrColumns() {
-	  add(_colUnsetAttr);
 	  add(_attributeName);
 	  add(_attributeValue);
 	}
-        Gtk::TreeModelColumn<bool> _colUnsetAttr;
         Gtk::TreeModelColumn<Glib::ustring> _attributeName;
         Gtk::TreeModelColumn<Glib::ustring> _attributeValue;
     };
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 47922fc64..13903af70 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -17,7 +17,7 @@
 #include "selection.h"
 
 #include "helper/icon-loader.h"
-#include "ui/widget/addtoicon.h"
+#include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
 
@@ -47,14 +47,11 @@ CssDialog::CssDialog():
     _store = Gtk::ListStore::create(_cssColumns);
     _treeView.set_model(_store);
 
-    Inkscape::UI::Widget::AddToIcon * addRenderer = manage(new Inkscape::UI::Widget::AddToIcon());
-    addRenderer->property_active() = false;
+    Inkscape::UI::Widget::IconRenderer * addRenderer = manage(new Inkscape::UI::Widget::IconRenderer());
+    addRenderer->add_icon("edit-delete");
 
     int addCol = _treeView.append_column("", *addRenderer) - 1;
     Gtk::TreeViewColumn *col = _treeView.get_column(addCol);
-    if (col) {
-        col->add_attribute(addRenderer->property_active(), _cssColumns._colUnsetProp);
-    }
 
     _propRenderer = Gtk::manage(new Gtk::CellRendererText());
     _propRenderer->property_editable() = true;
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index e978667ef..2984ae11a 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -19,7 +19,7 @@
 #include "document-undo.h"
 
 #include "helper/icon-loader.h"
-#include "ui/widget/addtoicon.h"
+#include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
 #include "xml/node-observer.h"
@@ -248,8 +248,10 @@ StyleDialog::StyleDialog() :
 #endif
 
     // Tree
-    Inkscape::UI::Widget::AddToIcon * addRenderer = manage(
-                new Inkscape::UI::Widget::AddToIcon() );
+    Inkscape::UI::Widget::IconRenderer * addRenderer = manage(
+                new Inkscape::UI::Widget::IconRenderer() );
+    addRenderer->add_icon("edit-delete");
+    addRenderer->add_icon("list-add");
 
     _store = TreeStore::create(this);
     _treeView.set_model(_store);
@@ -260,7 +262,7 @@ StyleDialog::StyleDialog() :
     int addCol = _treeView.append_column("", *addRenderer) - 1;
     Gtk::TreeViewColumn *col = _treeView.get_column(addCol);
     if ( col ) {
-        col->add_attribute( addRenderer->property_active(), _mColumns._colIsSelector );
+        col->add_attribute( addRenderer->property_icon(), _mColumns._colIsSelector );
     }
     _treeView.append_column("CSS Selector", _mColumns._colSelector);
     _treeView.set_expander_column(*(_treeView.get_column(1)));
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index d27a320a7..bf191fd3e 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -31,7 +31,7 @@
 #include "helper/icon-loader.h"
 #include "svg/css-ostringstream.h"
 #include "ui/tools/tool-base.h" //"event-context.h"
-#include "ui/widget/addtoicon.h"
+#include "ui/widget/iconrenderer.h"
 #include "ui/widget/layertypeicon.h"
 #include "verbs.h"
 #include "xml/node-observer.h"
@@ -286,7 +286,7 @@ public:
     Gtk::TreeModelColumn<SPObject*> _colParentObject;
     Gtk::TreeModelColumn<SPObject*> _colObject;
     Gtk::TreeModelColumn<Glib::ustring> _colLabel;
-    Gtk::TreeModelColumn<bool> _colAddRemove;
+    Gtk::TreeModelColumn<int> _colAddRemove;
     Gtk::TreeModelColumn<bool> _colAllowAddRemove;
 };
 
@@ -391,7 +391,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
                 row[_model->_colObject] = &child;
                 row[_model->_colParentObject] = NULL;
                 row[_model->_colLabel] = child.label() ? child.label() : child.getId();
-                row[_model->_colAddRemove] = true;
+                row[_model->_colAddRemove] = 1;
                 row[_model->_colAllowAddRemove] = true;
                 
                 _tree.expand_to_path( _store->get_path(iter) );
@@ -409,7 +409,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
             rowitems[_model->_colObject] = NULL;
             rowitems[_model->_colParentObject] = obj;
             rowitems[_model->_colLabel] = _("Items");
-            rowitems[_model->_colAddRemove] = false;
+            rowitems[_model->_colAddRemove] = 0;
             rowitems[_model->_colAllowAddRemove] = false;
             
             _tree.expand_to_path( _store->get_path(iteritems) );
@@ -423,7 +423,7 @@ void TagsPanel::_addObject( SPDocument* doc, SPObject* obj, Gtk::TreeModel::Row*
                     row[_model->_colObject] = &child;
                     row[_model->_colParentObject] = NULL;
                     row[_model->_colLabel] = item ? (item->label() ? item->label() : item->getId()) : SP_TAG_USE(&child)->href;
-                    row[_model->_colAddRemove] = false;
+                    row[_model->_colAddRemove] = 0;
                     row[_model->_colAllowAddRemove] = true;
 
                     if (SP_TAG(obj)->expanded()) {
@@ -933,11 +933,14 @@ TagsPanel::TagsPanel() :
     tooltip_string += (_("Remove from selection set"));
     _tree.set_tooltip_text( tooltip_string );
 
-    Inkscape::UI::Widget::AddToIcon * addRenderer = manage( new Inkscape::UI::Widget::AddToIcon());
+    Inkscape::UI::Widget::IconRenderer * addRenderer = manage( new Inkscape::UI::Widget::IconRenderer());
+    addRenderer->add_icon("edit-delete");
+    addRenderer->add_icon("list-add");
+
     int addColNum = _tree.append_column("type", *addRenderer) - 1;
     Gtk::TreeViewColumn *col = _tree.get_column(addColNum);
     if ( col ) {
-        col->add_attribute( addRenderer->property_active(), _model->_colAddRemove );
+        col->add_attribute( addRenderer->property_icon(), _model->_colAddRemove );
         col->add_attribute( addRenderer->property_visible(), _model->_colAllowAddRemove );
     }