index b8b0c2ade314f609f3d5632e6e3184a38d6a40d2..485e92aa68c7c042486811c817a57608f5fef5f3 100644 (file)
#include "sp-object.h"
#include "sp-object.h"
-#include "document.h" // sp_document_repr_doc
+#include "document.h" // getReprDoc()
#include "desktop-style.h" //sp_desktop_get_style
#include "desktop-style.h" //sp_desktop_get_style
#include "live_effects/parameter/text.h" //text
#include "display/canvas-text.h" //text
#include "live_effects/parameter/text.h" //text
#include "display/canvas-text.h" //text
+#include "display/sp-canvas.h" //text
+
//#include "2geom/svg-path-parser.h" //get_node_coordinates
/****************************************************************************
//#include "2geom/svg-path-parser.h" //get_node_coordinates
/****************************************************************************
/* ALTERNATIVE (is this faster if only repr is needed?)
Inkscape::XML::Node *node = sp_repr_lookup_name((doc->root)->repr, name);
*/
/* ALTERNATIVE (is this faster if only repr is needed?)
Inkscape::XML::Node *node = sp_repr_lookup_name((doc->root)->repr, name);
*/
- Inkscape::XML::Node * node = sp_desktop_document(desk)->getObjectById(name)->repr;
+ Inkscape::XML::Node * node = sp_desktop_document(desk)->getObjectById(name)->getRepr();
if (!node)
{
g_set_error(error, INKSCAPE_ERROR, INKSCAPE_ERROR_OBJECT, "Object '%s' not found in document.", name);
if (!node)
{
g_set_error(error, INKSCAPE_ERROR, INKSCAPE_ERROR_OBJECT, "Object '%s' not found in document.", name);
const gchar *
get_name_from_object (SPObject * obj)
{
const gchar *
get_name_from_object (SPObject * obj)
{
- return obj->repr->attribute("id");
+ return obj->getRepr()->attribute("id");
}
/*
}
/*
dbus_create_node (SPDesktop *desk, const gchar *type)
{
SPDocument * doc = sp_desktop_document (desk);
dbus_create_node (SPDesktop *desk, const gchar *type)
{
SPDocument * doc = sp_desktop_document (desk);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Document *xml_doc = doc->getReprDoc();
return xml_doc->createElement(type);
}
return xml_doc->createElement(type);
}
@@ -218,7 +220,8 @@ finish_create_shape (DocumentInterface *object, GError **error, Inkscape::XML::N
object->desk->currentLayer()->updateRepr();
if (object->updates)
object->desk->currentLayer()->updateRepr();
if (object->updates)
- sp_document_done(sp_desktop_document(object->desk), 0, (gchar *)desc);
+
+ Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), 0, (gchar *)desc);
//else
//document_interface_pause_updates(object, error);
//else
//document_interface_pause_updates(object, error);
//document_interface_pause_updates (object, error);
sp_action_perform( action, NULL );
if (object->updates)
//document_interface_pause_updates (object, error);
sp_action_perform( action, NULL );
if (object->updates)
- sp_document_done(sp_desktop_document(desk2), verb->get_code(), g_strdup(verb->get_tip()));
+ Inkscape::DocumentUndo::done(sp_desktop_document(desk2), verb->get_code(), g_strdup(verb->get_tip()));
//if (!object->updates)
//document_interface_pause_updates (object, error);
return TRUE;
//if (!object->updates)
//document_interface_pause_updates (object, error);
return TRUE;
@@ -356,7 +359,7 @@ document_interface_call_verb (DocumentInterface *object, gchar *verbid, GError *
if ( action ) {
sp_action_perform( action, NULL );
if (object->updates) {
if ( action ) {
sp_action_perform( action, NULL );
if (object->updates) {
- sp_document_done(sp_desktop_document(desk2), verb->get_code(), g_strdup(verb->get_tip()));
+ Inkscape::DocumentUndo::done(sp_desktop_document(desk2), verb->get_code(), g_strdup(verb->get_tip()));
}
}
}
}
}
}
@@ -511,17 +514,16 @@ document_interface_image (DocumentInterface *object, int x, int y, gchar *filena
object->desk->currentLayer()->updateRepr();
if (object->updates)
object->desk->currentLayer()->updateRepr();
if (object->updates)
- sp_document_done(sp_desktop_document(object->desk), 0, "Imported bitmap.");
+ Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), 0, "Imported bitmap.");
//g_free(uri);
return strdup(newNode->attribute("id"));
}
//g_free(uri);
return strdup(newNode->attribute("id"));
}
-gchar*
-document_interface_node (DocumentInterface *object, gchar *type, GError **error)
+gchar *document_interface_node (DocumentInterface *object, gchar *type, GError **error)
{
SPDocument * doc = sp_desktop_document (object->desk);
{
SPDocument * doc = sp_desktop_document (object->desk);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Document *xml_doc = doc->getReprDoc();
Inkscape::XML::Node *newNode = xml_doc->createElement(type);
Inkscape::XML::Node *newNode = xml_doc->createElement(type);
@@ -529,7 +531,7 @@ document_interface_node (DocumentInterface *object, gchar *type, GError **error)
object->desk->currentLayer()->updateRepr();
if (object->updates)
object->desk->currentLayer()->updateRepr();
if (object->updates)
- sp_document_done(sp_desktop_document(object->desk), 0, (gchar *)"created empty node");
+ Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), 0, (gchar *)"created empty node");
//else
//document_interface_pause_updates(object, error);
//else
//document_interface_pause_updates(object, error);
@@ -542,13 +544,13 @@ document_interface_node (DocumentInterface *object, gchar *type, GError **error)
gdouble
document_interface_document_get_width (DocumentInterface *object)
{
gdouble
document_interface_document_get_width (DocumentInterface *object)
{
- return sp_document_width(sp_desktop_document(object->desk));
+ return sp_desktop_document(object->desk)->getWidth();
}
gdouble
document_interface_document_get_height (DocumentInterface *object)
{
}
gdouble
document_interface_document_get_height (DocumentInterface *object)
{
- return sp_document_height(sp_desktop_document(object->desk));
+ return sp_desktop_document(object->desk)->getHeight();
}
gchar *
}
gchar *
document_interface_save (DocumentInterface *object, GError **error)
{
SPDocument * doc = sp_desktop_document(object->desk);
document_interface_save (DocumentInterface *object, GError **error)
{
SPDocument * doc = sp_desktop_document(object->desk);
- printf("1: %s\n2: %s\n3: %s\n", doc->uri, doc->base, doc->name);
- if (doc->uri)
- return document_interface_save_as (object, doc->uri, error);
+ printf("1: %s\n2: %s\n3: %s\n", doc->getURI(), doc->getBase(), doc->getName());
+ if (doc->getURI())
+ return document_interface_save_as (object, doc->getURI(), error);
return FALSE;
}
return FALSE;
}
const Glib::ustring file(filename);
sp_file_open(file, NULL, TRUE, TRUE);
if (object->updates)
const Glib::ustring file(filename);
sp_file_open(file, NULL, TRUE, TRUE);
if (object->updates)
- sp_document_done(sp_desktop_document(object->desk), SP_VERB_FILE_OPEN, "Opened File");
+ Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), SP_VERB_FILE_OPEN, "Opened File");
return TRUE;
}
gboolean
document_interface_save_as (DocumentInterface *object,
return TRUE;
}
gboolean
document_interface_save_as (DocumentInterface *object,
- gchar *filename, GError **error)
+ const gchar *filename, GError **error)
{
SPDocument * doc = sp_desktop_document(object->desk);
#ifdef WITH_GNOME_VFS
{
SPDocument * doc = sp_desktop_document(object->desk);
#ifdef WITH_GNOME_VFS
//sp_desktop_document(object->desk)->root->mflags = TRUE;
//sp_desktop_document(object->desk)->_updateDocument();
//FIXME: use better verb than rect.
//sp_desktop_document(object->desk)->root->mflags = TRUE;
//sp_desktop_document(object->desk)->_updateDocument();
//FIXME: use better verb than rect.
- sp_document_done(sp_desktop_document(object->desk), SP_VERB_CONTEXT_RECT, "Multiple actions");
+ Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), SP_VERB_CONTEXT_RECT, "Multiple actions");
}
void
}
void
object->desk->disableInteraction();
sp_desktop_document(object->desk)->root->uflags = FALSE;
sp_desktop_document(object->desk)->root->mflags = FALSE;
object->desk->disableInteraction();
sp_desktop_document(object->desk)->root->uflags = FALSE;
sp_desktop_document(object->desk)->root->mflags = FALSE;
- //sp_document_done(sp_desktop_document(object->desk), SP_VERB_CONTEXT_RECT, "Multiple actions");
+ //Inkscape::DocumentUndo::done(sp_desktop_document(object->desk), SP_VERB_CONTEXT_RECT, "Multiple actions");
}
/****************************************************************************
}
/****************************************************************************
@@ -983,7 +985,7 @@ document_interface_selection_get (DocumentInterface *object, char ***out, GError
int i = 0;
for (GSList const *iter = oldsel; iter != NULL; iter = iter->next) {
int i = 0;
for (GSList const *iter = oldsel; iter != NULL; iter = iter->next) {
- (*out)[i] = g_strdup(SP_OBJECT(iter->data)->repr->attribute("id"));
+ (*out)[i] = g_strdup(SP_OBJECT(iter->data)->getRepr()->attribute("id"));
i++;
}
(*out)[i] = NULL;
i++;
}
(*out)[i] = NULL;
if (!next)
return FALSE;
if (!next)
return FALSE;
- if (strcmp("layer", (next->repr)->attribute("inkscape:groupmode")) == 0) {
+ if (strcmp("layer", (next->getRepr())->attribute("inkscape:groupmode")) == 0) {
sp_selection_cut(dt);
sp_selection_cut(dt);