![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/interface.cpp b/src/interface.cpp
index 88031032a255bebd0f1194b1a45a4c73ca7a5af8..fbdb8a5f63b79486e8fdb0555645cf417c824b1d 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
#define __SP_INTERFACE_C__
-/**
- * Main UI stuff
- *
- * Authors:
+/** @file
+ * @brief Main UI stuff
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* Frank Felfe <innerspace@iname.com>
* bulia byak <buliabyak@users.sf.net>
#endif
#include <gtk/gtk.h>
+#include <glib.h>
#include "inkscape-private.h"
#include "extension/effect.h"
#include "widgets/icon.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "path-prefix.h"
#include "shortcuts.h"
#include "svg/svg-color.h"
#include "desktop-style.h"
#include "style.h"
+#include "event-context.h"
+#include "gradient-drag.h"
+
+// Include Mac OS X menu synchronization on native OSX build
+#ifdef GDK_WINDOWING_QUARTZ
+#include "ige-mac-menu.h"
+#endif
using Inkscape::IO::StringOutputStream;
using Inkscape::IO::Base64OutputStream;
} ui_drop_target_info;
static GtkTargetEntry ui_drop_target_entries [] = {
- {"text/uri-list", 0, URI_LIST},
- {"image/svg+xml", 0, SVG_XML_DATA},
- {"image/svg", 0, SVG_DATA},
- {"image/png", 0, PNG_DATA},
- {"image/jpeg", 0, JPEG_DATA},
+ {(gchar *)"text/uri-list", 0, URI_LIST },
+ {(gchar *)"image/svg+xml", 0, SVG_XML_DATA },
+ {(gchar *)"image/svg", 0, SVG_DATA },
+ {(gchar *)"image/png", 0, PNG_DATA },
+ {(gchar *)"image/jpeg", 0, JPEG_DATA },
#if ENABLE_MAGIC_COLORS
- {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
+ {(gchar *)"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
#endif // ENABLE_MAGIC_COLORS
- {"application/x-color", 0, APP_X_COLOR}
+ {(gchar *)"application/x-color", 0, APP_X_COLOR }
};
static GtkTargetEntry *completeDropTargets = 0;
guint info,
guint event_time,
gpointer user_data);
+static void sp_ui_drag_motion( GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint event_time,
+ gpointer user_data );
+static void sp_ui_drag_leave( GtkWidget *widget,
+ GdkDragContext *drag_context,
+ guint event_time,
+ gpointer user_data );
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);
+static void sp_recent_open(GtkRecentChooser *, gpointer);
SPActionEventVector menu_item_event_vector = {
{NULL},
Gtk::Window *win = Inkscape::UI::window_new("", TRUE);
+ gtk_container_add(GTK_CONTAINER(win->gobj()), GTK_WIDGET(vw));
+ gtk_widget_show(GTK_WIDGET(vw));
+
if (editable) {
g_object_set_data(G_OBJECT(vw), "window", win);
desktop_widget->window = win;
- /* fixme: doesn't allow making window any smaller than this */
- win->set_default_size(640, 480);
-
win->set_data("desktop", desktop);
win->set_data("desktopwidget", desktop_widget);
win->signal_delete_event().connect(sigc::mem_fun(*(SPDesktop*)vw->view, &SPDesktop::onDeleteUI));
win->signal_window_state_event().connect(sigc::mem_fun(*desktop, &SPDesktop::onWindowStateEvent));
win->signal_focus_in_event().connect(sigc::mem_fun(*desktop_widget, &SPDesktopWidget::onFocusInEvent));
-
+
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gint prefs_geometry =
- (2==prefs_get_int_attribute("options.savewindowgeometry", "value", 0));
+ (2==prefs->getInt("/options/savewindowgeometry/value", 0));
if (prefs_geometry) {
- gint pw = prefs_get_int_attribute("desktop.geometry", "width", -1);
- gint ph = prefs_get_int_attribute("desktop.geometry", "height", -1);
- gint px = prefs_get_int_attribute("desktop.geometry", "x", -1);
- gint py = prefs_get_int_attribute("desktop.geometry", "y", -1);
- gint full = prefs_get_int_attribute("desktop.geometry", "fullscreen", 0);
- gint maxed = prefs_get_int_attribute("desktop.geometry", "maximized", 0);
+ gint pw = prefs->getInt("/desktop/geometry/width", -1);
+ gint ph = prefs->getInt("/desktop/geometry/height", -1);
+ gint px = prefs->getInt("/desktop/geometry/x", -1);
+ gint py = prefs->getInt("/desktop/geometry/y", -1);
+ gint full = prefs->getBool("/desktop/geometry/fullscreen");
+ gint maxed = prefs->getBool("/desktop/geometry/maximized");
if (pw>0 && ph>0) {
gint w = MIN(gdk_screen_width(), pw);
gint h = MIN(gdk_screen_height(), ph);
if (x>0 && y>0) {
SPDesktop *active_desktop = SP_ACTIVE_DESKTOP;
if (active_desktop == desktop || active_desktop==NULL) {
- desktop->setWindowPosition(NR::Point(x, y));
+ desktop->setWindowPosition(Geom::Point(x, y));
}
}
}
gtk_window_set_policy(GTK_WINDOW(win->gobj()), TRUE, TRUE, TRUE);
}
- gtk_container_add(GTK_CONTAINER(win->gobj()), GTK_WIDGET(vw));
- gtk_widget_show(GTK_WIDGET(vw));
-
if ( completeDropTargets == 0 || completeDropTargetsCount == 0 )
{
std::vector<gchar*> types;
completeDropTargets,
completeDropTargetsCount,
GdkDragAction(GDK_ACTION_COPY | GDK_ACTION_MOVE));
+
+
g_signal_connect(G_OBJECT(win->gobj()),
"drag_data_received",
G_CALLBACK(sp_ui_drag_data_received),
NULL);
+ g_signal_connect(G_OBJECT(win->gobj()),
+ "drag_motion",
+ G_CALLBACK(sp_ui_drag_motion),
+ NULL);
+ g_signal_connect(G_OBJECT(win->gobj()),
+ "drag_leave",
+ G_CALLBACK(sp_ui_drag_leave),
+ NULL);
win->show();
// needed because the first ACTIVATE_DESKTOP was sent when there was no window yet
* \param widget unused
*/
void
-sp_ui_close_view(GtkWidget *widget)
+sp_ui_close_view(GtkWidget */*widget*/)
{
if (SP_ACTIVE_DESKTOP == NULL) {
return;
* investigate when they're called.
*/
static void
-sp_ui_menu_activate(void *object, SPAction *action)
+sp_ui_menu_activate(void */*object*/, SPAction *action)
{
sp_action_perform(action, NULL);
}
static void
-sp_ui_menu_select_action(void *object, SPAction *action)
+sp_ui_menu_select_action(void */*object*/, SPAction *action)
{
action->view->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, action->tip);
}
static void
-sp_ui_menu_deselect_action(void *object, SPAction *action)
+sp_ui_menu_deselect_action(void */*object*/, SPAction *action)
{
action->view->tipsMessageContext()->clear();
}
else if (!strcmp(n, "Page_Down" )) return "PgDn";
else if (!strcmp(n, "grave" )) return "`";
else if (!strcmp(n, "numbersign" )) return "#";
- else if (!strcmp(n, "bar" )) return "|";
- else if (!strcmp(n, "slash" )) return "/";
- else if (!strcmp(n, "exclam" )) return "!";
+ else if (!strcmp(n, "bar" )) return "|";
+ else if (!strcmp(n, "slash" )) return "/";
+ else if (!strcmp(n, "exclam" )) return "!";
+ else if (!strcmp(n, "percent" )) return "%";
else return n;
}
gchar const *pref = (gchar const *) user_data;
Inkscape::UI::View::View *view = (Inkscape::UI::View::View *) g_object_get_data(G_OBJECT(menuitem), "view");
- gchar const *pref_path;
- if (reinterpret_cast<SPDesktop*>(view)->is_fullscreen())
- pref_path = g_strconcat("fullscreen.", pref, NULL);
- else
- pref_path = g_strconcat("window.", pref, NULL);
+ Glib::ustring pref_path;
+ if (reinterpret_cast<SPDesktop*>(view)->is_focusMode()) {
+ pref_path = "/focus/";
+ } else if (reinterpret_cast<SPDesktop*>(view)->is_fullscreen()) {
+ pref_path = "/fullscreen/";
+ } else {
+ pref_path = "/window/";
+ }
+ pref_path += pref;
+ pref_path += "/state";
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gboolean checked = gtk_check_menu_item_get_active(menuitem);
- prefs_set_int_attribute(pref_path, "state", checked);
+ prefs->setBool(pref_path, checked);
reinterpret_cast<SPDesktop*>(view)->layoutWidget();
}
static gboolean
-checkitem_update(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+checkitem_update(GtkWidget *widget, GdkEventExpose */*event*/, gpointer user_data)
{
GtkCheckMenuItem *menuitem=GTK_CHECK_MENU_ITEM(widget);
gchar const *pref = (gchar const *) user_data;
Inkscape::UI::View::View *view = (Inkscape::UI::View::View *) g_object_get_data(G_OBJECT(menuitem), "view");
- gchar const *pref_path;
- if ((static_cast<SPDesktop*>(view))->is_fullscreen())
- pref_path = g_strconcat("fullscreen.", pref, NULL);
- else
- pref_path = g_strconcat("window.", pref, NULL);
+ Glib::ustring pref_path;
+ if ((static_cast<SPDesktop*>(view))->is_fullscreen()) {
+ pref_path = "/fullscreen/";
+ } else {
+ pref_path = "/window/";
+ }
+ pref_path += pref;
- gint ison = prefs_get_int_attribute_limited(pref_path, "state", 1, 0, 1);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool ison = prefs->getBool(pref_path + "/state", true);
g_signal_handlers_block_by_func(G_OBJECT(menuitem), (gpointer)(GCallback)checkitem_toggled, user_data);
gtk_check_menu_item_set_active(menuitem, ison);
@@ -707,13 +745,20 @@ sp_ui_menu_append_check_item_from_verb(GtkMenu *menu, Inkscape::UI::View::View *
}
static void
-sp_recent_open(GtkWidget *widget, gchar const *uri)
+sp_recent_open(GtkRecentChooser *recent_menu, gpointer /*user_data*/)
{
- sp_file_open(uri, NULL);
+ // dealing with the bizarre filename convention in Inkscape for now
+ gchar *uri = gtk_recent_chooser_get_current_uri(GTK_RECENT_CHOOSER(recent_menu));
+ gchar *local_fn = g_filename_from_uri(uri, NULL, NULL);
+ gchar *utf8_fn = g_filename_to_utf8(local_fn, -1, NULL, NULL, NULL);
+ sp_file_open(utf8_fn, NULL);
+ g_free(utf8_fn);
+ g_free(local_fn);
+ g_free(uri);
}
static void
-sp_file_new_from_template(GtkWidget *widget, gchar const *uri)
+sp_file_new_from_template(GtkWidget */*widget*/, gchar const *uri)
{
sp_file_new(uri);
}
}
}
-void
-sp_menu_append_recent_documents(GtkWidget *menu, Inkscape::UI::View::View* /* view */)
-{
- gchar const **recent = prefs_get_recent_files();
- if (recent) {
- int i;
-
- for (i = 0; recent[i] != NULL; i += 2) {
- gchar const *uri = recent[i];
- gchar const *name = recent[i + 1];
-
- GtkWidget *item = gtk_menu_item_new_with_label(name);
- gtk_widget_show(item);
- g_signal_connect(G_OBJECT(item),
- "activate",
- G_CALLBACK(sp_recent_open),
- (gpointer)uri);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
- }
-
- g_free(recent);
- } else {
- GtkWidget *item = gtk_menu_item_new_with_label(_("None"));
- gtk_widget_show(item);
- gtk_widget_set_sensitive(item, FALSE);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
- }
-}
-
void
sp_ui_checkboxes_menus(GtkMenu *m, Inkscape::UI::View::View *view)
{
@@ -899,7 +915,25 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI:
continue;
}
if (!strcmp(menu_pntr->name(), "recent-file-list")) {
- sp_menu_append_recent_documents(menu, view);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+ // create recent files menu
+ int max_recent = prefs->getInt("/options/maxrecentdocuments/value");
+ GtkWidget *recent_menu = gtk_recent_chooser_menu_new_for_manager(gtk_recent_manager_get_default());
+ gtk_recent_chooser_set_limit(GTK_RECENT_CHOOSER(recent_menu), max_recent);
+ // sort most recently used documents first to preserve previous behavior
+ gtk_recent_chooser_set_sort_type(GTK_RECENT_CHOOSER(recent_menu), GTK_RECENT_SORT_MRU);
+ g_signal_connect(G_OBJECT(recent_menu), "item-activated", G_CALLBACK(sp_recent_open), (gpointer) NULL);
+
+ // add filter to only open files added by Inkscape
+ GtkRecentFilter *inkscape_only_filter = gtk_recent_filter_new();
+ gtk_recent_filter_add_application(inkscape_only_filter, g_get_prgname());
+ gtk_recent_chooser_add_filter(GTK_RECENT_CHOOSER(recent_menu), inkscape_only_filter);
+
+ GtkWidget *recent_item = gtk_menu_item_new_with_mnemonic(_("Open _Recent"));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent_item), recent_menu);
+
+ gtk_menu_append(GTK_MENU(menu), GTK_WIDGET(recent_item));
continue;
}
if (!strcmp(menu_pntr->name(), "objects-checkboxes")) {
{
GtkWidget *mbar = gtk_menu_bar_new();
+#ifdef GDK_WINDOWING_QUARTZ
+ ige_mac_menu_set_menu_bar(GTK_MENU_SHELL(mbar));
+#endif
+
sp_ui_build_dyn_menus(inkscape_get_menus(INKSCAPE), mbar, view);
+#ifdef GDK_WINDOWING_QUARTZ
+ return NULL;
+#else
return mbar;
+#endif
}
static void leave_group(GtkMenuItem *, SPDesktop *desktop) {
gint x, gint y,
GtkSelectionData *data,
guint info,
- guint event_time,
- gpointer user_data)
+ guint /*event_time*/,
+ gpointer /*user_data*/)
{
SPDocument *doc = SP_ACTIVE_DOCUMENT;
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
int destX = 0;
int destY = 0;
gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY );
- NR::Point where( sp_canvas_window_to_world( desktop->canvas, NR::Point( destX, destY ) ) );
+ Geom::Point where( sp_canvas_window_to_world( desktop->canvas, Geom::Point( destX, destY ) ) );
SPItem *item = desktop->item_at_point( where, true );
if ( item )
int destY = 0;
gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY );
NR::Point where( sp_canvas_window_to_world( desktop->canvas, NR::Point( destX, destY ) ) );
- NR::Point const button_dt(desktop->dt2doc(desktop->w2d(where)));
+ NR::Point const button_dt(desktop->w2d(where));
+ NR::Point const button_doc(desktop->dt2doc(button_dt));
+
+ if ( data->length == 8 ) {
+ gchar c[64] = {0};
+ // Careful about endian issues.
+ guint16* dataVals = (guint16*)data->data;
+ sp_svg_write_color( c, 64,
+ SP_RGBA32_U_COMPOSE(
+ 0x0ff & (dataVals[0] >> 8),
+ 0x0ff & (dataVals[1] >> 8),
+ 0x0ff & (dataVals[2] >> 8),
+ 0xff // can't have transparency in the color itself
+ //0x0ff & (data->data[3] >> 8),
+ ));
+
+ SPItem *item = desktop->item_at_point( where, true );
+
+ bool consumed = false;
+ if (desktop->event_context && desktop->event_context->get_drag()) {
+ consumed = desktop->event_context->get_drag()->dropColor(item, c, button_dt);
+ if (consumed) {
+ sp_document_done( doc , SP_VERB_NONE, _("Drop color on gradient"));
+ desktop->event_context->get_drag()->updateDraggers();
+ }
+ }
- SPItem *item = desktop->item_at_point( where, true );
- if ( item )
- {
- bool fillnotstroke = (drag_context->action != GDK_ACTION_MOVE);
- if (SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
- Path *livarot_path = Path_for_item(item, true, true);
- livarot_path->ConvertWithBackData(0.04);
-
- NR::Maybe<Path::cut_position> position = get_nearest_position_on_Path(livarot_path, button_dt);
- if (position) {
- NR::Point nearest = get_point_on_Path(livarot_path, position->piece, position->t);
- NR::Point delta = nearest - button_dt;
- delta = desktop->d2w(delta);
- double stroke_tolerance =
- ( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
- desktop->current_zoom() *
- SP_OBJECT_STYLE (item)->stroke_width.computed *
- sp_item_i2d_affine (item).expansion() * 0.5
- : 0.0)
- + prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
-
- if (NR::L2 (delta) < stroke_tolerance) {
- fillnotstroke = false;
+ //if (!consumed && tools_active(desktop, TOOLS_TEXT)) {
+ // consumed = sp_text_context_drop_color(c, button_doc);
+ // if (consumed) {
+ // sp_document_done( doc , SP_VERB_NONE, _("Drop color on gradient stop"));
+ // }
+ //}
+
+ if (!consumed && item) {
+ bool fillnotstroke = (drag_context->action != GDK_ACTION_MOVE);
+ if (fillnotstroke &&
+ (SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item))) {
+ Path *livarot_path = Path_for_item(item, true, true);
+ livarot_path->ConvertWithBackData(0.04);
+
+ boost::optional<Path::cut_position> position = get_nearest_position_on_Path(livarot_path, button_doc);
+ if (position) {
+ NR::Point nearest = get_point_on_Path(livarot_path, position->piece, position->t);
+ NR::Point delta = nearest - button_doc;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ delta = desktop->d2w(delta);
+ double stroke_tolerance =
+ ( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
+ desktop->current_zoom() *
+ SP_OBJECT_STYLE (item)->stroke_width.computed *
+ to_2geom(sp_item_i2d_affine(item)).descrim() * 0.5
+ : 0.0)
+ + prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+
+ if (NR::L2 (delta) < stroke_tolerance) {
+ fillnotstroke = false;
+ }
}
+ delete livarot_path;
}
- delete livarot_path;
- }
- if ( data->length == 8 ) {
- gchar c[64] = {0};
- // Careful about endian issues.
- guint16* dataVals = (guint16*)data->data;
- sp_svg_write_color( c, 64,
- SP_RGBA32_U_COMPOSE(
- 0x0ff & (dataVals[0] >> 8),
- 0x0ff & (dataVals[1] >> 8),
- 0x0ff & (dataVals[2] >> 8),
- 0xff // can't have transparency in the color itself
- //0x0ff & (data->data[3] >> 8),
- ));
SPCSSAttr *css = sp_repr_css_attr_new();
sp_repr_css_set_property( css, fillnotstroke ? "fill":"stroke", c );
// 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);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool const saved_pref = prefs->getBool("/options/transform/pattern", true);
+ prefs->setBool("/options/transform/pattern", true);
sp_document_ensure_up_to_date(sp_desktop_document(desktop));
- NR::Maybe<NR::Rect> sel_bbox = selection->bounds();
+ Geom::OptRect sel_bbox = selection->bounds();
if (sel_bbox) {
- NR::Point m( desktop->point() - sel_bbox->midpoint() );
+ Geom::Point m( desktop->point() - sel_bbox->midpoint() );
sp_selection_move_relative(selection, m);
}
- prefs_set_int_attribute("options.transform", "pattern", saved_pref);
+ prefs->setBool("/options/transform/pattern", saved_pref);
}
Inkscape::GC::release(newgroup);
}
}
+#include "gradient-context.h"
+
+void sp_ui_drag_motion( GtkWidget */*widget*/,
+ GdkDragContext */*drag_context*/,
+ gint /*x*/, gint /*y*/,
+ GtkSelectionData */*data*/,
+ guint /*info*/,
+ guint /*event_time*/,
+ gpointer /*user_data*/)
+{
+// SPDocument *doc = SP_ACTIVE_DOCUMENT;
+// SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+
+
+// g_message("drag-n-drop motion (%4d, %4d) at %d", x, y, event_time);
+}
+
+static void sp_ui_drag_leave( GtkWidget */*widget*/,
+ GdkDragContext */*drag_context*/,
+ guint /*event_time*/,
+ gpointer /*user_data*/ )
+{
+// g_message("drag-n-drop leave at %d", event_time);
+}
+
static void
sp_ui_import_files(gchar *buffer)
{
}
static void
-sp_ui_import_one_file_with_check(gpointer filename, gpointer unused)
+sp_ui_import_one_file_with_check(gpointer filename, gpointer /*unused*/)
{
if (filename) {
if (strlen((char const *)filename) > 2)
}
static void
-sp_ui_menu_item_set_sensitive(SPAction *action, unsigned int sensitive, void *data)
+sp_ui_menu_item_set_sensitive(SPAction */*action*/, unsigned int sensitive, void *data)
{
return gtk_widget_set_sensitive(GTK_WIDGET(data), sensitive);
}
static void
-sp_ui_menu_item_set_name(SPAction *action, Glib::ustring name, void *data)
+sp_ui_menu_item_set_name(SPAction */*action*/, Glib::ustring name, void *data)
{
void *child = GTK_BIN (data)->child;
//child is either