merged from trunk

(bzr r11608.1.56)

1 files changed, 6 insertions, 73 deletions

diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 2b00856ec..7c72f8e0c 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -78,13 +78,6 @@ using Inkscape::UI::PrefPusher;
 //##      Connector      ##
 //#########################
 
-static void sp_connector_mode_toggled( GtkToggleAction* act, GObject * /*tbl*/ )
-{
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    prefs->setBool("/tools/connector/mode",
-                gtk_toggle_action_get_active( act ));
-}
-
 static void sp_connector_path_set_avoid(void)
 {
     cc_selection_set_avoid(true);
@@ -98,7 +91,7 @@ static void sp_connector_path_set_ignore(void)
 
 static void sp_connector_orthogonal_toggled( GtkToggleAction* act, GObject *tbl )
 {
-    SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" );
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
     Inkscape::Selection * selection = sp_desktop_selection(desktop);
     SPDocument *doc = sp_desktop_document(desktop);
 
@@ -123,7 +116,7 @@ static void sp_connector_orthogonal_toggled( GtkToggleAction* act, GObject *tbl
     bool modmade = false;
     GSList *l = (GSList *) selection->itemList();
     while (l) {
-        SPItem *item = (SPItem *) l->data;
+        SPItem *item = SP_ITEM(l->data);
 
         if (cc_item_is_connector(item)) {
             item->setAttribute( "inkscape:connector-type",
@@ -148,7 +141,7 @@ static void sp_connector_orthogonal_toggled( GtkToggleAction* act, GObject *tbl
 
 static void connector_curvature_changed(GtkAdjustment *adj, GObject* tbl)
 {
-    SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" );
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
     Inkscape::Selection * selection = sp_desktop_selection(desktop);
     SPDocument *doc = sp_desktop_document(desktop);
 
@@ -172,7 +165,7 @@ static void connector_curvature_changed(GtkAdjustment *adj, GObject* tbl)
     bool modmade = false;
     GSList *l = (GSList *) selection->itemList();
     while (l) {
-        SPItem *item = (SPItem *) l->data;
+        SPItem *item = SP_ITEM(l->data);
 
         if (cc_item_is_connector(item)) {
             item->setAttribute( "inkscape:connector-curvature",
@@ -198,7 +191,7 @@ static void connector_curvature_changed(GtkAdjustment *adj, GObject* tbl)
 
 static void connector_spacing_changed(GtkAdjustment *adj, GObject* tbl)
 {
-    SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" );
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
     SPDocument *doc = sp_desktop_document(desktop);
 
     if (!DocumentUndo::getUndoSensitive(doc)) {
@@ -303,26 +296,6 @@ static void connector_tb_event_attr_changed(Inkscape::XML::Node *repr,
     }
 }
 
-static void sp_connector_new_connection_point(GtkWidget *, GObject *tbl)
-{
-    SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" );
-    SPConnectorContext* cc = SP_CONNECTOR_CONTEXT(desktop->event_context);
-
-    if (cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE) {
-        cc_create_connection_point(cc);
-    }
-}
-
-static void sp_connector_remove_connection_point(GtkWidget *, GObject *tbl)
-{
-    SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" );
-    SPConnectorContext* cc = SP_CONNECTOR_CONTEXT(desktop->event_context);
-
-    if (cc->mode == SP_CONNECTOR_CONTEXT_EDITING_MODE) {
-        cc_remove_connection_point(cc);
-    }
-}
-
 static Inkscape::XML::NodeEventVector connector_tb_repr_events = {
     NULL, /* child_added */
     NULL, /* child_removed */
@@ -351,22 +324,6 @@ void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainActions,
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
 
-    // Editing mode toggle button
-    {
-        InkToggleAction* act = ink_toggle_action_new( "ConnectorEditModeAction",
-                                                      _("EditMode"),
-                                                      _("Switch between connection point editing and connector drawing mode"),
-                                                      INKSCAPE_ICON("connector-edit"),
-                                                      Inkscape::ICON_SIZE_DECORATION );
-        gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
-
-        bool tbuttonstate = prefs->getBool("/tools/connector/mode");
-        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), ( tbuttonstate ? TRUE : FALSE ));
-        g_object_set_data( holder, "mode", act );
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_connector_mode_toggled), holder );
-    }
-
-
     {
         InkAction* inky = ink_action_new( "ConnectorAvoidAction",
                                           _("Avoid"),
@@ -461,7 +418,7 @@ void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainActions,
         gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), ( tbuttonstate ? TRUE : FALSE ));
 
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_directed_graph_layout_toggled), holder );
-        sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_connector_toolbox_selection_changed), (GObject *)holder));
+        sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_connector_toolbox_selection_changed), holder));
     }
 
     // Avoid overlaps toggle button
@@ -480,30 +437,6 @@ void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainActions,
     }
 
 
-    // New connection point button
-    {
-        InkAction* inky = ink_action_new( "ConnectorNewConnPointAction",
-                                          _("New connection point"),
-                                          _("Add a new connection point to the currently selected item"),
-                                          INKSCAPE_ICON("connector-new-connpoint"),
-                                          secondarySize );
-        g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_new_connection_point), holder );
-        gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
-    }
-
-    // Remove selected connection point button
-
-    {
-        InkAction* inky = ink_action_new( "ConnectorRemoveConnPointAction",
-                                          _("Remove connection point"),
-                                          _("Remove the currently selected connection point"),
-                                          INKSCAPE_ICON("connector-remove-connpoint"),
-                                          secondarySize );
-        g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_remove_connection_point), holder );
-        gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
-    }
-
-
     // Code to watch for changes to the connector-spacing attribute in
     // the XML.
     Inkscape::XML::Node *repr = desktop->namedview->getRepr();