![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1fdf1fceb632db1f942b659f03cb826e5d5fcb4b..e3bf1ae9c5efecb60323a6052b7f4e1f4760d246 100644 (file)
#include <gtkmm/paned.h>
#include <gtk/gtk.h>
-#include "macros.h"
-#include "inkscape-private.h"
-#include "desktop-handles.h"
+#include "box3d-context.h"
+#include "color-profile-fns.h"
+#include "conn-avoid-ref.h"
#include "desktop-events.h"
-#include "document.h"
+#include "desktop-handles.h"
#include "desktop-widget.h"
-#include "sp-namedview.h"
-#include "interface.h"
-#include "toolbox.h"
-#include "preferences.h"
-#include "file.h"
#include "display/canvas-arena.h"
#include "display/nr-arena.h"
+#include "document.h"
+#include "ege-color-prof-tracker.h"
+#include "ege-select-one-action.h"
#include <extension/db.h>
+#include "file.h"
#include "helper/units.h"
-#include "widgets/button.h"
-#include "widgets/ruler.h"
-#include "widgets/widget-sizes.h"
-#include "widgets/spw-utilities.h"
-#include "widgets/spinbutton-events.h"
-#include "widgets/layer-selector.h"
+#include "inkscape-private.h"
+#include "interface.h"
+#include "macros.h"
+#include "preferences.h"
+#include "sp-image.h"
+#include "sp-item.h"
+#include "sp-namedview.h"
+#include "toolbox.h"
#include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/swatches.h"
+#include "ui/icon-names.h"
#include "ui/widget/dock.h"
+#include "ui/widget/layer-selector.h"
#include "ui/widget/selected-style.h"
-#include "sp-item.h"
-#include "dialogs/swatches.h"
-#include "conn-avoid-ref.h"
-#include "ege-select-one-action.h"
-#include "ege-color-prof-tracker.h"
-#include "color-profile-fns.h"
-#include "box3d-context.h"
-#include "sp-image.h"
+#include "widgets/button.h"
+#include "widgets/ruler.h"
+#include "widgets/spinbutton-events.h"
+#include "widgets/spw-utilities.h"
+#include "widgets/toolbox.h"
+#include "widgets/widget-sizes.h"
#if defined (SOLARIS) && (SOLARIS == 8)
#include "round.h"
static void sp_dtw_zoom_page (GtkMenuItem *item, gpointer data);
static void sp_dtw_zoom_drawing (GtkMenuItem *item, gpointer data);
static void sp_dtw_zoom_selection (GtkMenuItem *item, gpointer data);
+static void sp_dtw_sticky_zoom_toggled (GtkMenuItem *item, gpointer data);
SPViewWidgetClass *dtw_parent_class;
private:
static void hook(EgeColorProfTracker *tracker, gint a, gint b, CMSPrefWatcher *watcher);
-
+
class DisplayProfileWatcher : public Inkscape::Preferences::Observer {
public:
DisplayProfileWatcher(CMSPrefWatcher &pw) : Observer("/options/displayprofile"), _pw(pw) {}
- virtual void notify(Inkscape::Preferences::Entry const &val) {
+ virtual void notify(Inkscape::Preferences::Entry const &/*val*/) {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
_pw._setCmsSensitive(!prefs->getString("/options/displayprofile/uri").empty());
_pw._refreshAll();
private:
CMSPrefWatcher &_pw;
};
-
+
DisplayProfileWatcher _dpw;
-
+
class SoftProofWatcher : public Inkscape::Preferences::Observer {
public:
SoftProofWatcher(CMSPrefWatcher &pw) : Observer("/options/softproof"), _pw(pw) {}
private:
CMSPrefWatcher &_pw;
};
-
+
SoftProofWatcher _spw;
-
+
void _refreshAll();
void _setCmsSensitive(bool value);
std::list<SPDesktopWidget*> _widget_list;
EgeColorProfTracker *_tracker;
-
+
friend class DisplayProfileWatcher;
friend class SoftproofWatcher;
};
GtkWidget *hbox;
GtkWidget *eventbox;
GtkStyle *style;
-
+
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
new (&dtw->modified_connection) sigc::connection();
{
using Inkscape::UI::Dialogs::SwatchesPanel;
- SwatchesPanel* swatches = new SwatchesPanel("/embedded/swatches");
- swatches->setOrientation( Gtk::ANCHOR_SOUTH );
- dtw->panels = GTK_WIDGET(swatches->gobj());
- gtk_box_pack_end( GTK_BOX( dtw->vbox ), dtw->panels, FALSE, TRUE, 0 );
+ dtw->panels = new SwatchesPanel("/embedded/swatches");
+ dtw->panels->setOrientation( Gtk::ANCHOR_SOUTH );
+ gtk_box_pack_end( GTK_BOX( dtw->vbox ), GTK_WIDGET(dtw->panels->gobj()), FALSE, TRUE, 0 );
}
hbox = gtk_hbox_new (FALSE, 0);
dtw->aux_toolbox = sp_aux_toolbox_new ();
gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->aux_toolbox, FALSE, TRUE, 0);
+ dtw->snap_toolbox = sp_snap_toolbox_new ();
+ gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->snap_toolbox, FALSE, TRUE, 0);
+
dtw->commands_toolbox = sp_commands_toolbox_new ();
gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->commands_toolbox, FALSE, TRUE, 0);
dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
- "sticky_zoom",
+ INKSCAPE_ICON_ZOOM_ORIGINAL,
_("Zoom drawing if window size changes"),
dtw->tt);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value"));
gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->sticky_zoom, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (dtw->sticky_zoom), "toggled", G_CALLBACK (sp_dtw_sticky_zoom_toggled), dtw);
dtw->vadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0);
dtw->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (dtw->vadj));
gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0);
dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
- "color_management",
+ INKSCAPE_ICON_COLOR_MANAGEMENT,
tip,
dtw->tt );
#if ENABLE_LCMS
eventbox = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status);
gtk_tooltips_set_tip (dtw->tt, eventbox, _("Cursor coordinates"), NULL);
- GtkWidget *label_x = gtk_label_new("X:");
+ GtkWidget *label_x = gtk_label_new(_("X:"));
gtk_misc_set_alignment (GTK_MISC(label_x), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(dtw->coord_status), label_x, 1,2, 0,1, GTK_FILL, GTK_FILL, 0, 0);
- GtkWidget *label_y = gtk_label_new("Y:");
+ GtkWidget *label_y = gtk_label_new(_("Y:"));
gtk_misc_set_alignment (GTK_MISC(label_y), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(dtw->coord_status), label_y, 1,2, 1,2, GTK_FILL, GTK_FILL, 0, 0);
dtw->coord_status_x = gtk_label_new(NULL);
gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_y), 1.0, 0.5);
gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_x, 2,3, 0,1, GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_y, 2,3, 1,2, GTK_FILL, GTK_FILL, 0, 0);
- gtk_table_attach(GTK_TABLE(dtw->coord_status), gtk_label_new("Z:"), 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(dtw->coord_status), gtk_label_new(_("Z:")), 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->zoom_status, 4,5, 0,2, GTK_FILL, GTK_FILL, 0, 0);
sp_set_font_size_smaller (dtw->coord_status);
gtk_box_pack_end (GTK_BOX (statusbar_tail), eventbox, FALSE, FALSE, 1);
gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status_eventbox, TRUE, TRUE, 0);
gtk_widget_show_all (dtw->vbox);
+
+ gtk_widget_grab_focus (GTK_WIDGET(dtw->canvas));
}
/**
@@ -652,16 +660,14 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
}
if (SP_BUTTON_IS_DOWN(dtw->sticky_zoom)) {
- /* Calculate zoom per pixel */
- double const zpsp = zoom / hypot (area.dimensions()[Geom::X], area.dimensions()[Geom::Y]);
/* Find new visible area */
Geom::Rect newarea = dtw->desktop->get_display_area();
/* Calculate adjusted zoom */
- zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]);
- dtw->desktop->zoom_absolute(newarea.midpoint()[Geom::X], newarea.midpoint()[Geom::Y], zoom);
- } else {
- dtw->desktop->zoom_absolute(area.midpoint()[Geom::X], area.midpoint()[Geom::Y], zoom);
+ double oldshortside = MIN( area.width(), area.height());
+ double newshortside = MIN(newarea.width(), newarea.height());
+ zoom *= newshortside / oldshortside;
}
+ dtw->desktop->zoom_absolute(area.midpoint()[Geom::X], area.midpoint()[Geom::Y], zoom);
} else {
if (GTK_WIDGET_CLASS (dtw_parent_class)->size_allocate) {
Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
sp_document_ref(doc);
+ sp_namedview_document_from_window(desktop);
if (sp_file_save_document(*window, doc)) {
sp_document_unref(doc);
} else { // save dialog cancelled or save failed
_("<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a format (%s) that may cause data loss!</span>\n\n"
"Do you want to save this file as an Inkscape SVG?"),
SP_DOCUMENT_NAME(doc),
- Inkscape::Extension::db.get(sp_document_repr_root(doc)->attribute("inkscape:output_extension"))->get_name());
+ SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE);
// fix for bug 1767940:
GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label), GTK_CAN_FOCUS);
Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
- if (sp_file_save_dialog(*window, doc)) {
+ if (sp_file_save_dialog(*window, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG)) {
sp_document_unref(doc);
} else { // save dialog cancelled or save failed
sp_document_unref(doc);
void
SPDesktopWidget::setWindowTransient (void *p, int transient_policy)
{
- GtkWindow *w =GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this)));
- if (w)
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+ if (window)
{
+ GtkWindow *w = (GtkWindow *) window->gobj();
gtk_window_set_transient_for (GTK_WINDOW(p), w);
/*
* (so that its transients also could raise)
*/
if (transient_policy == 2)
-
// without this, a transient window not always emerges on top
gtk_window_present (w);
}
pref_root = "/window/";
}
+#ifndef GDK_WINDOWING_QUARTZ
if (!prefs->getBool(pref_root + "menu/state", true)) {
gtk_widget_hide_all (dtw->menubar);
} else {
gtk_widget_show_all (dtw->menubar);
}
+#endif
if (!prefs->getBool(pref_root + "commands/state", true)) {
gtk_widget_hide_all (dtw->commands_toolbox);
gtk_widget_show_all (dtw->commands_toolbox);
}
+ if (!prefs->getBool(pref_root + "snaptoolbox/state", true)) {
+ gtk_widget_hide_all (dtw->snap_toolbox);
+ } else {
+ gtk_widget_show_all (dtw->snap_toolbox);
+ }
+
if (!prefs->getBool(pref_root + "toppanel/state", true)) {
gtk_widget_hide_all (dtw->aux_toolbox);
} else {
}
if (!prefs->getBool(pref_root + "panels/state", true)) {
- gtk_widget_hide_all( dtw->panels );
+ gtk_widget_hide_all( GTK_WIDGET(dtw->panels->gobj()) );
} else {
- gtk_widget_show_all( dtw->panels );
+ gtk_widget_show_all( GTK_WIDGET(dtw->panels->gobj()) );
}
if (!prefs->getBool(pref_root + "scrollbars/state", true)) {
void
SPDesktopWidget::setToolboxAdjustmentValue (gchar const *id, double value)
{
+ GtkAdjustment *a = NULL;
gpointer hb = sp_search_by_data_recursive (aux_toolbox, (gpointer) id);
- if (hb && GTK_IS_WIDGET(hb) && GTK_IS_SPIN_BUTTON(hb)) {
- GtkAdjustment *a = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(hb));
- gtk_adjustment_set_value (a, value);
+ if (hb && GTK_IS_WIDGET(hb)) {
+ if (GTK_IS_SPIN_BUTTON(hb))
+ a = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(hb));
+ else if (GTK_IS_RANGE(hb))
+ a = gtk_range_get_adjustment (GTK_RANGE(hb));
}
+
+ if (a)
+ gtk_adjustment_set_value (a, value);
+ else
+ g_warning ("Could not find GtkAdjustment for %s\n", id);
}
void
SPViewWidget *
sp_desktop_widget_new (SPNamedView *namedview)
{
- SPDesktopWidget *dtw = (SPDesktopWidget*)gtk_type_new (SP_TYPE_DESKTOP_WIDGET);
+ SPDesktopWidget *dtw = (SPDesktopWidget*)g_object_new(SP_TYPE_DESKTOP_WIDGET, NULL);
dtw->dt2r = 1.0 / namedview->doc_units->unittobase;
dtw->desktop = new SPDesktop();
dtw->stub = new SPDesktopWidget::WidgetStub (dtw);
- dtw->desktop->registerEditWidget (dtw->stub);
- dtw->desktop->init (namedview, dtw->canvas);
+ dtw->desktop->init (namedview, dtw->canvas, dtw->stub);
inkscape_add_desktop (dtw->desktop);
// Add the shape geometry to libavoid for autorouting connectors.
dtw->layer_selector->setDesktop(dtw->desktop);
dtw->menubar = sp_ui_main_menubar (dtw->desktop);
+#ifndef GDK_WINDOWING_QUARTZ
gtk_widget_show_all (dtw->menubar);
gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0);
+#endif
sp_desktop_widget_layout (dtw);
sp_tool_toolbox_set_desktop (dtw->tool_toolbox, dtw->desktop);
sp_aux_toolbox_set_desktop (dtw->aux_toolbox, dtw->desktop);
sp_commands_toolbox_set_desktop (dtw->commands_toolbox, dtw->desktop);
+ sp_snap_toolbox_set_desktop (dtw->snap_toolbox, dtw->desktop);
+
+ dtw->panels->setDesktop( dtw->desktop );
return SP_VIEW_WIDGET (dtw);
}
@@ -1406,7 +1433,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
{
SPNamedView *nv=SP_NAMEDVIEW(obj);
if (flags & SP_OBJECT_MODIFIED_FLAG) {
- dtw->dt2r = 1.0 / nv->doc_units->unittobase;
+ dtw->dt2r = 1.0 / nv->doc_units->unittobase;
dtw->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here?
sp_ruler_set_metric (GTK_RULER (dtw->vruler), nv->getDefaultMetric());
@@ -1416,6 +1443,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
gtk_tooltips_set_tip (dtw->tt, dtw->vruler_box, gettext(sp_unit_get_plural (nv->doc_units)), NULL);
sp_desktop_widget_update_rulers (dtw);
+ update_snap_toolbox(dtw->desktop, NULL, dtw->snap_toolbox);
}
}
static_cast<SPDesktop*>(data)->zoom_selection();
}
+static void
+sp_dtw_sticky_zoom_toggled (GtkMenuItem *, gpointer data)
+{
+ SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setBool("/options/stickyzoom/value", SP_BUTTON_IS_DOWN(dtw->sticky_zoom));
+}
void