diff --git a/src/interface.cpp b/src/interface.cpp
index 348e71821acf13b4c6ee2fbf80526a000b460ff7..83f4ac3c8ffdc6708a4deb26e44a06be23fcebd0 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
void
sp_create_window(SPViewWidget *vw, gboolean editable)
{
void
sp_create_window(SPViewWidget *vw, gboolean editable)
{
- GtkWidget *w, *hb;
-
g_return_if_fail(vw != NULL);
g_return_if_fail(SP_IS_VIEW_WIDGET(vw));
g_return_if_fail(vw != NULL);
g_return_if_fail(SP_IS_VIEW_WIDGET(vw));
- w = sp_window_new("", TRUE);
+ GtkWidget *w = sp_window_new("", TRUE);
if (editable) {
g_object_set_data(G_OBJECT(vw), "window", w);
if (editable) {
g_object_set_data(G_OBJECT(vw), "window", w);
static_cast<GtkWindow*>((void*)w);
}
static_cast<GtkWindow*>((void*)w);
}
- hb = gtk_hbox_new(FALSE, 0);
- gtk_widget_show(hb);
- gtk_container_add(GTK_CONTAINER(w), hb);
- g_object_set_data(G_OBJECT(w), "hbox", hb);
-
- /* fixme: */
if (editable) {
if (editable) {
+ /* fixme: */
gtk_window_set_default_size((GtkWindow *) w, 640, 480);
g_object_set_data(G_OBJECT(w), "desktop", SP_DESKTOP_WIDGET(vw)->desktop);
g_object_set_data(G_OBJECT(w), "desktopwidget", vw);
gtk_window_set_default_size((GtkWindow *) w, 640, 480);
g_object_set_data(G_OBJECT(w), "desktop", SP_DESKTOP_WIDGET(vw)->desktop);
g_object_set_data(G_OBJECT(w), "desktopwidget", vw);
gtk_window_set_policy(GTK_WINDOW(w), TRUE, TRUE, TRUE);
}
gtk_window_set_policy(GTK_WINDOW(w), TRUE, TRUE, TRUE);
}
- gtk_box_pack_end(GTK_BOX(hb), GTK_WIDGET(vw), TRUE, TRUE, 0);
+ gtk_container_add(GTK_CONTAINER(w), GTK_WIDGET(vw));
gtk_widget_show(GTK_WIDGET(vw));
gtk_widget_show(GTK_WIDGET(vw));
-
if ( completeDropTargets == 0 || completeDropTargetsCount == 0 )
{
std::vector<gchar*> types;
if ( completeDropTargets == 0 || completeDropTargetsCount == 0 )
{
std::vector<gchar*> types;
sp_create_window(dtw, TRUE);
sp_namedview_window_from_document(static_cast<SPDesktop*>(dtw->view));
sp_create_window(dtw, TRUE);
sp_namedview_window_from_document(static_cast<SPDesktop*>(dtw->view));
+ sp_namedview_update_layers_from_document(static_cast<SPDesktop*>(dtw->view));
}
/* TODO: not yet working */
}
/* TODO: not yet working */
if (dir) {
for (gchar const *file = g_dir_read_name(dir); file != NULL; file = g_dir_read_name(dir)) {
if (dir) {
for (gchar const *file = g_dir_read_name(dir); file != NULL; file = g_dir_read_name(dir)) {
- if (!g_str_has_suffix(file, ".svg"))
+ if (!g_str_has_suffix(file, ".svg") && !g_str_has_suffix(file, ".svgz"))
continue; // skip non-svg files
gchar *basename = g_path_get_basename(file);
continue; // skip non-svg files
gchar *basename = g_path_get_basename(file);
SPDocument *doc = SP_ACTIVE_DOCUMENT;
sp_document_done( doc , SP_VERB_NONE,
SPDocument *doc = SP_ACTIVE_DOCUMENT;
sp_document_done( doc , SP_VERB_NONE,
- /* TODO: annotate */ "interface.cpp:1047");
+ _("Drop color"));
if ( srgbProf ) {
cmsCloseProfile( srgbProf );
if ( srgbProf ) {
cmsCloseProfile( srgbProf );
SPDocument *doc = SP_ACTIVE_DOCUMENT;
sp_document_done( doc , SP_VERB_NONE,
SPDocument *doc = SP_ACTIVE_DOCUMENT;
sp_document_done( doc , SP_VERB_NONE,
- /* TODO: annotate */ "interface.cpp:1089");
+ _("Drop color"));
}
}
}
}
}
}
return;
}
return;
}
- Inkscape::XML::Node *repr = sp_repr_document_root(rnewdoc);
+ Inkscape::XML::Node *repr = rnewdoc->root();
gchar const *style = repr->attribute("style");
gchar const *style = repr->attribute("style");
- Inkscape::XML::Node *newgroup = sp_repr_new("svg:g");
+ Inkscape::XML::Node *newgroup = rnewdoc->createElement("svg:g");
newgroup->setAttribute("style", style);
for (Inkscape::XML::Node *child = repr->firstChild(); child != NULL; child = child->next()) {
newgroup->setAttribute("style", style);
for (Inkscape::XML::Node *child = repr->firstChild(); child != NULL; child = child->next()) {
Inkscape::GC::release(newgroup);
sp_document_done(doc, SP_VERB_NONE,
Inkscape::GC::release(newgroup);
sp_document_done(doc, SP_VERB_NONE,
- /* TODO: annotate */ "interface.cpp:1143");
+ _("Drop SVG"));
break;
}
break;
}
b64out.setColumnWidth(0);
SPDocument *doc = SP_ACTIVE_DOCUMENT;
b64out.setColumnWidth(0);
SPDocument *doc = SP_ACTIVE_DOCUMENT;
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
- Inkscape::XML::Node *newImage = sp_repr_new("svg:image");
+ Inkscape::XML::Node *newImage = xml_doc->createElement("svg:image");
for ( int i = 0; i < data->length; i++ ) {
b64out.put( data->data[i] );
for ( int i = 0; i < data->length; i++ ) {
b64out.put( data->data[i] );
Inkscape::GC::release(newImage);
sp_document_done( doc , SP_VERB_NONE,
Inkscape::GC::release(newImage);
sp_document_done( doc , SP_VERB_NONE,
- /* TODO: annotate */ "interface.cpp:1203");
+ _("Drop bitmap image"));
break;
}
}
break;
}
}