![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 939018a)
raw | patch | inline | side by side (parent: 939018a)
| author | mental <mental@users.sourceforge.net> | |
| Mon, 17 Apr 2006 04:46:51 +0000 (04:46 +0000) | ||
| committer | mental <mental@users.sourceforge.net> | |
| Mon, 17 Apr 2006 04:46:51 +0000 (04:46 +0000) |
82 files changed:
diff --git a/ChangeLog b/ChangeLog
index 86c6782c9640f1d2eec5d6845e5feb23ee726786..9cd7a9ed6673d3562499523ce55291bcd37bde78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2006-04-17 MenTaLguY <mental@rydia.net>
+
+ * src/application/editor.cpp, src/arc-context.cpp, src/conn-avoid-ref.cpp,
+ src/connector-context.cpp, src/desktop-events.cpp, src/desktop-handles.h,
+ src/dialogs/clonetiler.cpp, src/dialogs/export.cpp,
+ src/dialogs/fill-style.cpp, src/dialogs/find.cpp,
+ src/dialogs/iconpreview.cpp, src/dialogs/item-properties.cpp,
+ src/dialogs/layer-properties.cpp, src/dialogs/object-properties.cpp,
+ src/dialogs/stroke-style.cpp, src/dialogs/swatches.cpp,
+ src/dialogs/text-edit.cpp, src/dialogs/tiledialog.cpp,
+ src/dialogs/xml-tree.cpp, src/draw-anchor.cpp, src/draw-context.cpp,
+ src/dropper-context.cpp, src/dyna-draw-context.cpp,
+ src/event-context.cpp, src/extension/implementation/script.cpp,
+ src/file.cpp, src/gradient-context.cpp, src/gradient-drag.cpp,
+ src/helper/stock-items.cpp, src/inkscape.cpp, src/interface.cpp,
+ src/jabber_whiteboard/callbacks.cpp,
+ src/jabber_whiteboard/chat-handler.cpp,
+ src/jabber_whiteboard/message-processors.cpp,
+ src/jabber_whiteboard/message-queue.cpp,
+ src/jabber_whiteboard/session-manager.cpp, src/knot.cpp,
+ src/node-context.cpp, src/nodepath.cpp, src/object-ui.cpp,
+ src/path-chemistry.cpp, src/pencil-context.cpp, src/pen-context.cpp,
+ src/rect-context.cpp, src/rubberband.cpp, src/satisfied-guide-cns.cpp,
+ src/selcue.cpp, src/select-context.cpp, src/selection-chemistry.cpp,
+ src/selection.cpp, src/seltrans.cpp, src/sp-flowtext.cpp,
+ src/spiral-context.cpp, src/splivarot.cpp, src/sp-namedview.cpp,
+ src/sp-text.cpp, src/star-context.cpp, src/text-chemistry.cpp,
+ src/text-context.cpp, src/tools-switch.cpp,
+ src/trace/potrace/inkscape-potrace.cpp, src/trace/trace.cpp,
+ src/ui/dialog/align-and-distribute.cpp, src/ui/dialog/dialog.cpp,
+ src/ui/dialog/document-metadata.cpp,
+ src/ui/dialog/document-properties.cpp,
+ src/ui/dialog/inkscape-preferences.cpp,
+ src/ui/dialog/session-player.cpp, src/ui/dialog/transformation.cpp,
+ src/ui/widget/color-picker.cpp, src/ui/widget/page-sizer.cpp,
+ src/ui/widget/registered-widget.cpp, src/ui/widget/ruler.cpp,
+ src/ui/widget/selected-style.cpp, src/ui/widget/tolerance-slider.cpp,
+ src/verbs.cpp, src/widgets/gradient-toolbar.cpp,
+ src/widgets/layer-selector.cpp, src/widgets/select-toolbar.cpp,
+ src/widgets/sp-xmlview-content.cpp, src/widgets/toolbox.cpp:
+
+ Get rid of the SP_DT_* macros which do nothing more than provide
+ additional, confusing, names for other functions. If shorter names
+ are desired, the actual functions should be renamed -- or better, made
+ into member functions.
+
2006-04-09 Jon A. Cruz <jon@joncruz.org>
* share/icons/icons.svg: Fixed jumping eye (layer visibility).
index 6c3dbf896480564d0dab720bbd7da20f93320caf..1cc45f3c7ebf5388e55d32fe5ca83aed82b0a418 100644 (file)
Editor::getActiveDocument()
{
if (getActiveDesktop()) {
- return SP_DT_DOCUMENT (getActiveDesktop());
+ return sp_desktop_document (getActiveDesktop());
}
return NULL;
if (isDesktopActive (dt)) {
_instance->_desktop_activated_signal.emit (dt);
- _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (dt));
- _instance->_selection_set_signal.emit (SP_DT_SELECTION (dt));
- _instance->_selection_changed_signal.emit (SP_DT_SELECTION (dt));
+ _instance->_event_context_set_signal.emit (sp_desktop_event_context (dt));
+ _instance->_selection_set_signal.emit (sp_desktop_selection (dt));
+ _instance->_selection_changed_signal.emit (sp_desktop_selection (dt));
}
}
_instance->_desktops = g_slist_remove (_instance->_desktops, new_desktop);
_instance->_desktops = g_slist_prepend (_instance->_desktops, new_desktop);
_instance->_desktop_activated_signal.emit (new_desktop);
- _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (new_desktop));
- _instance->_selection_set_signal.emit (SP_DT_SELECTION (new_desktop));
- _instance->_selection_changed_signal.emit (SP_DT_SELECTION (new_desktop));
+ _instance->_event_context_set_signal.emit (sp_desktop_event_context (new_desktop));
+ _instance->_selection_set_signal.emit (sp_desktop_selection (new_desktop));
+ _instance->_selection_changed_signal.emit (sp_desktop_selection (new_desktop));
} else {
_instance->_event_context_set_signal.emit (0);
- if (SP_DT_SELECTION(dt))
- SP_DT_SELECTION(dt)->clear();
+ if (sp_desktop_selection(dt))
+ sp_desktop_selection(dt)->clear();
}
}
_instance->_desktops = g_slist_prepend (_instance->_desktops, dt);
_instance->_desktop_activated_signal.emit (dt);
- _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT(dt));
- _instance->_selection_set_signal.emit (SP_DT_SELECTION(dt));
- _instance->_selection_changed_signal.emit (SP_DT_SELECTION(dt));
+ _instance->_event_context_set_signal.emit (sp_desktop_event_context(dt));
+ _instance->_selection_set_signal.emit (sp_desktop_selection(dt));
+ _instance->_selection_changed_signal.emit (sp_desktop_selection(dt));
}
void
//Editor::getEventContext()
//{
// if (getActiveDesktop()) {
-// return SP_DT_EVENTCONTEXT (getActiveDesktop());
+// return sp_desktop_event_context (getActiveDesktop());
// }
//
// return NULL;
diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index 10e38ee9a64473cf023854c062e125220851439f..8bee7fe028803b41f1597a185ed70b0654445d7f 100644 (file)
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
static void sp_arc_context_setup(SPEventContext *ec)
{
SPArcContext *ac = SP_ARC_CONTEXT(ec);
- Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
if (((SPEventContextClass *) parent_class)->setup) {
((SPEventContextClass *) parent_class)->setup(ec);
static bool dragging;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPArcContext *ac = SP_ARC_CONTEXT(event_context);
event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
}
break;
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
default:
break;
SP_OBJECT(ac->item)->updateRepr();
- SP_DT_SELECTION(desktop)->set(ac->item);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_desktop_selection(desktop)->set(ac->item);
+ sp_document_done(sp_desktop_document(desktop));
ac->item = NULL;
}
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 5de222adef48e3f4945536e02d63c6f67d88655f..d90eca49b1ac20c5e1007517557295736e4bf043 100644 (file)
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
{
// Don't count this as changes to the document,
// it is basically just llate initialisation.
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
gboolean saved = sp_document_get_undo_sensitive(document);
sp_document_set_undo_sensitive(document, FALSE);
index a004076629bb5fbb77fbebe67a0f9e1283867fb2..d8e7b879710430e9cf72a80dd36b7335ed9fbecb 100644 (file)
((SPEventContextClass *) parent_class)->setup(ec);
}
- cc->selection = SP_DT_SELECTION(dt);
+ cc->selection = sp_desktop_selection(dt);
cc->sel_changed_connection.disconnect();
cc->sel_changed_connection = cc->selection->connectChanged(
(gpointer) cc));
/* Create red bpath */
- cc->red_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL);
+ cc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cc->red_bpath), cc->red_color,
1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cc->red_bpath), 0x00000000,
@@ -653,7 +653,7 @@ connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton con
if ( revent.button == 1 ) {
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
NR::Point const event_w(revent.x, revent.y);
@@ -788,7 +788,7 @@ spcc_connector_set_subsequent_point(SPConnectorContext *const cc, NR::Point cons
Avoid::Point dst = { d[NR::X], d[NR::Y] };
if (!cc->newConnRef) {
- Avoid::Router *router = SP_DT_DOCUMENT(dt)->router;
+ Avoid::Router *router = sp_desktop_document(dt)->router;
cc->newConnRef = new Avoid::ConnRef(router, 0, src, dst);
cc->newConnRef->updateEndPoint(Avoid::VertID::src, src);
}
sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(cc)));
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
if ( c && !sp_curve_empty(c) ) {
/* We actually have something to write */
knot->desktop = cc->desktop;
knot->flags = SP_KNOT_VISIBLE;
- knot->item = sp_canvas_item_new (SP_DT_CONTROLS(cc->desktop),
+ knot->item = sp_canvas_item_new (sp_desktop_controls(cc->desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"filled", TRUE,
knot->desktop = cc->desktop;
knot->flags = SP_KNOT_VISIBLE;
- knot->item = sp_canvas_item_new (SP_DT_CONTROLS (cc->desktop),
+ knot->item = sp_canvas_item_new (sp_desktop_controls (cc->desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"filled", TRUE,
return;
}
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList *l = (GSList *) selection->itemList();
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index fad40ca7e56c1e17208476e238b1c3a75b54c71e..3147fae240f936481f2e07689e219a68a844358c 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -131,7 +131,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
sp_repr_set_svg_double(repr, "position", guide_pos_dt);
SP_OBJECT_REPR(desktop->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
desktop->set_coordinate_status(event_dt);
}
sp_guide_remove(guide);
}
moved = false;
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
}
diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index 0a7e5e7be2446bdb09e2f7d442734937325574a0..3633ef1f00f4eb36aab64f476aff73e6d68400f6 100644 (file)
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
#define SP_COORDINATES_UNDERLINE_X (1 << NR::X)
#define SP_COORDINATES_UNDERLINE_Y (1 << NR::Y)
-#define SP_DT_EVENTCONTEXT(d) sp_desktop_event_context (d)
-#define SP_DT_SELECTION(d) sp_desktop_selection (d)
-#define SP_DT_DOCUMENT(d) sp_desktop_document (d)
-#define SP_DT_CANVAS(d) sp_desktop_canvas (d)
-#define SP_DT_ACETATE(d) sp_desktop_acetate (d)
-#define SP_DT_MAIN(d) sp_desktop_main (d)
-#define SP_DT_GRID(d) sp_desktop_grid (d)
-#define SP_DT_GUIDES(d) sp_desktop_guides (d)
-#define SP_DT_DRAWING(d) sp_desktop_drawing (d)
-#define SP_DT_SKETCH(d) sp_desktop_sketch (d)
-#define SP_DT_CONTROLS(d) sp_desktop_controls (d)
-#define SP_DT_MSGSTACK(d) sp_desktop_message_stack (d)
-#define SP_DT_NAMEDVIEW(d) sp_desktop_namedview (d)
-
SPEventContext * sp_desktop_event_context (SPDesktop const * desktop);
Inkscape::Selection * sp_desktop_selection (SPDesktop const * desktop);
SPDocument * sp_desktop_document (SPDesktop const * desktop);
index 22b35370e585e4f4e151a5c9f415bb7d51414d3b..64edcbfd59e920fd9bec0d2369e2da44424ff981 100644 (file)
@@ -183,7 +183,7 @@ clonetiler_change_selection (Inkscape::Application * /*inkscape*/, Inkscape::Sel
static void
clonetiler_external_change (Inkscape::Application * /*inkscape*/, GtkWidget *dlg)
{
- clonetiler_change_selection (NULL, SP_DT_SELECTION(SP_ACTIVE_DESKTOP), dlg);
+ clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg);
}
static void clonetiler_disconnect_gsignal (GObject *widget, gpointer source) {
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty() || g_slist_length((GSList *) selection->itemList()) > 1) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>one object</b> whose tiled clones to unclump."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>one object</b> whose tiled clones to unclump."));
return;
}
}
}
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document(desktop));
unclump (to_unclump);
g_slist_free (to_unclump);
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
static guint
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty() || g_slist_length((GSList *) selection->itemList()) > 1) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>one object</b> whose tiled clones to remove."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>one object</b> whose tiled clones to remove."));
return;
}
clonetiler_change_selection (NULL, selection, dlg);
if (do_undo)
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
static NR::Rect
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select an <b>object</b> to clone."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select an <b>object</b> to clone."));
return;
}
// Check if more than one object is selected.
if (g_slist_length((GSList *) selection->itemList()) > 1) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("If you want to clone several objects, <b>group</b> them and <b>clone the group</b>."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("If you want to clone several objects, <b>group</b> them and <b>clone the group</b>."));
return;
}
double gamma_picked = prefs_get_double_attribute_limited (prefs_path, "gamma_picked", 0, -10, 10);
if (dotrace) {
- clonetiler_trace_setup (SP_DT_DOCUMENT(desktop), 1.0, SP_ITEM (obj));
+ clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, SP_ITEM (obj));
}
NR::Point c;
SP_OBJECT_REPR(parent)->appendChild(clone);
if (center_set) {
- SPObject *clone_object = SP_DT_DOCUMENT(desktop)->getObjectByRepr(clone);
+ SPObject *clone_object = sp_desktop_document(desktop)->getObjectByRepr(clone);
if (clone_object && SP_IS_ITEM(clone_object)) {
clone_object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
SP_ITEM(clone_object)->setCenter(desktop->doc2dt(new_center));
clonetiler_change_selection (NULL, selection, dlg);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
static GtkWidget *
// unitmenu
GtkWidget *u = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
- sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->doc_units);
+ sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units);
{
// Width spinbutton
g_signal_connect(G_OBJECT(dlg), "destroy", G_CALLBACK(clonetiler_disconnect_gsignal), G_OBJECT (INKSCAPE));
// update now
- clonetiler_change_selection (NULL, SP_DT_SELECTION(SP_ACTIVE_DESKTOP), dlg);
+ clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg);
}
{
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 372430bcd04c53b028d9ba75cca76a0c4bb73858..5438dfdc55306dd645185e036f8c099ca3a598cd 100644 (file)
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
us = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop)
- sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units);
+ sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units);
gtk_box_pack_end (GTK_BOX (unitbox), us, FALSE, FALSE, 0);
l = gtk_label_new (_("Units:"));
gtk_box_pack_end (GTK_BOX (unitbox), l, FALSE, FALSE, 3);
{
selection_type key = SELECTION_NUMBER_OF;
- if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
+ if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
key = SELECTION_SELECTION;
}
current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
if ((current_key == SELECTION_DRAWING || current_key == SELECTION_PAGE) &&
- (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false &&
+ (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false &&
was_empty) {
gtk_toggle_button_set_active
( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[SELECTION_SELECTION])),
TRUE );
}
- was_empty = (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty();
+ was_empty = (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty();
current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
if ( SP_ACTIVE_DESKTOP ) {
SPDocument *doc;
NRRect bbox;
- doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
+ doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)), &bbox);
if (!(bbox.x0 > bbox.x1 && bbox.y0 > bbox.y1)) {
}
break;
case SELECTION_SELECTION:
- if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
+ if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
NRRect bbox;
- (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds(&bbox);
+ (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds(&bbox);
sp_export_set_area (base, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
}
break;
{
SPDocument *doc;
NRRect bbox;
- doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
+ doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
/* Notice how the switch is used to 'fall through' here to get
various backups. If you modify this without noticing you'll
probabaly screw something up. */
switch (key) {
case SELECTION_SELECTION:
- if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false)
+ if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false)
{
- (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds(&bbox);
+ (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds(&bbox);
/* Only if there is a selection that we can set
do we break, otherwise we fall through to the
drawing */
break;
}
case SELECTION_SELECTION:
- if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
+ if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
const GSList * reprlst;
bool filename_search = TRUE;
bool xdpi_search = TRUE;
bool ydpi_search = TRUE;
- reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList();
+ reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList();
for(; reprlst != NULL &&
filename_search &&
xdpi_search &&
one that's nice */
if (filename == NULL) {
const gchar * id = NULL;
- reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList();
+ reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList();
for(; reprlst != NULL; reprlst = reprlst->next) {
Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
if (repr->attribute("id")) {
}
g_free(dirname);
- SPNamedView *nv = SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP);
+ SPNamedView *nv = sp_desktop_namedview(SP_ACTIVE_DESKTOP);
GtkWidget *dlg, *prg, *btn; /* progressbar-stuff */
char *fn;
gchar *text;
gtk_widget_show_all (dlg);
/* Do export */
- if (!sp_export_png_file (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP), filename,
+ if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), filename,
x0, y0, x1, y1, width, height,
nv->pagecolor,
sp_export_progress_callback, base)) {
bool saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive(doc, FALSE);
- reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList();
+ reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList();
for(; reprlst != NULL; reprlst = reprlst->next) {
Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
// std::cout << "Looking at: " << selection_names[this_test[i]] << std::endl;
switch (this_test[i]) {
case SELECTION_SELECTION:
- if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
- NR::Rect bbox = (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds();
+ if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) {
+ NR::Rect bbox = (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds();
//std::cout << "Selection " << bbox;
if (sp_export_bbox_equal(bbox,current_bbox)) {
}
break;
case SELECTION_DRAWING: {
- SPDocument *doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
+ SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
NR::Rect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
case SELECTION_PAGE: {
SPDocument *doc;
- doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
+ doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
NR::Point x(0.0, 0.0);
NR::Point y(sp_document_width(doc),
index 2aaf6e6c26094f7c656072e21a4b4ba2df6ca58b..1efae59e1a56da5c1ffc20843f6618d0cac78b76 100644 (file)
case SP_PAINT_SELECTOR_MODE_COLOR_CMYK:
{
sp_paint_selector_set_flat_color (psel, SP_ACTIVE_DESKTOP, "fill", "fill-opacity");
- sp_document_maybe_done (SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP), undo_label);
+ sp_document_maybe_done (sp_desktop_document(SP_ACTIVE_DESKTOP), undo_label);
g_object_set_data (G_OBJECT (spw), "local", GINT_TO_POINTER (TRUE)); // local change, do not update from selection
break;
}
if (!desktop) {
return;
}
- SPDocument *document = SP_DT_DOCUMENT (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
GSList const *items = selection->itemList();
case SP_PAINT_SELECTOR_MODE_COLOR_CMYK:
{
sp_paint_selector_set_flat_color (psel, desktop, "fill", "fill-opacity");
- sp_document_maybe_done (SP_DT_DOCUMENT(desktop), undo_label);
+ sp_document_maybe_done (sp_desktop_document(desktop), undo_label);
// on release, toggle undo_label so that the next drag will not be lumped with this one
if (undo_label == undo_label_1)
diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index c76390ccba5a7c164a43fdd3a6df4f0490cdb2f3..f3efeed81329bba0fb4af6b8777e3a7e56f27285 100644 (file)
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "inlayer")))) {
l = all_items (desktop->currentLayer(), l, hidden, locked);
} else {
- l = all_items (SP_DOCUMENT_ROOT (SP_DT_DOCUMENT (desktop)), l, hidden, locked);
+ l = all_items (SP_DOCUMENT_ROOT (sp_desktop_document (desktop)), l, hidden, locked);
}
}
guint all = g_slist_length (l);
count),
count, all, exact? _("exact") : _("partial"));
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
selection->clear();
selection->setList(n);
scroll_to_show_item (desktop, SP_ITEM(n->data));
index 4a3248010a38df2fc0b1c419354650b4b57db75a..6641b3bfb44c0b42fd7e3237cd70551ad06e84da 100644 (file)
if ( selectionButton && selectionButton->get_active() )
{
- Inkscape::Selection * sel = SP_DT_SELECTION(desktop);
+ Inkscape::Selection * sel = sp_desktop_selection(desktop);
if ( sel ) {
//g_message("found a selection to play with");
index 50027e2faaf9c01022204a872d31f14620b48bc0..51b0abd61c51a59f7128685774e6a9c024d05eb7 100644 (file)
gtk_widget_show_all (spw);
- sp_item_widget_setup (SP_WIDGET (spw), SP_DT_SELECTION (SP_ACTIVE_DESKTOP));
+ sp_item_widget_setup (SP_WIDGET (spw), sp_desktop_selection (SP_ACTIVE_DESKTOP));
return (GtkWidget *) spw;
if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
return;
- SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem();
+ SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
g_return_if_fail (item != NULL);
gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
return;
- SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem();
+ SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
g_return_if_fail (item != NULL);
gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
return;
- SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem();
+ SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
g_return_if_fail (item != NULL);
gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
index e79817462a4a38f3e207293a3bb9b0fce3b2a7df..5be24993a9929cc273183c86eed0184c1cca0ec5 100644 (file)
g_assert(_strategy != NULL);
_strategy->perform(*this);
- sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
_close();
}
desktop->currentLayer()->setLabel(
( name.empty() ? NULL : (gchar *)name.c_str() )
);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
// TRANSLATORS: This means "The layer has been renamed"
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Renamed layer"));
}
if (!name.empty()) {
new_layer->setLabel((gchar *)name.c_str());
}
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
desktop->setCurrentLayer(new_layer);
desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("New layer created."));
}
index 2d8b5070b60dc317d0cf84f90cc595ba4781fae0..7be1b8a1ce359b38c7edc4bb0a78d6eb661fef64 100644 (file)
sp_repr_css_attr_unref (css);
- sp_document_maybe_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP), "fillstroke:opacity");
+ sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "fillstroke:opacity");
gtk_object_set_data (GTK_OBJECT (dlg), "blocked", GUINT_TO_POINTER (FALSE));
}
index 6ad8e82c424fc81148c1b68e06809aeafb4c200e..5fefb8aa9d565eb58123de3a63ebed7125b0a34a 100644 (file)
case SP_PAINT_SELECTOR_MODE_COLOR_CMYK:
{
sp_paint_selector_set_flat_color (psel, SP_ACTIVE_DESKTOP, "stroke", "stroke-opacity");
- sp_document_maybe_done (SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP), undo_label);
+ sp_document_maybe_done (sp_desktop_document(SP_ACTIVE_DESKTOP), undo_label);
break;
}
g_object_set_data (G_OBJECT (spw), "update", GINT_TO_POINTER (TRUE));
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPDocument *document = SP_DT_DOCUMENT (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
GSList const *items = selection->itemList();
case SP_PAINT_SELECTOR_MODE_COLOR_CMYK:
{
sp_paint_selector_set_flat_color (psel, desktop, "stroke", "stroke-opacity");
- sp_document_maybe_done (SP_DT_DOCUMENT(desktop), undo_label);
+ sp_document_maybe_done (sp_desktop_document(desktop), undo_label);
// on release, toggle undo_label so that the next drag will not be lumped with this one
if (undo_label == undo_label_1)
ink_marker_menu( GtkWidget *tbl, gchar *menu_id, SPDocument *sandbox)
{
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
GtkWidget *mnu = gtk_option_menu_new();
/* Create new menu widget */
}
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
if (!document) {
return;
}
gchar *menu_id = (gchar *) g_object_get_data(G_OBJECT(mnu), "menu_id");
sp_repr_css_set_property(css, menu_id, marker);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
SPItem *item = (SPItem *) items->data;
return FALSE;
}
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
if (selection->isEmpty())
return FALSE;
us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop)
- sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units);
+ sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units);
sp_unit_selector_add_unit(SP_UNIT_SELECTOR(us), &sp_unit_get_by_id(SP_UNIT_PERCENT), 0);
g_signal_connect ( G_OBJECT (us), "set_unit", G_CALLBACK (stroke_width_set_unit), spw );
gtk_widget_show(us);
GTK_SIGNAL_FUNC(sp_stroke_style_line_selection_changed),
NULL );
- sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? SP_DT_SELECTION(desktop) : NULL);
+ sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? sp_desktop_selection(desktop) : NULL);
return spw;
}
if (spw->inkscape) {
sp_stroke_style_line_update(spw,
( SP_ACTIVE_DESKTOP
- ? SP_DT_SELECTION(SP_ACTIVE_DESKTOP)
+ ? sp_desktop_selection(SP_ACTIVE_DESKTOP)
: NULL ));
}
}
} else {
// same width, or only one object; no sense to keep percent, switch to absolute
if (unit->base != SP_UNIT_ABSOLUTE && unit->base != SP_UNIT_DEVICE) {
- sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->doc_units);
+ sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units);
}
}
GtkAdjustment *ml = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(spw), "miterlimit"));
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPDocument *document = SP_DT_DOCUMENT (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
GSList const *items = selection->itemList();
sp_repr_css_attr_unref(css);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
}
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
SPObject *marker = doc->getObjectById(b);
return marker;
}
index bd2ec169ca7d1b1a6120037fa0d0583daa136013..4338b42520a21ae05bd398f9774be6e5781e5e26 100644 (file)
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if ( desktop ) {
- SPDocument* document = SP_DT_DOCUMENT( desktop );
+ SPDocument* document = sp_desktop_document( desktop );
Inkscape::XML::Node *rroot = sp_document_repr_root( document );
if ( rroot ) {
sp_desktop_set_style(desktop, css);
sp_repr_css_attr_unref(css);
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
}
index 15d510ddad1268421b76d2a2fac17980e853f706..b28a1dc57534b765a5f629441819695187100367 100644 (file)
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
unsigned items = 0;
- const GSList *item_list = SP_DT_SELECTION(desktop)->itemList();
+ const GSList *item_list = sp_desktop_selection(desktop)->itemList();
SPCSSAttr *css = sp_get_text_dialog_style ();
gtk_widget_set_sensitive (def, FALSE);
} else if (items == 1) {
/* exactly one text object; now set its text, too */
- SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem();
+ SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) {
sp_text_edit_dialog_update_object_text (item);
}
}
// complete the transaction
- sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
gtk_widget_set_sensitive (apply, FALSE);
if (!SP_ACTIVE_DESKTOP)
return NULL;
- for (const GSList *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList();
+ for (const GSList *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList();
item != NULL;
item = item->next)
{
unsigned int items = 0;
- for (const GSList *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList();
+ for (const GSList *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList();
item != NULL;
item = item->next)
{
index c9c166bc2e9ae0a942b9e6eebe73d0ca9b809e78..4b84078e5b4ccc8a48a8bfe39a06caa7e42b7805 100644 (file)
grid_top = 99999;
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document(desktop));
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
const GSList *items = selection->itemList();
cnt=0;
for (; items != NULL; items = items->next) {
NRRect b;
selection->bounds(&b);
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
updating = true;
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
GSList const *items = selection->itemList();
int selcount = g_slist_length((GSList *)items);
// in turn, prevent listener from responding
updating = true;
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
GSList const *items = selection->itemList();
int selcount = g_slist_length((GSList *)items);
// in turn, prevent listener from responding
updating = true;
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
const GSList *items = selection->itemList();
int selcount = g_slist_length((GSList *)items);
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
int selcount = 1;
if (!selection->isEmpty()) {
GSList const *items = selection->itemList();
index c386fe91be84d540791013efee05d8d36ccc646d..6b37b65d4bb68cfab8e7913a6967ad1089297848 100644 (file)
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
}
current_desktop = desktop;
if (desktop) {
- sel_changed_connection = SP_DT_SELECTION(desktop)->connectChanged(&on_desktop_selection_changed);
+ sel_changed_connection = sp_desktop_selection(desktop)->connectChanged(&on_desktop_selection_changed);
document_replaced_connection = desktop->connectDocumentReplaced(&on_document_replaced);
- set_tree_document(SP_DT_DOCUMENT(desktop));
+ set_tree_document(sp_desktop_document(desktop));
} else {
set_tree_document(NULL);
}
return NULL;
}
- return SP_DT_SELECTION(current_desktop)->singleRepr();
+ return sp_desktop_selection(current_desktop)->singleRepr();
}
return;
}
- Inkscape::Selection *selection = SP_DT_SELECTION(current_desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(current_desktop);
SPObject *object;
if (repr) {
repr = sp_repr_parent(repr);
} // end of while loop
- object = SP_DT_DOCUMENT(current_desktop)->getObjectByRepr(repr);
+ object = sp_desktop_document(current_desktop)->getObjectByRepr(repr);
} else {
object = NULL;
}
if (current_desktop)
sel_changed_connection.disconnect();
- sel_changed_connection = SP_DT_SELECTION(dt)->connectChanged(&on_desktop_selection_changed);
+ sel_changed_connection = sp_desktop_selection(dt)->connectChanged(&on_desktop_selection_changed);
set_tree_document(doc);
}
diff --git a/src/draw-anchor.cpp b/src/draw-anchor.cpp
index f2af728cf7eec7c6c7b6b8108c18dca060629bfe..b06e94a48f0eccf8429af96ae0ec9e284dd24560 100644 (file)
--- a/src/draw-anchor.cpp
+++ b/src/draw-anchor.cpp
a->start = start;
a->active = FALSE;
a->dp = delta;
- a->ctrl = sp_canvas_item_new(SP_DT_CONTROLS(dt), SP_TYPE_CTRL,
+ a->ctrl = sp_canvas_item_new(sp_desktop_controls(dt), SP_TYPE_CTRL,
"size", 6.0,
"filled", 0,
"fill_color", 0xff00007f,
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index 0cb408293decefe06134213148c046793cbaa997..d33a33f7b12f2d740f293c97b7ad941dd336c3db 100644 (file)
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
((SPEventContextClass *) draw_parent_class)->setup(ec);
}
- dc->selection = SP_DT_SELECTION(dt);
+ dc->selection = sp_desktop_selection(dt);
/* Connect signals to track selection changes */
dc->sel_changed_connection = dc->selection->connectChanged(
);
/* Create red bpath */
- dc->red_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL);
+ dc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->red_bpath), dc->red_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
/* Create red curve */
dc->red_curve = sp_curve_new_sized(4);
/* Create blue bpath */
- dc->blue_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL);
+ dc->blue_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->blue_bpath), dc->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
/* Create blue curve */
dc->blue_curve = sp_curve_new_sized(8);
case GDK_KEY_PRESS:
switch (get_group0_keyval (&event->key)) {
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
ret = TRUE;
break;
case GDK_Tab: // Tab - cycle selection forward
: sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(dc)) ));
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
if ( c && !sp_curve_empty(c) ) {
/* We actually have something to write */
index fbe1bd6ce9449f52cd882ad22ec92f18ad5e232a..148cceda47b0bef2a0b4a93b0a4aa87d07d1ef3c 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
}
SPCurve *c = sp_curve_new_from_static_bpath(spdc_circle);
- dc->area = sp_canvas_bpath_new(SP_DT_CONTROLS(ec->desktop), c);
+ dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c);
sp_curve_unref(c);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(dc->area), 0x00000000,(SPWindRule)0);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
@@ -268,7 +268,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
NRPixBlock pb;
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x0, y0, x1, y1, TRUE);
/* fixme: (Lauris) */
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(ec->desktop)), &pb);
for (int y = y0; y < y1; y++) {
const unsigned char *s = NR_PIXBLOCK_PX(&pb) + (y - y0) * pb.rs;
for (int x = x0; x < x1; x++) {
@@ -302,7 +302,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
int x = (int) floor(event->button.x);
int y = (int) floor(event->button.y);
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x, y, x+1, y+1, TRUE);
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(ec->desktop)), &pb);
const unsigned char *s = NR_PIXBLOCK_PX(&pb);
R = s[0] / 255.0;
@@ -313,7 +313,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
if (pick == SP_DROPPER_PICK_VISIBLE) {
// compose with page color
- guint32 bg = SP_DT_NAMEDVIEW(ec->desktop)->pagecolor;
+ guint32 bg = sp_desktop_namedview(ec->desktop)->pagecolor;
R = R + (SP_RGBA32_R_F(bg)) * (1 - A);
G = G + (SP_RGBA32_G_F(bg)) * (1 - A);
B = B + (SP_RGBA32_B_F(bg)) * (1 - A);
@@ -378,8 +378,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
// REJON: set aux. toolbar input to hex color!
- if (!(SP_DT_SELECTION(ec->desktop)->isEmpty())) {
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ if (!(sp_desktop_selection(ec->desktop)->isEmpty())) {
+ sp_document_done(sp_desktop_document(ec->desktop));
}
ret = TRUE;
@@ -397,7 +397,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
}
break;
case GDK_Escape:
- SP_DT_SELECTION(ec->desktop)->clear();
+ sp_desktop_selection(ec->desktop)->clear();
default:
break;
}
index 02ca80b202c9da06a7c0eb2fb6993df81808114c..c0c91adccaaff819bb8c7154398e6dbad992402a 100644 (file)
ddc->cal1 = sp_curve_new_sized(32);
ddc->cal2 = sp_curve_new_sized(32);
- ddc->currentshape = sp_canvas_item_new(SP_DT_SKETCH(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL);
+ ddc->currentshape = sp_canvas_item_new(sp_desktop_sketch(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->currentshape), DDC_RED_RGBA, SP_WIND_RULE_EVENODD);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(ddc->currentshape), 0x00000000, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
/* fixme: Cannot we cascade it to root more clearly? */
{
SPDynaDrawContext *dc = SP_DYNA_DRAW_CONTEXT(data);
SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop;
- SPCanvas *canvas = SP_CANVAS(SP_DT_CANVAS(desktop));
+ SPCanvas *canvas = SP_CANVAS(sp_desktop_canvas(desktop));
dc->dragging = TRUE;
}
break;
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
break;
default:
Inkscape::GC::release(dc->repr);
item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
item->updateRepr();
- SP_DT_SELECTION(desktop)->set(dc->repr);
+ sp_desktop_selection(desktop)->set(dc->repr);
}
abp = nr_artpath_affine(sp_curve_first_bpath(dc->accumulated), sp_desktop_dt2root_affine(desktop));
str = sp_svg_write_path(abp);
dc->repr = NULL;
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
static void
if (!release) {
g_assert(!sp_curve_empty(dc->currentcurve));
- SPCanvasItem *cbp = sp_canvas_item_new(SP_DT_SKETCH(SP_EVENT_CONTEXT(dc)->desktop),
+ SPCanvasItem *cbp = sp_canvas_item_new(sp_desktop_sketch(SP_EVENT_CONTEXT(dc)->desktop),
SP_TYPE_CANVAS_BPATH,
NULL);
SPCurve *curve = sp_curve_copy(dc->currentcurve);
diff --git a/src/event-context.cpp b/src/event-context.cpp
index da430a2ed163d711f43eaa4caad3b428926aa968..ea37775bb2104256e471d4e4b428c14943c02b3a 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
void
sp_event_context_update_cursor(SPEventContext *ec)
{
- GtkWidget *w = GTK_WIDGET(SP_DT_CANVAS(ec->desktop));
+ GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop));
if (w->window) {
/* fixme: */
if (ec->cursor_shape) {
/* fixme: This is not what I want but works for now (Lauris) */
if (event->type == GDK_KEY_PRESS) {
- item = SP_DT_SELECTION(desktop)->singleItem();
+ item = sp_desktop_selection(desktop)->singleItem();
}
menu = sp_ui_context_menu(desktop, item);
gtk_widget_show(menu);
@@ -1013,7 +1013,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name,
SPDesktop *desktop = ec->desktop;
- SPItem *item = SP_DT_SELECTION(desktop)->singleItem();
+ SPItem *item = sp_desktop_selection(desktop)->singleItem();
if (item) {
ec->shape_knot_holder = sp_item_knot_holder(item, desktop);
index f9cc2ee0b86b1af0d48ae10f707344a61e1cc02c..8f121800fa90b4e34f1dd3ab0ec4f552767b43b5 100644 (file)
@@ -609,7 +609,7 @@ Script::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *do
SPDesktop *desktop = (SPDesktop *) doc;
if (desktop != NULL) {
using Inkscape::Util::GSListConstIterator;
- GSListConstIterator<SPItem *> selected = SP_DT_SELECTION(desktop)->itemList();
+ GSListConstIterator<SPItem *> selected = sp_desktop_selection(desktop)->itemList();
while ( selected != NULL ) {
local_command += " --id=";
local_command += SP_OBJECT_ID(*selected);
diff --git a/src/file.cpp b/src/file.cpp
index e1a05897bb128ac2e9c4ebb066dafe1c2125ac02..4d96899da117579869922e3d0ff55e1db3d2d1d7 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -179,7 +179,7 @@ sp_file_open(gchar const *uri, Inkscape::Extension::Extension *key, bool add_to_
if (doc) {
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPDocument *existing = desktop ? SP_DT_DOCUMENT(desktop) : NULL;
+ SPDocument *existing = desktop ? sp_desktop_document(desktop) : NULL;
if (existing && existing->virgin && replace_empty) {
// If the current desktop is empty, open the document there
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
g_assert(desktop != NULL);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
g_assert(doc != NULL);
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
@@ -881,7 +881,7 @@ file_import(SPDocument *in_doc, gchar const *uri, Inkscape::Extension::Extension
// select and move the imported item
if (new_obj && SP_IS_ITEM(new_obj)) {
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
selection->set(SP_ITEM(new_obj));
// To move the imported object, we must temporarily set the "transform pattern with
@@ -889,7 +889,7 @@ file_import(SPDocument *in_doc, gchar const *uri, Inkscape::Extension::Extension
{
int const saved_pref = prefs_get_int_attribute("options.transform", "pattern", 1);
prefs_set_int_attribute("options.transform", "pattern", 1);
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document(desktop));
NR::Point m( desktop->point() - selection->bounds().midpoint() );
sp_selection_move_relative(selection, m);
prefs_set_int_attribute("options.transform", "pattern", saved_pref);
index 98a109737a5e7f207da554a75160d71dfc493385..aaf86d863e5d0a930c803bb6f8bbe1ce050ea5ca 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
ec->enableGrDrag();
- rc->_message_context = new Inkscape::MessageContext(SP_DT_MSGSTACK(ec->desktop));
+ rc->_message_context = new Inkscape::MessageContext(sp_desktop_message_stack(ec->desktop));
}
static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
@@ -129,7 +129,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
static bool dragging;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPGradientContext *rc = SP_GRADIENT_CONTEXT(event_context);
@@ -148,13 +148,13 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
SPGradientType new_type = (SPGradientType) prefs_get_int_attribute ("tools.gradient", "newgradient", SP_GRADIENT_TYPE_LINEAR);
guint new_fill = prefs_get_int_attribute ("tools.gradient", "newfillorstroke", 1);
- SPGradient *vector = sp_gradient_vector_for_object(SP_DT_DOCUMENT(desktop), desktop, SP_OBJECT (item), new_fill);
+ SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop, SP_OBJECT (item), new_fill);
SPGradient *priv = sp_item_set_gradient(item, vector, new_type, new_fill);
sp_gradient_reset_to_userspace(priv, item);
}
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
ret = TRUE;
}
@@ -359,7 +359,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
}
}
// we did an undoable action
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
ret = TRUE;
}
break;
@@ -399,8 +399,8 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime)
{
SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
SPEventContext *ec = SP_EVENT_CONTEXT(&rc);
if (!selection->isEmpty()) {
@@ -455,7 +455,7 @@ static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint st
"<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle", n_objects),
n_objects);
} else {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>objects</b> on which to create gradient."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>objects</b> on which to create gradient."));
}
}
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 1e8626602ace28033c1ce49aa26dc218c915696b..cb61a9890e044440e7e1a4b4e97595d1e923f9fa 100644 (file)
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
this->desktop = desktop;
- this->selection = SP_DT_SELECTION(desktop);
+ this->selection = sp_desktop_selection(desktop);
this->draggers = NULL;
this->lines = NULL;
@@ -378,7 +378,7 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
d_new->updateKnotShape ();
d_new->updateTip ();
d_new->updateDependencies(true);
- sp_document_done (SP_DT_DOCUMENT (d_new->parent->desktop));
+ sp_document_done (sp_desktop_document (d_new->parent->desktop));
return;
}
}
dragger->updateDependencies(true);
// we did an undoable action
- sp_document_done (SP_DT_DOCUMENT (dragger->parent->desktop));
+ sp_document_done (sp_desktop_document (dragger->parent->desktop));
}
/**
void
GrDrag::addLine (NR::Point p1, NR::Point p2, guint32 rgba)
{
- SPCanvasItem *line = sp_canvas_item_new(SP_DT_CONTROLS(this->desktop),
+ SPCanvasItem *line = sp_canvas_item_new(sp_desktop_controls(this->desktop),
SP_TYPE_CTRLLINE, NULL);
sp_ctrlline_set_coords(SP_CTRLLINE(line), p1, p2);
if (rgba != GR_LINE_COLOR_FILL) // fill is the default, so don't set color for it to speed up redraw
selected->updateDependencies(true);
// we did an undoable action
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
void
index fe2026043a517b910f06e8820fc58c786ae5fa21..ed6d25b747a840742c4a634a25e2885918944bba 100644 (file)
gchar * base = g_strndup(e, a);
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
SPObject *object = NULL;
else {
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
SPObject *object = doc->getObjectById(urn);
return object;
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 71c5d422fcb4217868ff36a7b6341b3933becf01..4051a453cb829495a56fe235af3c09788ac7bbe0 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
if (DESKTOP_IS_ACTIVE (desktop)) {
g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop);
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop));
}
}
inkscape->desktops = g_slist_remove (inkscape->desktops, new_desktop);
inkscape->desktops = g_slist_prepend (inkscape->desktops, new_desktop);
g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, new_desktop);
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (new_desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (new_desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (new_desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (new_desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (new_desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (new_desktop));
} else {
g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, NULL);
- if (SP_DT_SELECTION(desktop))
- SP_DT_SELECTION(desktop)->clear();
+ if (sp_desktop_selection(desktop))
+ sp_desktop_selection(desktop)->clear();
}
}
inkscape->desktops = g_slist_prepend (inkscape->desktops, desktop);
g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop);
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop));
- g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop));
+ g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop));
}
return Inkscape::NSApplication::Editor::getActiveDocument();
if (SP_ACTIVE_DESKTOP) {
- return SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
+ return sp_desktop_document (SP_ACTIVE_DESKTOP);
}
return NULL;
inkscape_active_event_context (void)
{
if (SP_ACTIVE_DESKTOP) {
- return SP_DT_EVENTCONTEXT (SP_ACTIVE_DESKTOP);
+ return sp_desktop_event_context (SP_ACTIVE_DESKTOP);
}
return NULL;
diff --git a/src/interface.cpp b/src/interface.cpp
index 55a9601eec10b6b56fd332bbc0fb424a795e5519..2a2cba4d01822a6a0fd8125649b3bb9625e5d4ef 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
static void enter_group(GtkMenuItem *mi, SPDesktop *desktop) {
desktop->setCurrentLayer(reinterpret_cast<SPObject *>(g_object_get_data(G_OBJECT(mi), "group")));
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
}
GtkWidget *
SPObject *new_obj = NULL;
new_obj = desktop->currentLayer()->appendChildRepr(newgroup);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
selection->set(SP_ITEM(new_obj));
// To move the imported object, we must temporarily set the "transform pattern with
// object" option.
{
int const saved_pref = prefs_get_int_attribute("options.transform", "pattern", 1);
prefs_set_int_attribute("options.transform", "pattern", 1);
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document(desktop));
NR::Point m( desktop->point() - selection->bounds().midpoint() );
sp_selection_move_relative(selection, m);
prefs_set_int_attribute("options.transform", "pattern", saved_pref);
index 8216f33c6cacc4780ea168ac9f76dee415acceab..31f536616334cb7ba8b4a3cebe7b6c9279c9fb82 100644 (file)
LmConnectionState state = lm_connection_get_state(this->_sd->connection);
if (state != LM_CONNECTION_STATE_OPEN && state != LM_CONNECTION_STATE_AUTHENTICATED) {
- SP_DT_MSGSTACK(this->_sm->desktop())->flash(Inkscape::INFORMATION_MESSAGE, _("Jabber connection lost."));
+ sp_desktop_message_stack(this->_sm->desktop())->flash(Inkscape::INFORMATION_MESSAGE, _("Jabber connection lost."));
return false;
}
// otherwise, send out the first change
MessageNode* first = this->_sd->send_queue->first();
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
ngettext("Sending message; %u message remaining in send queue.",
"Sending message; %u messages remaining in send queue.",
this->_sd->send_queue->size()),
this->_sd->send_queue->size());
if (this->_sd->send_queue->empty()) {
- SP_DT_MSGSTACK(this->_sm->desktop())->flash(Inkscape::NORMAL_MESSAGE, _("Receive queue empty."));
+ sp_desktop_message_stack(this->_sm->desktop())->flash(Inkscape::NORMAL_MESSAGE, _("Receive queue empty."));
}
switch (first->type()) {
// Pass the message to the received change handler.
this->_sm->receiveChange(msg->message());
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
ngettext("Receiving change; %u change left to process.",
"Receiving change; %u changes left to process.",
rmq->size()),
index bf7a2a31e8185fc817eade28b0312755bac61299..1474be040c25e640e2789d5a71798b9fad85c043 100644 (file)
// Delete the message queue used by this sender
this->_sm->session_data->receive_queues.erase(sender.raw());
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has left the chatroom."), sender.c_str());
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has left the chatroom."), sender.c_str());
}
default:
diff --git a/src/jabber_whiteboard/message-processors.cpp b/src/jabber_whiteboard/message-processors.cpp
index bd24f7ad84170e84e29dd49508f53e9c1411bef2..f44224cbd44de94b39ddceb255aaef6845aa31ae 100644 (file)
this->_sm->userConnectedToWhiteboard(m.sender.c_str());
this->_sm->setRecipient(m.sender.c_str());
} else {
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has joined the chatroom."), m.sender.c_str());
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has joined the chatroom."), m.sender.c_str());
}
break;
default:
index 89c20d66f281329cf3601f17e530d9d484b763ec..21cd76f178a86f947564a9599b1f84f3d900aaf8 100644 (file)
// Otherwise, it is safe to insert this message.
// Inkscape::GC::anchor(msg);
this->_queue.push_back(msg);
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
ngettext("%u change in receive queue.",
"%u changes in receive queue.",
this->_queue.size()),
{
// Inkscape::GC::anchor(msg);
this->_queue.push_back(msg);
- SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
+ sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE,
ngettext("%u change in send queue.",
"%u changes in send queue.",
this->_queue.size()),
index 5b07e2c135cdd31e959ac9ed671dfb6c57b04517..33c7f2663c5e96e41ceb1942e4f47b036c4165c5 100644 (file)
void
SessionManager::userConnectedToWhiteboard(gchar const* JID)
{
- SP_DT_MSGSTACK(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("Established whiteboard session with <b>%s</b>."), JID);
+ sp_desktop_message_stack(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("Established whiteboard session with <b>%s</b>."), JID);
}
SessionManager::userDisconnectedFromWhiteboard(std::string const& JID)
{
- SP_DT_MSGSTACK(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has <b>left</b> the whiteboard session."), JID.c_str());
+ sp_desktop_message_stack(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("<b>%s</b> has <b>left</b> the whiteboard session."), JID.c_str());
// Inform the user
// TRANSLATORS: %1 is the name of the user that disconnected, %2 is the name of the user whom the disconnected user disconnected from.
diff --git a/src/knot.cpp b/src/knot.cpp
index 01b1bafa2b844252e677d5f08ab53de5eb83a5a1..c8d2f2065256800e47f79d6693d8ae1d940ee642 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
g_signal_emit(knot,
knot_signals[UNGRABBED], 0,
event->button.state);
- sp_document_undo(SP_DT_DOCUMENT(knot->desktop));
+ sp_document_undo(sp_desktop_document(knot->desktop));
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;
knot->tip = g_strdup (tip);
}
- knot->item = sp_canvas_item_new(SP_DT_CONTROLS (desktop),
+ knot->item = sp_canvas_item_new(sp_desktop_controls (desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"size", 8.0,
diff --git a/src/node-context.cpp b/src/node-context.cpp
index 2e5fd3e7307d8d6e45833362491b042fad96a426..988de9d12456eee85e53a72c0f642aa854e0b793 100644 (file)
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
((SPEventContextClass *) parent_class)->setup(ec);
nc->sel_changed_connection.disconnect();
- nc->sel_changed_connection = SP_DT_SELECTION(ec->desktop)->connectChanged(sigc::bind(sigc::ptr_fun(&sp_node_context_selection_changed), (gpointer)nc));
+ nc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged(sigc::bind(sigc::ptr_fun(&sp_node_context_selection_changed), (gpointer)nc));
- Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
SPItem *item = selection->singleItem();
nc->nodepath = NULL;
ec->shape_knot_holder = NULL;
}
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
item = selection->singleItem();
if (item) {
@@ -405,7 +405,7 @@ sp_node_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEve
gint ret = FALSE;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPNodeContext *nc = SP_NODE_CONTEXT(event_context);
sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPNodeContext *nc = SP_NODE_CONTEXT(event_context);
double const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px
if (nc->nodepath && nc->nodepath->selected)
sp_nodepath_deselect(nc->nodepath);
else
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
}
}
ret = TRUE;
if (nc->nodepath && nc->nodepath->selected) {
sp_nodepath_deselect(nc->nodepath);
} else {
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
}
}
ret = TRUE;
diff --git a/src/nodepath.cpp b/src/nodepath.cpp
index 35f64c1b38326c17d41d74e75d34ca2a63caa0f5..081638f1dd83072d5edeb427ed25e3063c906804 100644 (file)
--- a/src/nodepath.cpp
+++ b/src/nodepath.cpp
void sp_nodepath_update_repr(Inkscape::NodePath::Path *np)
{
update_repr_internal(np);
- sp_document_done(SP_DT_DOCUMENT(np->desktop));
+ sp_document_done(sp_desktop_document(np->desktop));
if (np->livarot_path) {
delete np->livarot_path;
static void sp_nodepath_update_repr_keyed(Inkscape::NodePath::Path *np, gchar const *key)
{
update_repr_internal(np);
- sp_document_maybe_done(SP_DT_DOCUMENT(np->desktop), key);
+ sp_document_maybe_done(sp_desktop_document(np->desktop), key);
if (np->livarot_path) {
delete np->livarot_path;
// move to the saved position
new_repr->setPosition(pos > 0 ? pos : 0);
- sp_document_done(SP_DT_DOCUMENT(np->desktop));
+ sp_document_done(sp_desktop_document(np->desktop));
Inkscape::GC::release(new_repr);
g_free(svgpath);
@@ -1021,7 +1021,7 @@ static void sp_node_ensure_knot_exists (SPDesktop *desktop, Inkscape::NodePath::
}
if (!side->line) {
- side->line = sp_canvas_item_new(SP_DT_CONTROLS(desktop),
+ side->line = sp_canvas_item_new(sp_desktop_controls(desktop),
SP_TYPE_CTRLLINE, NULL);
}
}
// if the entire nodepath is removed, delete the selected object.
if (nodepath->subpaths == NULL ||
sp_nodepath_get_node_count(nodepath) < 2) {
- SPDocument *document = SP_DT_DOCUMENT (nodepath->desktop);
+ SPDocument *document = sp_desktop_document (nodepath->desktop);
sp_nodepath_destroy(nodepath);
g_list_free(nodes_to_delete);
nodes_to_delete = NULL;
// if the entire nodepath is removed, delete the selected object.
if (nodepath->subpaths == NULL ||
sp_nodepath_get_node_count(nodepath) < 2) {
- SPDocument *document = SP_DT_DOCUMENT (nodepath->desktop);
+ SPDocument *document = sp_desktop_document (nodepath->desktop);
sp_nodepath_destroy(nodepath);
sp_selection_delete();
sp_document_done (document);
diff --git a/src/object-ui.cpp b/src/object-ui.cpp
index a55a8f5000efa79f28279ca62b41df6f568b90c0..23c9ece5b89b60e470f525dc8829faba628e5ae9 100644 (file)
--- a/src/object-ui.cpp
+++ b/src/object-ui.cpp
gtk_menu_append(GTK_MENU(m), w);
/* Select item */
w = gtk_menu_item_new_with_mnemonic(_("_Select This"));
- if (SP_DT_SELECTION(desktop)->includes(item)) {
+ if (sp_desktop_selection(desktop)->includes(item)) {
gtk_widget_set_sensitive(w, FALSE);
} else {
gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
g_return_if_fail(desktop != NULL);
- SP_DT_SELECTION(desktop)->set(item);
+ sp_desktop_selection(desktop)->set(item);
sp_item_dialog();
}
desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
g_return_if_fail(desktop != NULL);
- SP_DT_SELECTION(desktop)->set(item);
+ sp_desktop_selection(desktop)->set(item);
}
static void
sp_object_attributes_dialog(object, "SPAnchor");
- SP_DT_SELECTION(desktop)->set(SP_ITEM(object));
+ sp_desktop_selection(desktop)->set(SP_ITEM(object));
}
/* SPGroup */
children = NULL;
sp_item_group_ungroup(group, &children);
- SP_DT_SELECTION(desktop)->setList(children);
+ sp_desktop_selection(desktop)->setList(children);
g_slist_free(children);
}
desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
g_return_if_fail(desktop != NULL);
- if (SP_DT_SELECTION(desktop)->isEmpty()) {
- SP_DT_SELECTION(desktop)->set(item);
+ if (sp_desktop_selection(desktop)->isEmpty()) {
+ sp_desktop_selection(desktop)->set(item);
}
sp_object_properties_dialog();
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 663cd6da4031b2542dac0399a274f1f3beabe924..de775ac1935ede4c7a1da4e4733e52901bdf77ae 100644 (file)
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList *items = (GSList *) selection->itemList();
if (g_slist_length(items) < 2) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>at least two objects</b> to combine."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>at least two objects</b> to combine."));
return;
}
for (GSList *i = items; i != NULL; i = i->next) {
SPItem *item = (SPItem *) i->data;
if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item)) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("At least one of the objects is <b>not a path</b>, cannot combine."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("At least one of the objects is <b>not a path</b>, cannot combine."));
return;
}
}
Inkscape::XML::Node *parent = SP_OBJECT_REPR((SPItem *) items->data)->parent();
for (GSList *i = items; i != NULL; i = i->next) {
if ( SP_OBJECT_REPR((SPItem *) i->data)->parent() != parent ) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot combine objects from <b>different groups</b> or <b>layers</b>."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot combine objects from <b>different groups</b> or <b>layers</b>."));
return;
}
}
// move to the position of the topmost, reduced by the number of deleted items
repr->setPosition(topmost > 0 ? topmost + 1 : 0);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->set(repr);
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to break apart."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to break apart."));
return;
}
}
if (did) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No path(s)</b> to break apart in the selection."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No path(s)</b> to break apart in the selection."));
return;
}
}
@@ -242,11 +242,11 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
if (interactive)
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to path."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to path."));
return;
}
if (interactive) {
if (did) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No objects</b> to convert to path in the selection."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No objects</b> to convert to path in the selection."));
return;
}
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList *items = (GSList *) selection->itemList();
if (!items) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to reverse."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to reverse."));
return;
}
}
if (did) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to reverse in the selection."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to reverse in the selection."));
}
}
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 6344cff2877f3dd56c561350dee0a922ff12364b..0eec95cd64190d4134df8109780918492de79600 100644 (file)
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
}
/* Pen indicators */
- pc->c0 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE,
+ pc->c0 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE,
"size", 4.0, "filled", 0, "fill_color", 0xff00007f, "stroked", 1, "stroke_color", 0x0000ff7f, NULL);
- pc->c1 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE,
+ pc->c1 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE,
"size", 4.0, "filled", 0, "fill_color", 0xff00007f, "stroked", 1, "stroke_color", 0x0000ff7f, NULL);
- pc->cl0 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL);
+ pc->cl0 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL);
sp_ctrlline_set_rgba32(SP_CTRLLINE(pc->cl0), 0x0000007f);
- pc->cl1 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL);
+ pc->cl1 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL);
sp_ctrlline_set_rgba32(SP_CTRLLINE(pc->cl1), 0x0000007f);
sp_canvas_item_hide(pc->c0);
@@ -367,7 +367,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const
// This is the first click of a new curve; deselect item so that
// this curve is not combined with it (unless it is drawn from its
// anchor, which is handled by the sibling branch above)
- Inkscape::Selection * const selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection * const selection = sp_desktop_selection(desktop);
if (!(bevent.state & GDK_SHIFT_MASK)) {
selection->clear();
pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data);
}
// one canvas bpath for all of green_curve
- SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), pc->green_curve);
+ SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), pc->green_curve);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cshape), 0, SP_WIND_RULE_NONZERO);
@@ -1032,7 +1032,7 @@ spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const p, guint const s
sp_curve_append_continuous(pc->green_curve, pc->red_curve, 0.0625);
SPCurve *curve = sp_curve_copy(pc->red_curve);
/// \todo fixme:
- SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), curve);
+ SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve);
sp_curve_unref(curve);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 0b69006132bd2eae728d17235d59b3c9fee10767..ccb7c97e96b6eda7f8be23d979f1fbf771e9e5fd 100644 (file)
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -200,7 +200,7 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
SPDrawContext *dc = SP_DRAW_CONTEXT (pc);
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (Inkscape::have_viable_layer(desktop, dc->_message_context) == false) {
return TRUE;
SPCurve *curve = sp_curve_copy(pc->red_curve);
/// \todo fixme:
- SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), curve);
+ SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve);
sp_curve_unref(curve);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 053229a41d067361ded28f60c772a8877fd94534..cf8651ae120a5aa9d1c2eff1307b5a5945a3acd4 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
((SPEventContextClass *) parent_class)->setup(ec);
}
- SPItem *item = SP_DT_SELECTION(ec->desktop)->singleItem();
+ SPItem *item = sp_desktop_selection(ec->desktop)->singleItem();
if (item) {
ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop);
Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item);
}
rc->sel_changed_connection.disconnect();
- rc->sel_changed_connection = SP_DT_SELECTION(ec->desktop)->connectChanged(
+ rc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged(
sigc::bind(sigc::ptr_fun(&sp_rect_context_selection_changed), (gpointer)rc)
);
@@ -270,7 +270,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
static bool dragging;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPRectContext *rc = SP_RECT_CONTEXT(event_context);
@@ -391,7 +391,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
break;
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
default:
break;
SP_OBJECT(rc->item)->updateRepr();
- SP_DT_SELECTION(dt)->set(rc->item);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_desktop_selection(dt)->set(rc->item);
+ sp_document_done(sp_desktop_document(dt));
rc->item = NULL;
}
diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index 8130768061d82d2e8dda8c0051b8b2be705ca4cc..cc0e70a7444c564dc72cacd8e58f3288b33ead26 100644 (file)
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
void Inkscape::Rubberband::move(NR::Point const &p)
{
if (_canvas == NULL) {
- _canvas = static_cast<CtrlRect *>(sp_canvas_item_new(SP_DT_CONTROLS(_desktop), SP_TYPE_CTRLRECT, NULL));
+ _canvas = static_cast<CtrlRect *>(sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRLRECT, NULL));
}
_desktop->scroll_to_point(&p);
index edbf32dbbf1f853cfaee175e7db2858bd0143f9c..3353b1fdfebc2d9fd6664e608919c34fbf822354 100644 (file)
std::vector<NR::Point> const &snappoints,
std::vector<SPGuideConstraint> &cns)
{
- SPNamedView const &nv = *SP_DT_NAMEDVIEW(&desktop);
+ SPNamedView const &nv = *sp_desktop_namedview(&desktop);
for (GSList const *l = nv.guides; l != NULL; l = l->next) {
SPGuide &g = *SP_GUIDE(l->data);
for (unsigned int i = 0; i < snappoints.size(); ++i) {
diff --git a/src/selcue.cpp b/src/selcue.cpp
index 426422fc9eb624a5dbdc20744494cb3d7feb9516..6d365659206749a1101673d513b85ae1bad81f81 100644 (file)
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
Inkscape::SelCue::SelCue(SPDesktop *desktop)
: _desktop(desktop)
{
- _selection = SP_DT_SELECTION(_desktop);
+ _selection = sp_desktop_selection(_desktop);
_sel_changed_connection = _selection->connectChanged(
sigc::hide(sigc::mem_fun(*this, &Inkscape::SelCue::_updateItemBboxes))
SPCanvasItem* box = NULL;
if (mode == MARK) {
- box = sp_canvas_item_new(SP_DT_CONTROLS(_desktop),
+ box = sp_canvas_item_new(sp_desktop_controls(_desktop),
SP_TYPE_CTRL,
"mode", SP_CTRL_MODE_XOR,
"shape", SP_CTRL_SHAPE_DIAMOND,
} else if (mode == BBOX) {
box = sp_canvas_item_new(
- SP_DT_CONTROLS(_desktop),
+ sp_desktop_controls(_desktop),
SP_TYPE_CTRLRECT,
NULL
);
Inkscape::Text::Layout const *layout = te_get_layout(item);
if (layout != NULL) {
NR::Point a = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(item);
- baseline_point = sp_canvas_item_new(SP_DT_CONTROLS(_desktop), SP_TYPE_CTRL,
+ baseline_point = sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRL,
"mode", SP_CTRL_MODE_XOR,
"size", 4.0,
"filled", 0,
diff --git a/src/select-context.cpp b/src/select-context.cpp
index e9ad992a44a4e4f7c5f5de2d33ecde6a66afb726..32eee593dc2645cd1ae578c944fd2c1c9f0299ae 100644 (file)
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
if (sc->item) {
// only undo if the item is still valid
if (SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))) {
- sp_document_undo(SP_DT_DOCUMENT(desktop));
+ sp_document_undo(sp_desktop_document(desktop));
}
sp_object_unref( SP_OBJECT(sc->item), NULL);
// NOTE: This is a workaround to a bug.
// When the ctrl key is held, sc->item is not defined
// so in this case (only), we skip the object doc check
- sp_document_undo(SP_DT_DOCUMENT(desktop));
+ sp_document_undo(sp_desktop_document(desktop));
}
sc->item = NULL;
{
desktop->setCurrentLayer(parent);
if (SP_IS_GROUP(current_layer) && SPGroup::LAYER != SP_GROUP(current_layer)->layerMode())
- SP_DT_SELECTION(desktop)->set(current_layer);
+ sp_desktop_selection(desktop)->set(current_layer);
}
}
}
@@ -342,13 +342,13 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE
case GDK_ENTER_NOTIFY:
{
GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
- gdk_window_set_cursor(GTK_WIDGET(SP_DT_CANVAS(desktop))->window, cursor);
+ gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor);
gdk_cursor_destroy(cursor);
break;
}
case GDK_LEAVE_NOTIFY:
- gdk_window_set_cursor(GTK_WIDGET(SP_DT_CANVAS(desktop))->window, event_context->cursor);
+ gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor);
break;
case GDK_KEY_PRESS:
SPDesktop *desktop = event_context->desktop;
SPSelectContext *sc = SP_SELECT_CONTEXT(event_context);
Inkscape::SelTrans *seltrans = sc->_seltrans;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
gdouble const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px
gdouble const offset = prefs_get_double_attribute_limited("options.defaultscale", "value", 2, 0, 1000);
tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
SPItem *clicked_item = (SPItem *) selection->itemList()->data;
if (SP_IS_GROUP (clicked_item)) { // enter group
desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
sc->dragging = false;
} else { // switch tool
tools_switch_by_item (desktop, clicked_item);
Inkscape::Rubberband::get()->stop();
seltrans->resetState();
// find out affected items:
- GSList *items = sp_document_items_in_box(SP_DT_DOCUMENT(desktop), desktop->dkey, b.assume());
+ GSList *items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, b.assume());
if (event->button.state & GDK_SHIFT_MASK) {
// with shift, add to selection
selection->addList (items);
SPItem *clicked_item = selection->singleItem();
if (SP_IS_GROUP (clicked_item)) { // enter group
desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
} else {
SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selected object is not a group. Cannot enter."));
}
index e6684010e6b705c5a1f8a039e1b4674dd21129f5..0e208f216e58efe045e56ceef27dab83fe28ca23 100644 (file)
if (tools_isactive (desktop, TOOLS_TEXT))
if (sp_text_delete_selection(desktop->event_context)) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
return;
}
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
*/
tools_switch ( desktop, tools_active ( desktop ) );
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
/* fixme: sequencing */
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
Inkscape::GC::release(copy);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->setReprList(newsel);
if (!dt)
return;
- SPDocument *doc = SP_DT_DOCUMENT(dt);
- SP_DT_SELECTION(dt)->clear();
+ SPDocument *doc = sp_desktop_document(dt);
+ sp_desktop_selection(dt)->clear();
g_return_if_fail(SP_IS_GROUP(dt->currentLayer()));
GSList *items = sp_item_group_item_list(SP_GROUP(dt->currentLayer()));
if (!dt)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(dt);
+ Inkscape::Selection *selection = sp_desktop_selection(dt);
g_return_if_fail(SP_IS_GROUP(dt->currentLayer()));
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// Check if something is selected.
if (selection->isEmpty()) {
// Move to the position of the topmost, reduced by the number of items deleted from topmost_parent
group->setPosition(topmost + 1);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->set(group);
Inkscape::GC::release(group);
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a <b>group</b> to ungroup."));
g_slist_free(items);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
static SPGroup *
if (!desktop)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = (GSList *) selection->itemList();
if (!items) {
rev = g_slist_remove(rev, child);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
void sp_selection_raise_to_top()
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to raise to top."));
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = (GSList *) selection->itemList();
if (!items) {
rev = g_slist_remove(rev, child);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to lower to bottom."));
void
sp_undo(SPDesktop *desktop, SPDocument *)
{
- if (!sp_document_undo(SP_DT_DOCUMENT(desktop)))
+ if (!sp_document_undo(sp_desktop_document(desktop)))
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo."));
}
void
sp_redo(SPDesktop *desktop, SPDocument *)
{
- if (!sp_document_redo(SP_DT_DOCUMENT(desktop)))
+ if (!sp_document_redo(sp_desktop_document(desktop)))
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo."));
}
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (tools_isactive (desktop, TOOLS_DROPPER)) {
sp_dropper_context_copy(desktop->event_context);
return;
}
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) {
return;
}
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (tools_isactive (desktop, TOOLS_TEXT)) {
if (sp_text_paste_inline(desktop->event_context))
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is in the clipboard
if (clipboard == NULL) {
return;
}
- paste_defs (&defs_clipboard, SP_DT_DOCUMENT(desktop));
+ paste_defs (&defs_clipboard, sp_desktop_document(desktop));
sp_desktop_set_style (desktop, style_clipboard);
- sp_document_done(SP_DT_DOCUMENT (desktop));
+ sp_document_done(sp_desktop_document (desktop));
}
void sp_selection_paste_size (bool apply_x, bool apply_y)
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is in the clipboard
if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) {
apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0),
apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0)));
- sp_document_done(SP_DT_DOCUMENT (desktop));
+ sp_document_done(sp_desktop_document (desktop));
}
void sp_selection_paste_size_separately (bool apply_x, bool apply_y)
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is in the clipboard
if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) {
}
- sp_document_done(SP_DT_DOCUMENT (desktop));
+ sp_document_done(sp_desktop_document (desktop));
}
void sp_selection_to_next_layer ()
{
SPDesktop *dt = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(dt);
+ Inkscape::Selection *selection = sp_desktop_selection(dt);
// check if something is selected
if (selection->isEmpty()) {
GSList *temp_clip = NULL;
sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs
sp_selection_delete_impl (items);
- GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL);
+ GSList *copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
selection->setReprList((GSList const *) copied);
g_slist_free (copied);
if (temp_clip) g_slist_free (temp_clip);
dt->setCurrentLayer(next);
- sp_document_done(SP_DT_DOCUMENT (dt));
+ sp_document_done(sp_desktop_document (dt));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers above."));
}
{
SPDesktop *dt = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(dt);
+ Inkscape::Selection *selection = sp_desktop_selection(dt);
// check if something is selected
if (selection->isEmpty()) {
GSList *temp_clip = NULL;
sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs
sp_selection_delete_impl (items);
- GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL);
+ GSList *copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
selection->setReprList((GSList const *) copied);
g_slist_free (copied);
if (temp_clip) g_slist_free (temp_clip);
dt->setCurrentLayer(next);
- sp_document_done(SP_DT_DOCUMENT (dt));
+ sp_document_done(sp_desktop_document (dt));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers below."));
}
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *l = (GSList *) selection->reprList();
while (l != NULL) {
l = l->next;
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
void
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty())
return;
sp_item_rotate_rel(item, rot_neg_90);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty())
return;
sp_item_rotate_rel(item, rot_neg_90);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
void
@@ -1542,7 +1542,7 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees)
sp_selection_rotate_relative(selection, center, angle_degrees);
- sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()),
+ sp_document_maybe_done(sp_desktop_document(selection->desktop()),
( ( angle_degrees > 0 )
? "selector:rotate:ccw"
: "selector:rotate:cw" ));
sp_selection_rotate_relative(selection, center, zangle);
- sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()),
+ sp_document_maybe_done(sp_desktop_document(selection->desktop()),
( (angle > 0)
? "selector:rotate:ccw"
: "selector:rotate:cw" ));
double const times = 1.0 + grow / max_len;
sp_selection_scale_relative(selection, center, NR::scale(times, times));
- sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()),
+ sp_document_maybe_done(sp_desktop_document(selection->desktop()),
( (grow > 0)
? "selector:scale:larger"
: "selector:scale:smaller" ));
NR::Point const center(selection->bounds().midpoint());
sp_selection_scale_relative(selection, center, NR::scale(times, times));
- sp_document_done(SP_DT_DOCUMENT(selection->desktop()));
+ sp_document_done(sp_desktop_document(selection->desktop()));
}
void
sp_selection_move(gdouble dx, gdouble dy)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
return;
}
sp_selection_move_relative(selection, dx, dy);
if (dx == 0) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical");
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical");
} else if (dy == 0) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:horizontal");
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal");
} else {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
return;
}
sp_selection_move_relative(selection, zdx, zdy);
if (dx == 0) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical");
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical");
} else if (dy == 0) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:horizontal");
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal");
} else {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
g_return_if_fail(desktop != NULL);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER);
bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1);
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
g_return_if_fail(document != NULL);
g_return_if_fail(desktop != NULL);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER);
bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1);
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
Inkscape::GC::release(clone);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->setReprList(newsel);
if (!desktop)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a <b>clone</b> to unlink."));
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No clones to unlink</b> in the selection."));
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
void
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPItem *item = selection->singleItem();
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
// restore parent and position
SP_OBJECT_REPR (parent)->appendChild(rect);
rect->setPosition(pos > 0 ? pos : 0);
- SPItem *rectangle = (SPItem *) SP_DT_DOCUMENT (desktop)->getObjectByRepr(rect);
+ SPItem *rectangle = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(rect);
Inkscape::GC::release(rect);
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
if (!did) {
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No pattern fills</b> in the selection."));
} else {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->setList(new_select);
}
}
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
bool is_empty = selection->isEmpty();
if (desktop == NULL)
return;
- SPDocument *document = SP_DT_DOCUMENT(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
if (selection->isEmpty()) {
parent->appendChild(repr);
repr->setPosition((pos + 1) > 0 ? (pos + 1) : 0);
- SPItem *mask_item = (SPItem *) SP_DT_DOCUMENT (desktop)->getObjectByRepr(repr);
+ SPItem *mask_item = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(repr);
selection->add(repr);
// transform mask, so it is moved the same spot where mask was applied
diff --git a/src/selection.cpp b/src/selection.cpp
index 702cc6594ac5579ea4f63c21335f1462f7b74965..413048f5c230f037312914b0b1bc0a806cd6e5d4 100644 (file)
--- a/src/selection.cpp
+++ b/src/selection.cpp
g_return_val_if_fail(repr != NULL, NULL);
gchar const *id = repr->attribute("id");
g_return_val_if_fail(id != NULL, NULL);
- SPObject *object=SP_DT_DOCUMENT(_desktop)->getObjectById(id);
+ SPObject *object=sp_desktop_document(_desktop)->getObjectById(id);
g_return_val_if_fail(object != NULL, NULL);
return object;
}
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index a301c8158324a537d853a0b10958caeddd27e4d4..ec6ca8ba2151195ff1e4391e1865f1102c0d08d7 100644 (file)
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
_updateHandles();
- _selection = SP_DT_SELECTION(desktop);
+ _selection = sp_desktop_selection(desktop);
- _norm = sp_canvas_item_new(SP_DT_CONTROLS(desktop),
+ _norm = sp_canvas_item_new(sp_desktop_controls(desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"mode", SP_CTRL_MODE_COLOR,
"pixbuf", handles[12],
NULL);
- _grip = sp_canvas_item_new(SP_DT_CONTROLS(desktop),
+ _grip = sp_canvas_item_new(sp_desktop_controls(desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"mode", SP_CTRL_MODE_XOR,
sp_canvas_item_hide(_norm);
for (int i = 0; i < 4; i++) {
- _l[i] = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLLINE, NULL);
+ _l[i] = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL);
sp_canvas_item_hide(_l[i]);
}
it->setCenter(p);
SP_OBJECT(it)->updateRepr();
}
- sp_document_maybe_done (SP_DT_DOCUMENT(_desktop), "center::move");
+ sp_document_maybe_done (sp_desktop_document(_desktop), "center::move");
_updateHandles();
}
void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool show_handles)
{
- Inkscape::Selection *selection = SP_DT_SELECTION(_desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(_desktop);
g_return_if_fail(!_grabbed);
{
g_return_if_fail(_grabbed);
- Inkscape::Selection *selection = SP_DT_SELECTION(_desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(_desktop);
bool updh = true;
if (!_empty && _changed) {
sp_selection_apply_affine(selection, _current, (_show == SHOW_OUTLINE)? true : false);
}
}
- sp_document_done(SP_DT_DOCUMENT(_desktop));
+ sp_document_done(sp_desktop_document(_desktop));
updh = false;
}
void Inkscape::SelTrans::stamp()
{
- Inkscape::Selection *selection = SP_DT_SELECTION(_desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(_desktop);
/* stamping mode */
if (!_empty) {
// move to the saved position
copy_repr->setPosition(pos > 0 ? pos : 0);
- SPItem *copy_item = (SPItem *) SP_DT_DOCUMENT(_desktop)->getObjectByRepr(copy_repr);
+ SPItem *copy_item = (SPItem *) sp_desktop_document(_desktop)->getObjectByRepr(copy_repr);
NR::Matrix const *new_affine;
if (_show == SHOW_OUTLINE) {
Inkscape::GC::release(copy_repr);
l = l->next;
}
- sp_document_done(SP_DT_DOCUMENT(_desktop));
+ sp_document_done(sp_desktop_document(_desktop));
}
}
void Inkscape::SelTrans::_updateVolatileState()
{
- Inkscape::Selection *selection = SP_DT_SELECTION(_desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(_desktop);
_empty = selection->isEmpty();
if (_empty) {
@@ -602,7 +602,7 @@ void Inkscape::SelTrans::handleClick(SPKnot *knot, guint state, SPSelTransHandle
it->unsetCenter();
SP_OBJECT(it)->updateRepr();
}
- sp_document_maybe_done (SP_DT_DOCUMENT(_desktop), "center::unset");
+ sp_document_maybe_done (sp_desktop_document(_desktop), "center::unset");
}
break;
default:
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index e078013aa6ecd6cbb6adbc989e81b08d4e5218bb..a161239017fa0e70218c1132294933558b5a8cff 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
void SPFlowtext::convert_to_text()
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPItem *item = selection->singleItem();
if (!SP_IS_FLOWTEXT(item)) return;
Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent();
parent->appendChild(repr);
- SPItem *new_item = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
+ SPItem *new_item = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
sp_item_write_transform(new_item, repr, item->transform);
SP_OBJECT(new_item)->updateRepr();
selection->set(new_item);
item->deleteObject();
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
SPItem *SPFlowtext::get_frame(SPItem *after)
SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p0, NR::Point p1)
{
- SPDocument *doc = SP_DT_DOCUMENT (desktop);
+ SPDocument *doc = sp_desktop_document (desktop);
Inkscape::XML::Node *root_repr = sp_repr_new("svg:flowRoot");
root_repr->setAttribute("xml:space", "preserve"); // we preserve spaces in the text objects we create
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 4dfdb1b282945fea93f2dd213e0a750c3191d87e..39590f8261786f4e6457c9253324e8819e0bd850 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -571,7 +571,7 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil
sp_guide_show(g, static_cast<SPDesktop*>(l->data)->guides, (GCallback) sp_dt_guide_event);
if (static_cast<SPDesktop*>(l->data)->guides_active)
sp_guide_sensitize(g,
- SP_DT_CANVAS(static_cast<SPDesktop*> (l->data)),
+ sp_desktop_canvas(static_cast<SPDesktop*> (l->data)),
TRUE);
if (nv->showguides) {
for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) {
for (GSList *l = guides; l != NULL; l = l->next) {
sp_guide_show(SP_GUIDE(l->data), desktop->guides, (GCallback) sp_dt_guide_event);
if (desktop->guides_active) {
- sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(desktop), TRUE);
+ sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(desktop), TRUE);
}
if (showguides) {
for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) {
views = g_slist_prepend(views, desktop);
- SPCanvasItem *item = sp_canvas_item_new(SP_DT_GRID(desktop), SP_TYPE_CGRID, NULL);
+ SPCanvasItem *item = sp_canvas_item_new(sp_desktop_grid(desktop), SP_TYPE_CGRID, NULL);
// since we're keeping a copy, we need to bump up the ref count
gtk_object_ref(GTK_OBJECT(item));
gridviews = g_slist_prepend(gridviews, item);
&& nv->cx != HUGE_VAL && !isNaN(nv->cx)
&& nv->cy != HUGE_VAL && !isNaN(nv->cy)) {
desktop->zoom_absolute(nv->cx, nv->cy, nv->zoom);
- } else if (SP_DT_DOCUMENT(desktop)) { // document without saved zoom, zoom to its page
+ } else if (sp_desktop_document(desktop)) { // document without saved zoom, zoom to its page
desktop->zoom_page();
}
NR::Rect const r = desktop->get_display_area();
// saving window geometry is not undoable
- gboolean saved = sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop));
- sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), FALSE);
+ gboolean saved = sp_document_get_undo_sensitive(sp_desktop_document(desktop));
+ sp_document_set_undo_sensitive(sp_desktop_document(desktop), FALSE);
sp_repr_set_svg_double(view, "inkscape:zoom", desktop->current_zoom());
sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[NR::X]);
view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer()));
// restore undoability
- sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), saved);
+ sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved);
}
void SPNamedView::hide(SPDesktop const *desktop)
g_assert(g_slist_find(views, desktop));
for (GSList *l = guides; l != NULL; l = l->next) {
- sp_guide_hide(SP_GUIDE(l->data), SP_DT_CANVAS(desktop));
+ sp_guide_hide(SP_GUIDE(l->data), sp_desktop_canvas(desktop));
}
views = g_slist_remove(views, desktop);
GSList *l;
for (l = gridviews; l != NULL; l = l->next) {
- if (SP_CANVAS_ITEM(l->data)->canvas == SP_DT_CANVAS(desktop)) {
+ if (SP_CANVAS_ITEM(l->data)->canvas == sp_desktop_canvas(desktop)) {
break;
}
}
SPDesktop *dt = static_cast<SPDesktop*>(desktop);
for (GSList *l = guides; l != NULL; l = l->next) {
- sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(dt), active);
+ sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(dt), active);
}
}
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index c1c4acae405cf64362c6bc6d3b4444c6477fec87..f9be549444d5986d804031f806a9f45edcf9c85a 100644 (file)
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
n = g_strdup(_("<no name found>"));
}
- GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->getDefaultMetric());
+ GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, sp_desktop_namedview(SP_ACTIVE_DESKTOP)->getDefaultMetric());
char *ret = ( SP_IS_TEXT_TEXTPATH(item)
? g_strdup_printf(_("<b>Text on path</b> (%s, %s)"), n, xs->str)
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index ea0ba9b64d6a620849904c4c63419af61b8ecd4c..b05926b02a3a5e5050efd47af753881a704a7237 100644 (file)
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
sp_event_context_read(ec, "revolution");
sp_event_context_read(ec, "t0");
- Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
SPItem *item = selection->singleItem();
if (item) {
static gboolean dragging;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPSpiralContext *sc = SP_SPIRAL_CONTEXT(event_context);
event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
}
break;
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
default:
break;
sp_shape_set_shape(SP_SHAPE(spiral));
SP_OBJECT(spiral)->updateRepr(NULL, SP_OBJECT_WRITE_EXT);
- SP_DT_SELECTION(desktop)->set(sc->item);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_desktop_selection(desktop)->set(sc->item);
+ sp_document_done(sp_desktop_document(desktop));
sc->item = NULL;
}
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 065533f71395a5be9635ad8c43bce94f66b638d6..0d43373d2bcb1d3e87a1e2e5427b810f4e39b0a8 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList *il = (GSList *) selection->itemList();
{
SP_OBJECT(l->data)->deleteObject();
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->clear();
delete res;
g_slist_free(il);
// premultiply by the inverse of parent's repr
- SPItem *parent_item = SP_ITEM(SP_DT_DOCUMENT(desktop)->getObjectByRepr(parent));
+ SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent));
NR::Matrix local = sp_item_i2doc_affine(parent_item);
gchar affinestr[80];
gchar *transform = NULL;
Inkscape::GC::release(repr);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
delete res;
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
// TRANSLATORS: "to outline" means "to convert stroke to path"
repr->setAttribute("id", id);
- SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
+ SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
sp_item_write_transform(newitem, repr, transform);
selection->add(repr);
}
if (did) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
// TRANSLATORS: "to outline" means "to convert stroke to path"
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No stroked paths</b> to outline in the selection."));
desktop = SP_ACTIVE_DESKTOP;
- selection = SP_DT_SELECTION(desktop);
+ selection = sp_desktop_selection(desktop);
item = selection->singleItem();
{
// pas vraiment de points sur le resultat
// donc il ne reste rien
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
selection->clear();
delete res;
// move to the saved position
repr->setPosition(pos > 0 ? pos : 0);
- SPItem *nitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
+ SPItem *nitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
if ( updating ) {
// on conserve l'original
selection->set(nitem);
}
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
delete res;
delete orig;
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>path(s)</b> to inset/outset."));
// move to the saved position
repr->setPosition(pos > 0 ? pos : 0);
- SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
+ SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
// reapply the transform
sp_item_write_transform(newitem, repr, transform);
}
if (did) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to inset/outset in the selection."));
return;
@@ -1353,7 +1353,7 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio
// move to the saved position
repr->setPosition(pos > 0 ? pos : 0);
- SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
+ SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
// reapply the transform
sp_item_write_transform(newitem, repr, transform);
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE,
if (didSomething)
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
else
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No paths</b> to simplify in the selection."));
diff --git a/src/star-context.cpp b/src/star-context.cpp
index 9d5d16684f7cfea8dc0deec0bc33f629a959932a..6e10a03fad6e8af044f9d7efa0931d47225961f0 100644 (file)
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
sp_event_context_read (ec, "rounded");
sp_event_context_read (ec, "randomized");
- Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
SPItem *item = selection->singleItem();
if (item) {
@@ -259,7 +259,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
static gboolean dragging;
SPDesktop *desktop = event_context->desktop;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
SPStarContext *sc = SP_STAR_CONTEXT (event_context);
@@ -358,7 +358,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent
}
break;
case GDK_Escape:
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
default:
break;
object->updateRepr(NULL, SP_OBJECT_WRITE_EXT);
- SP_DT_SELECTION(desktop)->set(sc->item);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_desktop_selection(desktop)->set(sc->item);
+ sp_document_done(sp_desktop_document(desktop));
sc->item = NULL;
}
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index 549db62282d5354dfde6bd44e92f59e09d3f2c40..21c74d1a77e238b0c94cb46f60279441fa265975 100644 (file)
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
if (!desktop)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPItem *text = text_or_flowtext_in_selection(selection);
SPItem *shape = shape_in_selection(selection);
if (!text || !shape || g_slist_length((GSList *) selection->itemList()) != 2) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text and a path</b> to put text on path."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text and a path</b> to put text on path."));
return;
}
if (SP_IS_TEXT_TEXTPATH(text)) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("This text object is <b>already put on a path</b>. Remove it from the path first. Use <b>Shift+D</b> to look up its path."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("This text object is <b>already put on a path</b>. Remove it from the path first. Use <b>Shift+D</b> to look up its path."));
return;
}
if (SP_IS_FLOWTEXT(text)) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put flowtext on a path. Convert flowtext to text first."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put flowtext on a path. Convert flowtext to text first."));
return;
}
if (SP_IS_RECT(shape)) {
// rect is the only SPShape which is not <path> yet, and thus SVG forbids us from putting text on it
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put text on a rectangle in this version. Convert rectangle to path first."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put text on a rectangle in this version. Convert rectangle to path first."));
return;
}
SP_OBJECT_REPR(text)->setAttribute("x", NULL);
SP_OBJECT_REPR(text)->setAttribute("y", NULL);
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
g_slist_free(text_reprs);
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text on path</b> to remove it from path."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text on path</b> to remove it from path."));
return;
}
}
if (!did) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No texts-on-paths</b> in the selection."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("<b>No texts-on-paths</b> in the selection."));
} else {
selection->setList(g_slist_copy((GSList *) selection->itemList())); // reselect to update statusbar description
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
}
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>text(s)</b> to remove kerns from."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>text(s)</b> to remove kerns from."));
return;
}
}
if (!did) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("Select <b>text(s)</b> to remove kerns from."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("Select <b>text(s)</b> to remove kerns from."));
} else {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
}
if (!desktop)
return;
- SPDocument *doc = SP_DT_DOCUMENT (desktop);
+ SPDocument *doc = sp_desktop_document (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPItem *text = text_in_selection(selection);
SPItem *shape = shape_in_selection(selection);
if (!text || !shape || g_slist_length((GSList *) selection->itemList()) < 2) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text</b> and one or more <b>paths or shapes</b> to flow text into frame."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a text</b> and one or more <b>paths or shapes</b> to flow text into frame."));
return;
}
sp_document_done(doc);
- SP_DT_SELECTION(desktop)->set(SP_ITEM(root_object));
+ sp_desktop_selection(desktop)->set(SP_ITEM(root_object));
Inkscape::GC::release(root_repr);
Inkscape::GC::release(region_repr);
if (!desktop)
return;
- SPDocument *doc = SP_DT_DOCUMENT (desktop);
+ SPDocument *doc = sp_desktop_document (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (!flowtext_in_selection(selection) || g_slist_length((GSList *) selection->itemList()) < 1) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a flowed text</b> to unflow it."));
+ sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>a flowed text</b> to unflow it."));
return;
}
diff --git a/src/text-context.cpp b/src/text-context.cpp
index 615e02d48478673e3a08f42617b36e9f8fb6194f..d5eaf6228a43aeb2cee9172d456385003958385d 100644 (file)
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
SPTextContext *tc = SP_TEXT_CONTEXT(ec);
SPDesktop *desktop = ec->desktop;
- tc->cursor = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLLINE, NULL);
+ tc->cursor = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL);
sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), 100, 0, 100, 100);
sp_ctrlline_set_rgba32(SP_CTRLLINE(tc->cursor), 0x000000ff);
sp_canvas_item_hide(tc->cursor);
- tc->indicator = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLRECT, NULL);
+ tc->indicator = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLRECT, NULL);
SP_CTRLRECT(tc->indicator)->setRectangle(NR::Rect(NR::Point(0, 0), NR::Point(100, 100)));
SP_CTRLRECT(tc->indicator)->setColor(0x0000ff7f, false, 0);
sp_canvas_item_hide(tc->indicator);
- tc->frame = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLRECT, NULL);
+ tc->frame = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLRECT, NULL);
SP_CTRLRECT(tc->frame)->setRectangle(NR::Rect(NR::Point(0, 0), NR::Point(100, 100)));
SP_CTRLRECT(tc->frame)->setColor(0x0000ff7f, false, 0);
sp_canvas_item_hide(tc->frame);
tc->imc = gtk_im_multicontext_new();
if (tc->imc) {
- GtkWidget *canvas = GTK_WIDGET(SP_DT_CANVAS(desktop));
+ GtkWidget *canvas = GTK_WIDGET(sp_desktop_canvas(desktop));
/* im preedit handling is very broken in inkscape for
* multi-byte characters. See bug 1086769.
if (((SPEventContextClass *) parent_class)->setup)
((SPEventContextClass *) parent_class)->setup(ec);
- SPItem *item = SP_DT_SELECTION(ec->desktop)->singleItem();
+ SPItem *item = sp_desktop_selection(ec->desktop)->singleItem();
if (item && SP_IS_FLOWTEXT (item) && SP_FLOWTEXT(item)->has_internal_frame()) {
ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop);
Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(SP_FLOWTEXT(item)->get_frame(NULL));
}
}
- tc->sel_changed_connection = SP_DT_SELECTION(desktop)->connectChanged(
+ tc->sel_changed_connection = sp_desktop_selection(desktop)->connectChanged(
sigc::bind(sigc::ptr_fun(&sp_text_context_selection_changed), tc)
);
- tc->sel_modified_connection = SP_DT_SELECTION(desktop)->connectModified(
+ tc->sel_modified_connection = sp_desktop_selection(desktop)->connectModified(
sigc::bind(sigc::ptr_fun(&sp_text_context_selection_modified), tc)
);
tc->style_set_connection = desktop->connectSetStyle(
sigc::bind(sigc::ptr_fun(&sp_text_context_style_query), tc)
);
- sp_text_context_selection_changed(SP_DT_SELECTION(desktop), tc);
+ sp_text_context_selection_changed(sp_desktop_selection(desktop), tc);
if (prefs_get_int_attribute("tools.text", "selcue", 0) != 0) {
ec->enableSelectionCue();
tc->text_selection_quads.clear();
if (ec->desktop) {
- sp_signal_disconnect_by_data(SP_DT_CANVAS(ec->desktop), tc);
+ sp_signal_disconnect_by_data(sp_desktop_canvas(ec->desktop), tc);
}
}
// find out clicked item, disregarding groups
item_ungrouped = desktop->item_at_point(NR::Point(event->button.x, event->button.y), TRUE);
if (SP_IS_TEXT(item_ungrouped) || SP_IS_FLOWTEXT(item_ungrouped)) {
- SP_DT_SELECTION(ec->desktop)->set(item_ungrouped);
+ sp_desktop_selection(ec->desktop)->set(item_ungrouped);
if (tc->text) {
// find out click point in document coordinates
NR::Point p = ec->desktop->w2d(NR::Point(event->button.x, event->button.y));
SPItem *text_item = SP_ITEM(ec->desktop->currentLayer()->appendChildRepr(rtext));
/* fixme: Is selection::changed really immediate? */
/* yes, it's immediate .. why does it matter? */
- SP_DT_SELECTION(ec->desktop)->set(text_item);
+ sp_desktop_selection(ec->desktop)->set(text_item);
Inkscape::GC::release(rtext);
text_item->transform = SP_ITEM(ec->desktop->currentRoot())->getRelativeTransform(ec->desktop->currentLayer());
text_item->updateRepr();
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
}
/**
tc->text_sel_start = tc->text_sel_end = sp_te_replace(tc->text, tc->text_sel_start, tc->text_sel_end, u);
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_done(SP_DT_DOCUMENT(tc->desktop));
+ sp_document_done(sp_desktop_document(tc->desktop));
}
}
if (tc->creating && ec->within_tolerance) {
/* Button 1, set X & Y & new item */
- SP_DT_SELECTION(desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
NR::Point dtp = ec->desktop->w2d(NR::Point(event->button.x, event->button.y));
tc->pdoc = sp_desktop_dt2root_xy_point(ec->desktop, dtp);
if (fabs(p1[NR::Y] - tc->p0[NR::Y]) > cursor_height) {
// otherwise even one line won't fit; most probably a slip of hand (even if bigger than tolerance)
SPItem *ft = create_flowtext_with_internal_frame (desktop, tc->p0, p1);
- SP_DT_SELECTION(desktop)->set(ft);
+ sp_desktop_selection(desktop)->set(ft);
ec->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Flowed text is created."));
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
} else {
ec->desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("The frame is <b>too small</b> for the current font size. Flowed text not created."));
}
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
ec->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("No-break space"));
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
return TRUE;
}
break;
sp_repr_css_set_property(css, "font-weight", "normal");
sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css);
sp_repr_css_attr_unref(css);
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
return TRUE;
sp_repr_css_set_property(css, "font-style", "normal");
sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css);
sp_repr_css_attr_unref(css);
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
return TRUE;
tc->text_sel_start = tc->text_sel_end = sp_te_insert_line(tc->text, tc->text_sel_start);
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
return TRUE;
case GDK_BackSpace:
if (tc->text) { // if nascent_object, do nothing, but return TRUE; same for all other delete and move keys
tc->text_sel_start = tc->text_sel_end = sp_te_delete(tc->text, tc->text_sel_start, tc->text_sel_end);
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
}
return TRUE;
case GDK_Delete:
tc->text_sel_start = tc->text_sel_end = sp_te_delete(tc->text, tc->text_sel_start, tc->text_sel_end);
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
}
return TRUE;
case GDK_Left:
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(-1, 0));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:left");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:left");
} else {
cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorLeftWithControl
: &Inkscape::Text::Layout::iterator::cursorLeft;
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(1, 0));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:right");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:right");
} else {
cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorRightWithControl
: &Inkscape::Text::Layout::iterator::cursorRight;
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(0, -1));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:up");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:up");
} else {
cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorUpWithControl
: &Inkscape::Text::Layout::iterator::cursorUp;
sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(0, 1));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:down");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:down");
} else {
cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorDownWithControl
: &Inkscape::Text::Layout::iterator::cursorDown;
}
Inkscape::Rubberband::get()->stop();
} else {
- SP_DT_SELECTION(ec->desktop)->clear();
+ sp_desktop_selection(ec->desktop)->clear();
}
tc->nascent_object = FALSE;
return TRUE;
} else {
sp_te_adjust_rotation(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -90);
}
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "textrot:ccw");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "textrot:ccw");
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
return TRUE;
} else {
sp_te_adjust_rotation(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 90);
}
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "textrot:cw");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "textrot:cw");
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
return TRUE;
@@ -1081,13 +1081,13 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event)
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -10);
else
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -1);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "linespacing:dec");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "linespacing:dec");
} else {
if (MOD__SHIFT)
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -10);
else
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -1);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "letterspacing:dec");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "letterspacing:dec");
}
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
@@ -1104,13 +1104,13 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event)
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 10);
else
sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 1);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "linespacing:inc");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "linespacing:inc");
} else {
if (MOD__SHIFT)
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 10);
else
sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 1);
- sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "letterspacing:inc");
+ sp_document_maybe_done(sp_desktop_document(ec->desktop), "letterspacing:inc");
}
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
tc->text_sel_start = tc->text_sel_end = sp_te_insert_line(tc->text, tc->text_sel_start);
begin = end + 1;
}
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ sp_document_done(sp_desktop_document(ec->desktop));
return true;
}
return false; // will get picked up by the parent and applied to the whole text object
sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css);
- sp_document_done(SP_DT_DOCUMENT(tc->desktop));
+ sp_document_done(sp_desktop_document(tc->desktop));
sp_text_context_update_cursor(tc);
sp_text_context_update_text_selection(tc);
quads = sp_te_create_selection_quads(tc->text, tc->text_sel_start, tc->text_sel_end, sp_item_i2d_affine(tc->text));
for (unsigned i = 0 ; i < quads.size() ; i += 4) {
SPCanvasItem *quad_canvasitem;
- quad_canvasitem = sp_canvas_item_new(SP_DT_CONTROLS(tc->desktop), SP_TYPE_CTRLQUADR, NULL);
+ quad_canvasitem = sp_canvas_item_new(sp_desktop_controls(tc->desktop), SP_TYPE_CTRLQUADR, NULL);
sp_ctrlquadr_set_rgba32(SP_CTRLQUADR(quad_canvasitem), 0x000000ff);
sp_ctrlquadr_set_coords(SP_CTRLQUADR(quad_canvasitem), quads[i], quads[i+1], quads[i+2], quads[i+3]);
sp_canvas_item_show(quad_canvasitem);
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 0a2b2b3c8a1f552b986d34d05a9ed14041d903bc..d42354e8dae86083fc4e7cca0ebeafe84a02c1b2 100644 (file)
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
dt->set_event_context(SP_TYPE_SELECT_CONTEXT, tool_names[num]);
/* fixme: This is really ugly hack. We should bind and unbind class methods */
dt->activate_guides(true);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
break;
case TOOLS_NODES:
dt->set_event_context(SP_TYPE_NODE_CONTEXT, tool_names[num]);
dt->activate_guides(true);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To edit a path, <b>click</b>, <b>Shift+click</b>, or <b>drag around</b> nodes to select them, then <b>drag</b> nodes and handles. <b>Click</b> on an object to select."));
break;
case TOOLS_SHAPES_RECT:
dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a rectangle. <b>Drag controls</b> to round corners and resize. <b>Click</b> to select."));
break;
case TOOLS_SHAPES_ARC:
dt->set_event_context(SP_TYPE_ARC_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or segment. <b>Click</b> to select."));
break;
case TOOLS_SHAPES_STAR:
dt->set_event_context(SP_TYPE_STAR_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a star. <b>Drag controls</b> to edit the star shape. <b>Click</b> to select."));
break;
case TOOLS_SHAPES_SPIRAL:
dt->set_event_context(SP_TYPE_SPIRAL_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a spiral. <b>Drag controls</b> to edit the spiral shape. <b>Click</b> to select."));
break;
case TOOLS_FREEHAND_PENCIL:
dt->set_event_context(SP_TYPE_PENCIL_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to create a freehand line. Start drawing with <b>Shift</b> to append to selected path."));
break;
case TOOLS_FREEHAND_PEN:
dt->set_event_context(SP_TYPE_PEN_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to start a path; with <b>Shift</b> to append to selected path."));
break;
case TOOLS_CALLIGRAPHIC:
dt->set_event_context(SP_TYPE_DYNA_DRAW_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> to paint a calligraphic stroke. <b>Left</b>/<b>right</b> arrow keys adjust width, <b>up</b>/<b>down</b> adjust angle."));
break;
case TOOLS_TEXT:
dt->set_event_context(SP_TYPE_TEXT_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> to select or create text, <b>drag</b> to create flowed text; then type."));
break;
case TOOLS_GRADIENT:
dt->set_event_context(SP_TYPE_GRADIENT_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, <b>drag handles</b> to adjust gradients."));
break;
case TOOLS_ZOOM:
dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to zoom out."));
break;
case TOOLS_DROPPER:
dt->set_event_context(SP_TYPE_DROPPER_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard"));
break;
case TOOLS_CONNECTOR:
dt->set_event_context(SP_TYPE_CONNECTOR_CONTEXT, tool_names[num]);
dt->activate_guides(false);
- inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt));
+ inkscape_eventcontext_set(sp_desktop_event_context(dt));
dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Click and drag</b> between shapes to create a connector."));
break;
}
index d8dfb77f66b50c3daf991c043f732fda0f4c5dd2..4aaf1b37694d6b53b84382ec994e3a1b32ee8254 100644 (file)
if (desktop)
{
gchar *msg = g_strdup_printf(_("Trace: %d. %ld nodes"), traceCount++, nodeCount);
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
g_free(msg);
}
}
if (desktop)
{
gchar *msg = g_strdup_printf(_("Trace: %d. %ld nodes"), colorIndex, nodeCount);
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
g_free(msg);
}
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index ea822c5364797d2e150a3d52d547453d866ce93c..81ccb64fae545a7066b1631b08a93e1980b8629f 100644 (file)
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
return NULL;
}
- Inkscape::Selection *sel = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *sel = sp_desktop_selection(desktop);
if (!sel)
{
char *msg = _("Select an <b>image</b> to trace");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
return NULL;
}
if (img) //we want only one
{
char *msg = _("Select only one <b>image</b> to trace");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
return NULL;
}
img = SP_IMAGE(item);
if (!img || sioxShapes.size() < 1)
{
char *msg = _("Select one image and one or more shapes above it");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
return NULL;
}
return img;
if (!item)
{
char *msg = _("Select an <b>image</b> to trace"); //same as above
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
return NULL;
}
if (!SP_IS_IMAGE(item))
{
char *msg = _("Select an <b>image</b> to trace");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
return NULL;
}
return NULL;
}
- Inkscape::Selection *sel = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *sel = sp_desktop_selection(desktop);
if (!sel)
{
char *msg = _("Select an <b>image</b> to trace");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
return NULL;
}
return;
}
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
if (!SP_ACTIVE_DOCUMENT)
{
char *msg = _("Trace: No active document");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
engine = NULL;
return;
if (!pixbuf)
{
char *msg = _("Trace: Image has no bitmap data");
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg);
//g_warning(msg);
engine = NULL;
return;
engine = NULL;
char *msg = g_strdup_printf(_("Trace: Done. %ld nodes created"), totalNodeCount);
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
+ sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
g_free(msg);
}
index fc8b6b2f54b9b06e5147e6c8ab0c0997a01c7705..08e1975867ce860407c6968f66cb76d7c3666ece 100644 (file)
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (!desktop) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (!selection) return;
using Inkscape::Util::GSListConstIterator;
}
case AlignAndDistribute::PAGE:
- mp = NR::Point(a.mx1 * sp_document_width(SP_DT_DOCUMENT(desktop)),
- a.my1 * sp_document_height(SP_DT_DOCUMENT(desktop)));
+ mp = NR::Point(a.mx1 * sp_document_width(sp_desktop_document(desktop)),
+ a.my1 * sp_document_height(sp_desktop_document(desktop)));
break;
case AlignAndDistribute::DRAWING:
{
NR::Rect b = sp_item_bbox_desktop
- ( (SPItem *) sp_document_root (SP_DT_DOCUMENT (desktop)) );
+ ( (SPItem *) sp_document_root (sp_desktop_document (desktop)) );
mp = NR::Point(a.mx0 * b.min()[NR::X] + a.mx1 * b.max()[NR::X],
a.my0 * b.min()[NR::Y] + a.my1 * b.max()[NR::Y]);
break;
it != selected.end();
it++)
{
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT (desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document (desktop));
NR::Rect b = sp_item_bbox_desktop (*it);
NR::Point const sp(a.sx0 * b.min()[NR::X] + a.sx1 * b.max()[NR::X],
a.sy0 * b.min()[NR::Y] + a.sy1 * b.max()[NR::Y]);
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
if (changed) {
- sp_document_done ( SP_DT_DOCUMENT (desktop) );
+ sp_document_done ( sp_desktop_document (desktop) );
}
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (!desktop) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (!selection) return;
using Inkscape::Util::GSListConstIterator;
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
if (changed) {
- sp_document_done ( SP_DT_DOCUMENT (desktop) );
+ sp_document_done ( sp_desktop_document (desktop) );
}
}
guint _index;
{
if (!SP_ACTIVE_DESKTOP) return;
- SPEventContext *event_context = SP_DT_EVENTCONTEXT(SP_ACTIVE_DESKTOP);
+ SPEventContext *event_context = sp_desktop_event_context(SP_ACTIVE_DESKTOP);
if (!SP_IS_NODE_CONTEXT (event_context)) return ;
Inkscape::NodePath::Path *nodepath = SP_NODE_CONTEXT (event_context)->nodepath;
// xGap and yGap are the minimum space required between bounding rectangles.
double const xGap = removeOverlapXGap.get_value();
double const yGap = removeOverlapYGap.get_value();
- removeoverlap(SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList(),
+ removeoverlap(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList(),
xGap, yGap);
// restore compensation setting
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
- sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
}
};
int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
- graphlayout(SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList());
+ graphlayout(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList());
// restore compensation setting
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
- sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
}
};
int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
- unclump ((GSList *) SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList());
+ unclump ((GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList());
// restore compensation setting
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
- sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
}
};
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (!desktop) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (!selection) return;
using Inkscape::Util::GSListConstIterator;
it != selected.end();
++it)
{
- sp_document_ensure_up_to_date(SP_DT_DOCUMENT (desktop));
+ sp_document_ensure_up_to_date(sp_desktop_document (desktop));
NR::Rect item_box = sp_item_bbox_desktop (*it);
// find new center, staying within bbox
double x = _dialog.randomize_bbox.min()[NR::X] + item_box.extent(NR::X)/2 +
// restore compensation setting
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
- sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
}
};
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (!desktop) return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (!selection) return;
using Inkscape::Util::GSListConstIterator;
}
if (changed) {
- sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
}
}
};
void on_tool_changed(Inkscape::Application *inkscape, SPEventContext *context, AlignAndDistribute *daad)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- if (desktop && SP_DT_EVENTCONTEXT(desktop))
+ if (desktop && sp_desktop_event_context(desktop))
daad->setMode(tools_active(desktop) == TOOLS_NODES);
}
index 7cb360a43c24297a3f41f54dc36bcc4772228f70..074ee0d36528bc93b353ccb545caf7178a98c544 100644 (file)
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
Inkscape::Selection*
Dialog::_getSelection()
{
- return SP_DT_SELECTION(SP_ACTIVE_DESKTOP);
+ return sp_desktop_selection(SP_ACTIVE_DESKTOP);
}
void
index bbe64b201d0c3ad993455697572f495e52c4de2f..090cb42ca665297ca2d63c9856b126e95a6570b5 100644 (file)
{
update();
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->addListener (&_repr_events, this);
_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
DocumentMetadata::~DocumentMetadata()
{
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->removeListenerByData (this);
_doc_replaced_connection.disconnect();
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->addListener (&_repr_events, _instance);
_instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
_instance->update();
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->removeListenerByData (_instance);
_instance->_doc_replaced_connection.disconnect();
}
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
repr->addListener (&_repr_events, _instance);
_instance->update();
}
index 8a1035eb3933748a09cc7081f714d62bb21c1203..9951f5956a9fdfc65ff331dad016908855fe4fe0 100644 (file)
{
update();
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->addListener (&_repr_events, this);
_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
DocumentProperties::~DocumentProperties()
{
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->removeListenerByData (this);
_doc_replaced_connection.disconnect();
}
if (_wr.isUpdating()) return;
SPDesktop *dt = SP_ACTIVE_DESKTOP;
- SPNamedView *nv = SP_DT_NAMEDVIEW(dt);
+ SPNamedView *nv = sp_desktop_namedview(dt);
_wr.setUpdating (true);
set_sensitive (true);
if (nv->doc_units)
_rum_deflt.setUnit (nv->doc_units);
- double const doc_w_px = sp_document_width(SP_DT_DOCUMENT(dt));
- double const doc_h_px = sp_document_height(SP_DT_DOCUMENT(dt));
+ double const doc_w_px = sp_document_width(sp_desktop_document(dt));
+ double const doc_h_px = sp_document_height(sp_desktop_document(dt));
_page_sizer.setDim (doc_w_px, doc_h_px);
//-----------------------------------------------------------grid page
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->addListener (&_repr_events, _instance);
_instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
_instance->update();
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
repr->removeListenerByData (_instance);
_instance->_doc_replaced_connection.disconnect();
}
if (!_instance)
return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
repr->addListener (&_repr_events, _instance);
_instance->update();
}
index 4dd20682ffa0eefd26ed1e59c1ff55a1b9f64b77..3ebf50eb921dcd51162b9f2202ca197aff1c7828 100644 (file)
if (desktop == NULL)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE,
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE,
_("<b>No objects selected</b> to take the style from."));
return;
}
/* TODO: If each item in the selection has the same style then don't consider it an error.
* Maybe we should try to handle multiple selections anyway, e.g. the intersection of the
* style attributes for the selected items. */
- SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE,
+ sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE,
_("<b>More than one object selected.</b> Cannot take style from multiple objects."));
return;
}
index 48c3ff5ef0f3e1b33b48b0f0e63b3337bf61031d..97ef5618e56cb0747dc71d70749fff00bf29d883 100644 (file)
switch (result) {
case Gtk::RESPONSE_OK:
this->_sm->clearDocument();
- sp_document_done(SP_DT_DOCUMENT(this->_desktop));
+ sp_document_done(sp_desktop_document(this->_desktop));
this->_sm->loadSessionFile(sessionfiledlg.get_filename());
this->_openfile.set_text(this->_sfp->filename());
break;
index 92baa7b810ee028c923508948bf40e8386b4ff0b..28710ace33e6a55de612afc16932b41e8e2cf162 100644 (file)
Transformation::onSwitchPage(GtkNotebookPage *page,
guint pagenum)
{
- updateSelection((PageType)pagenum, SP_DT_SELECTION(SP_ACTIVE_DESKTOP));
+ updateSelection((PageType)pagenum, sp_desktop_selection(SP_ACTIVE_DESKTOP));
}
void
x - bbox.min()[NR::X], y - bbox.min()[NR::Y]);
}
- sp_document_done ( SP_DT_DOCUMENT (selection->desktop()) );
+ sp_document_done ( sp_desktop_document (selection->desktop()) );
}
void
sp_selection_scale_relative(selection, center, scale);
}
- sp_document_done(SP_DT_DOCUMENT(selection->desktop()));
+ sp_document_done(sp_desktop_document(selection->desktop()));
}
void
sp_selection_rotate_relative(selection, center, angle);
}
- sp_document_done(SP_DT_DOCUMENT(selection->desktop()));
+ sp_document_done(sp_desktop_document(selection->desktop()));
}
void
}
}
- sp_document_done(SP_DT_DOCUMENT(selection->desktop()));
+ sp_document_done(sp_desktop_document(selection->desktop()));
}
sp_selection_apply_affine(selection, displayed); // post-multiply each object's transform
}
- sp_document_done(SP_DT_DOCUMENT(selection->desktop()));
+ sp_document_done(sp_desktop_document(selection->desktop()));
}
index a8cdba61e973cfb7129a8e216bd88c04cbfa5e16..883370aec00d63e0f5531794810be3d37a1ab5ff 100644 (file)
(ptr->_preview).setRgba32 (rgba);
if (ptr->_undo && SP_ACTIVE_DESKTOP)
- sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
ptr->on_changed (rgba);
ptr->_changed_signal.emit (rgba);
index 1073fa1d202645dbaba4dcc69679a16c486b1602..31390b676b38342523a8e5b6de4c2bdfd5aafd7f 100644 (file)
if (!SP_ACTIVE_DESKTOP || _wr->isUpdating())
return;
- SPDocument *doc = SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP);
+ SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
sp_document_set_width (doc, _rusw.getSU()->getValue("px"), &_px_unit);
sp_document_set_height (doc, _rush.getSU()->getValue("px"), &_px_unit);
sp_document_done (doc);
index bed44ae16645a3ae361d7a5ceb87e6098afaf705..1bfcb1f8465ead4dd15ff062e910e744bcb277c1 100644 (file)
return;
}
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
_wr->setUpdating (true);
gboolean saved = sp_document_get_undo_sensitive (doc);
_wr->setUpdating (true);
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
gboolean saved = sp_document_get_undo_sensitive (doc);
sp_document_set_undo_sensitive (doc, FALSE);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
repr->setAttribute(_key.c_str(), os.str().c_str());
doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive (doc, saved);
_wr->setUpdating (true);
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
gboolean saved = sp_document_get_undo_sensitive (doc);
sp_document_set_undo_sensitive (doc, FALSE);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
repr->setAttribute(_key.c_str(), os.str().c_str());
doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive (doc, saved);
return;
_wr->setUpdating (true);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
gchar c[32];
sp_svg_write_color(c, 32, rgba);
repr->setAttribute(_ckey.c_str(), c);
_wr->setUpdating (true);
SPDesktop* dt = SP_ACTIVE_DESKTOP;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
Inkscape::SVGOStringStream os;
int value = int(_adj.get_value());
os << value;
repr->setAttribute(_key.c_str(), os.str().c_str());
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
_wr->setUpdating (false);
}
_wr->setUpdating (true);
bool second = _rb2->get_active();
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
gboolean saved = sp_document_get_undo_sensitive (doc);
sp_document_set_undo_sensitive (doc, FALSE);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
repr->setAttribute(_key.c_str(), second ? "true" : "false");
doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive (doc, saved);
index f2a59338d5f83e2024dcb67307ea7c25d9625ec2..02a532a5a7d1e7648f1b6732166c4d47664f0c78 100644 (file)
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
sp_repr_set_svg_double(repr, "position", guide_pos_dt);
SP_OBJECT_REPR(_dt->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
- sp_document_done(SP_DT_DOCUMENT(_dt));
+ sp_document_done(sp_desktop_document(_dt));
}
_dt->set_coordinate_status(event_dt);
}
index f5b1fa08fd47970af6f6faae26f6e8571aa01d41..57a4d20d193c134386e410722dfe30167a985434 100644 (file)
_desktop = desktop;
gtk_object_set_data (GTK_OBJECT(_opacity_sb.gobj()), "dtw", _desktop->canvas);
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
selection_changed_connection = new sigc::connection (selection->connectChanged(
sigc::bind (
this )
));
- //_sw_unit = (SPUnit *) SP_DT_NAMEDVIEW(desktop)->doc_units;
+ //_sw_unit = (SPUnit *) sp_desktop_namedview(desktop)->doc_units;
}
void SelectedStyle::dragDataReceived( GtkWidget *widget,
sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c );
sp_desktop_set_style( tracker->parent->_desktop, css );
sp_repr_css_attr_unref( css );
- sp_document_done( SP_DT_DOCUMENT(tracker->parent->_desktop) );
+ sp_document_done( sp_desktop_document(tracker->parent->_desktop) );
}
}
break;
sp_repr_css_set_property (css, "fill", "none");
sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_remove() {
sp_repr_css_set_property (css, "stroke", "none");
sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_unset() {
sp_repr_css_unset_property (css, "fill");
sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_unset() {
sp_repr_css_unset_property (css, "stroke");
sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_opaque() {
sp_repr_css_set_property (css, "fill-opacity", "1");
sp_desktop_set_style (_desktop, css, true);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_opaque() {
sp_repr_css_set_property (css, "stroke-opacity", "1");
sp_desktop_set_style (_desktop, css, true);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_lastused() {
sp_repr_css_set_property (css, "fill", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_lastused() {
sp_repr_css_set_property (css, "stroke", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_lastselected() {
sp_repr_css_set_property (css, "fill", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_lastselected() {
sp_repr_css_set_property (css, "stroke", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_invert() {
sp_repr_css_set_property (css, "fill", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_invert() {
sp_repr_css_set_property (css, "stroke", c);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_white() {
sp_repr_css_set_property (css, "fill-opacity", "1");
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_white() {
sp_repr_css_set_property (css, "stroke-opacity", "1");
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_black() {
sp_repr_css_set_property (css, "fill-opacity", "1.0");
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_stroke_black() {
sp_repr_css_set_property (css, "stroke-opacity", "1.0");
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_copy() {
sp_repr_css_set_property (css, "fill", text.c_str());
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
}
sp_repr_css_set_property (css, "stroke", text.c_str());
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
}
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void SelectedStyle::on_fill_edit() {
sp_repr_css_set_property (css, "opacity", opacity);
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT (_desktop));
+ sp_document_done (sp_desktop_document (_desktop));
return true;
}
sp_repr_css_set_property (css, "stroke-width", os.str().c_str());
sp_desktop_set_style (_desktop, css, true);
sp_repr_css_attr_unref (css);
- sp_document_done (SP_DT_DOCUMENT(_desktop));
+ sp_document_done (sp_desktop_document(_desktop));
}
void
sp_repr_css_set_property (css, "opacity", os.str().c_str());
sp_desktop_set_style (_desktop, css);
sp_repr_css_attr_unref (css);
- sp_document_maybe_done (SP_DT_DOCUMENT (_desktop), "fillstroke:opacity");
+ sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity");
spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj()));
_opacity_blocked = false;
}
index 25d332c592634fb38d3148474b7036236554f7f2..654936814ec61f824e465b7ee7652a993c49c023 100644 (file)
_wr->setUpdating (true);
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
gboolean saved = sp_document_get_undo_sensitive (doc);
sp_document_set_undo_sensitive (doc, FALSE);
- Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
repr->setAttribute(_key.c_str(), os.str().c_str());
doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive (doc, saved);
diff --git a/src/verbs.cpp b/src/verbs.cpp
index d9f89b98a6a474a83b2e365e6d56854f4350dae1..29cf9a7497240a461a07b883e3a2ab5bdc8fd7a2 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_EDIT_UNDO:
- sp_undo(dt, SP_DT_DOCUMENT(dt));
+ sp_undo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_REDO:
- sp_redo(dt, SP_DT_DOCUMENT(dt));
+ sp_redo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_CUT:
sp_selection_cut();
if (tools_isactive(dt, TOOLS_NODES)) {
sp_nodepath_deselect(SP_NODE_CONTEXT(ec)->nodepath);
} else {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
}
break;
default:
SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer());
if (next) {
dt->setCurrentLayer(next);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer."));
SPObject *prev=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer());
if (prev) {
dt->setCurrentLayer(prev);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer."));
message = g_strdup_printf(_("Lowered layer <b>%s</b>."), layer->defaultLabel());
break;
};
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
if (message) {
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message);
g_free((void *) message);
}
case SP_VERB_LAYER_DELETE: {
if ( dt->currentLayer() != dt->currentRoot() ) {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
SPObject *old_layer=dt->currentLayer();
sp_object_ref(old_layer, NULL);
dt->setCurrentLayer(survivor);
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
// TRANSLATORS: this means "The layer has been deleted."
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Deleted layer."));
SPEventContext *ec = dt->event_context;
- Inkscape::Selection *sel = SP_DT_SELECTION(dt);
+ Inkscape::Selection *sel = sp_desktop_selection(dt);
if (sel->isEmpty())
return;
} else {
sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
break;
case SP_VERB_OBJECT_FLIP_VERTICAL:
if (tools_isactive(dt, TOOLS_NODES)) {
} else {
sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
break;
case SP_VERB_OBJECT_SET_MASK:
sp_selection_set_mask(false, false);
if (!dt)
return;
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
index c8fc58e5121e52217c1dc6ddbecae7c394ff088e..2ba59b10c611355c8b0db8c1e016527400cc60cd 100644 (file)
gr = sp_gradient_ensure_vector_normalized(gr);
SPDesktop *desktop = (SPDesktop *) data;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
- SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ SPEventContext *ev = sp_desktop_event_context (desktop);
gr_apply_gradient (selection, ev? ev->get_drag() : NULL, gr);
- sp_document_done (SP_DT_DOCUMENT (desktop));
+ sp_document_done (sp_desktop_document (desktop));
}
gchar *
GtkWidget *
gr_vector_list (SPDesktop *desktop, bool selection_empty, SPGradient *gr_selected, bool gr_multi)
{
- SPDocument *document = SP_DT_DOCUMENT (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
GtkWidget *om = gtk_option_menu_new ();
GtkWidget *m = gtk_menu_new ();
if (!desktop)
return;
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop); // take from desktop, not from args
+ Inkscape::Selection *selection = sp_desktop_selection (desktop); // take from desktop, not from args
if (!selection)
return;
- SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop);
+ SPEventContext *ev = sp_desktop_event_context (desktop);
GtkWidget *om = (GtkWidget *) g_object_get_data (G_OBJECT (widget), "menu");
if (om) gtk_widget_destroy (om);
gr_fork (GtkWidget *button, GtkWidget *widget)
{
SPDesktop *desktop = (SPDesktop *) g_object_get_data (G_OBJECT(widget), "desktop");
- SPDocument *document = SP_DT_DOCUMENT (desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
- SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ SPEventContext *ev = sp_desktop_event_context (desktop);
GtkWidget *om = (GtkWidget *) g_object_get_data (G_OBJECT(widget), "menu");
if (om && document) {
GtkWidget *
gr_change_widget (SPDesktop *desktop)
{
- Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
- SPDocument *document = SP_DT_DOCUMENT (desktop);
- SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop);
+ Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ SPDocument *document = sp_desktop_document (desktop);
+ SPEventContext *ev = sp_desktop_event_context (desktop);
SPGradient *gr_selected = NULL;
bool gr_multi = false;
index e0c8286b09b8fe53d4ee8b0ca75d42fe9498db37..8fe0c928e73da187c9a086efe4eab5be704bfa98 100644 (file)
_layer_changed_connection.block();
_desktop->setCurrentLayer(layer);
_layer_changed_connection.unblock();
- SP_DT_SELECTION(_desktop)->clear();
+ sp_desktop_selection(_desktop)->clear();
_selectLayer(_desktop->currentLayer());
}
}
void LayerSelector::_lockLayer(bool lock) {
if ( _layer && SP_IS_ITEM(_layer) ) {
SP_ITEM(_layer)->setLocked(lock);
- sp_document_maybe_done(SP_DT_DOCUMENT(_desktop), "LayerSelector:lock");
+ sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:lock");
}
}
void LayerSelector::_hideLayer(bool hide) {
if ( _layer && SP_IS_ITEM(_layer) ) {
SP_ITEM(_layer)->setHidden(hide);
- sp_document_maybe_done(SP_DT_DOCUMENT(_desktop), "LayerSelector:hide");
+ sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:hide");
}
}
index f980d37fffadc0797d767d99603c889568ccdab5..6bcb24d2d34459934725b73d8dd41630a6266c4a 100644 (file)
sp_selection_layout_widget_modify_selection(SPWidget *spw, Inkscape::Selection *selection, guint flags, gpointer data)
{
SPDesktop *desktop = (SPDesktop *) data;
- if ((SP_DT_SELECTION(desktop) == selection) // only respond to changes in our desktop
+ if ((sp_desktop_selection(desktop) == selection) // only respond to changes in our desktop
&& (flags & (SP_OBJECT_MODIFIED_FLAG |
SP_OBJECT_PARENT_MODIFIED_FLAG |
SP_OBJECT_CHILD_MODIFIED_FLAG )))
sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection *selection, gpointer data)
{
SPDesktop *desktop = (SPDesktop *) data;
- if (SP_DT_SELECTION(desktop) == selection) // only respond to changes in our desktop
+ if (sp_desktop_selection(desktop) == selection) // only respond to changes in our desktop
sp_selection_layout_widget_update(spw, selection);
}
gtk_object_set_data(GTK_OBJECT(spw), "update", GINT_TO_POINTER(TRUE));
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
sp_document_ensure_up_to_date (document);
NR::Rect bbox = selection->bounds();
return FALSE;
}
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty())
return FALSE;
GtkWidget *spw = sp_widget_new_global(INKSCAPE);
// Remember the desktop's canvas widget, to be used for defocusing.
- gtk_object_set_data(GTK_OBJECT(spw), "dtw", SP_DT_CANVAS(desktop));
+ gtk_object_set_data(GTK_OBJECT(spw), "dtw", sp_desktop_canvas(desktop));
// The vb frame holds all other widgets and is used to set sensitivity depending on selection state.
GtkWidget *vb = gtk_hbox_new(FALSE, 0);
GtkWidget *us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
sp_unit_selector_setsize(us, AUX_OPTION_MENU_WIDTH, AUX_OPTION_MENU_HEIGHT);
sp_unit_selector_add_unit(SP_UNIT_SELECTOR(us), &sp_unit_get_by_id(SP_UNIT_PERCENT), 0);
- sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units);
+ sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units);
g_signal_connect(G_OBJECT(us), "set_unit", G_CALLBACK(aux_set_unit), spw);
// four spinbuttons
gtk_signal_connect(GTK_OBJECT(spw), "change_selection", GTK_SIGNAL_FUNC(sp_selection_layout_widget_change_selection), desktop);
// Update now.
- sp_selection_layout_widget_update(SP_WIDGET(spw), SP_ACTIVE_DESKTOP ? SP_DT_SELECTION(SP_ACTIVE_DESKTOP) : NULL);
+ sp_selection_layout_widget_update(SP_WIDGET(spw), SP_ACTIVE_DESKTOP ? sp_desktop_selection(SP_ACTIVE_DESKTOP) : NULL);
// Insert spw into the toolbar.
gtk_box_pack_start(GTK_BOX(tb), spw, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
index 0d8878436117273d2fc3e730f507d322499f6888..ffec0b7232016e66be076b605d514ba257c2b024 100644 (file)
text->repr->setContent(data);
g_free (data);
text->blocked = FALSE;
- sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
}
}
index cf3094375df540afe1cb86c353a63856c6cc96ef..1f9c2e504b5f6352659427e600d53cd61179e589 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
// do not remember prefs if this call is initiated by an undo change, because undoing object
// creation sets bogus values to its attributes before it is deleted
prefs_set_int_attribute("tools.shapes.star", "magnitude", (gint)adj->value);
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "proportion", adj->value);
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
prefs_set_string_attribute("tools.shapes.star", "isflatsided", "true");
} else {
// in turn, prevent listener from responding
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
GtkWidget *prop_widget = (GtkWidget*) g_object_get_data(G_OBJECT(tbl), "prop_widget");
bool modmade = false;
}
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "rounded", (gdouble) adj->value);
}
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "randomized", (gdouble) adj->value);
}
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
@@ -1283,7 +1283,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
GtkWidget *us = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(tbl), "units");
SPUnit const *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(us));
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.rect", value_name, sp_units_get_pixels(adj->value, *unit));
}
@@ -1296,7 +1296,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
for (GSList const *items = selection->itemList(); items != NULL; items = items->next) {
if (SP_IS_RECT(items->data)) {
if (adj->value != 0) {
@@ -1311,7 +1311,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
sp_rtb_sensitivize (tbl);
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
@@ -1591,7 +1591,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.spiral", value_name, adj->value);
}
@@ -1606,7 +1606,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL);
bool modmade = false;
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
@@ -1621,7 +1621,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
g_free(namespaced_name);
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
@@ -2102,7 +2102,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.arc", value_name, (adj->value * M_PI)/ 180);
}
@@ -2117,7 +2117,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL);
bool modmade = false;
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
@@ -2148,7 +2148,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
sp_arctb_sensitivize (tbl, adj->value, other->value);
if (modmade) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), value_name);
+ sp_document_maybe_done(sp_desktop_document(desktop), value_name);
}
// defocus spinbuttons by moving focus to the canvas, unless "stay" is on
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
prefs_set_string_attribute("tools.shapes.arc", "open", "true");
} else {
bool modmade = false;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
}
}
} else {
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
}
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
}
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl),
"desktop");
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
if (!sp_document_get_undo_sensitive(doc))
{