diff --git a/src/interface.cpp b/src/interface.cpp
index c5d893edea08b2e5b55c72ccb6322a4f6b4340c1..b31853cf3246c13877d9db892960282823deb5d1 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
{"image/svg", 0, SVG_DATA},
{"image/png", 0, PNG_DATA},
{"image/jpeg", 0, JPEG_DATA},
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
{"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
{"application/x-color", 0, APP_X_COLOR}
};
static void sp_ui_menu_item_set_sensitive(SPAction *action,
unsigned int sensitive,
void *data);
+static void sp_ui_menu_item_set_name(SPAction *action,
+ Glib::ustring name,
+ void *data);
SPActionEventVector menu_item_event_vector = {
{NULL},
NULL,
NULL, /* set_active */
sp_ui_menu_item_set_sensitive, /* set_sensitive */
- NULL /* set_shortcut */
+ NULL, /* set_shortcut */
+ sp_ui_menu_item_set_name /* set_name */
};
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));
- w = sp_window_new("", TRUE);
+ GtkWidget *w = sp_window_new("", TRUE);
if (editable) {
g_object_set_data(G_OBJECT(vw), "window", 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) {
+ /* 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_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));
-
if ( completeDropTargets == 0 || completeDropTargetsCount == 0 )
{
std::vector<gchar*> types;
checkitem_toggled, checkitem_update, Inkscape::Verb::get(SP_VERB_TOGGLE_RULERS));
sp_ui_menu_append_check_item_from_verb(m, view, NULL, NULL, "scrollbars",
checkitem_toggled, checkitem_update, Inkscape::Verb::get(SP_VERB_TOGGLE_SCROLLBARS));
- sp_ui_menu_append_check_item_from_verb(m, view, _("_Statusbar"), _("Show or hide the statusbar (at the bottom of the window)"), "statusbar",
- checkitem_toggled, checkitem_update, 0);
sp_ui_menu_append_check_item_from_verb(m, view, _("_Palette"), _("Show or hide the color palette"), "panels",
checkitem_toggled, checkitem_update, 0);
+ sp_ui_menu_append_check_item_from_verb(m, view, _("_Statusbar"), _("Show or hide the statusbar (at the bottom of the window)"), "statusbar",
+ checkitem_toggled, checkitem_update, 0);
}
/** \brief This function turns XML into a menu
gpointer user_data)
{
switch (info) {
-#if ENABLE_LCMS
+#if ENABLE_MAGIC_COLORS
case APP_X_INKY_COLOR:
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
item->updateRepr();
SPDocument *doc = SP_ACTIVE_DOCUMENT;
- sp_document_done( doc );
+ sp_document_done( doc , SP_VERB_NONE,
+ /* TODO: annotate */ "interface.cpp:1047");
if ( srgbProf ) {
cmsCloseProfile( srgbProf );
}
}
break;
-#endif // ENABLE_LCMS
+#endif // ENABLE_MAGIC_COLORS
case APP_X_COLOR:
{
item->updateRepr();
SPDocument *doc = SP_ACTIVE_DOCUMENT;
- sp_document_done( doc );
+ sp_document_done( doc , SP_VERB_NONE,
+ /* TODO: annotate */ "interface.cpp:1089");
}
}
}
}
Inkscape::GC::release(newgroup);
- sp_document_done(doc);
+ sp_document_done(doc, SP_VERB_NONE,
+ /* TODO: annotate */ "interface.cpp:1143");
break;
}
desktop->currentLayer()->appendChildRepr(newImage);
Inkscape::GC::release(newImage);
- sp_document_done( doc );
+ sp_document_done( doc , SP_VERB_NONE,
+ /* TODO: annotate */ "interface.cpp:1203");
break;
}
}
@@ -1313,6 +1313,15 @@ sp_ui_menu_item_set_sensitive(SPAction *action, unsigned int sensitive, void *da
return gtk_widget_set_sensitive(GTK_WIDGET(data), sensitive);
}
+static void
+sp_ui_menu_item_set_name(SPAction *action, Glib::ustring name, void *data)
+{
+ gtk_label_set_markup_with_mnemonic(
+ GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (GTK_BIN (data)->child))->data),
+ name.c_str());
+}
+
+
/*
Local Variables:
mode:c++