~7-eric/inkscape/boolop-fix

« back to all changes in this revision

Viewing changes to src/widgets/desktop-widget.cpp

Committer: Matthew Petroff
Date: 2013-08-06 18:54:40 UTC
mfrom: (12380.1.63 gsoc-2013-unit-refactor)
Revision ID: matthew@mpetroff.net-20130806185440-etxvnmedelj8273o

Merge Google Summer of Code unit refactor.

files added:
src/ui/widget/unit-tracker.cpp

src/ui/widget/unit-tracker.h

files removed:
src/helper/unit-menu.cpp

src/helper/unit-menu.h

src/helper/unit-tracker.cpp

src/helper/unit-tracker.h

src/helper/units-test.h

src/helper/units.cpp

src/helper/units.h

src/sp-metric.h

src/sp-metrics.cpp

src/sp-metrics.h

src/unit-constants.h

files modified:
AUTHORS

src/CMakeLists.txt

src/Makefile_insert

src/arc-context.cpp

src/box3d-context.cpp

src/desktop-events.cpp

src/desktop.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/document.cpp

src/document.h

src/doxygen-main.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/emf-win32-inout.cpp

src/extension/internal/emf-win32-print.cpp

src/extension/internal/gdkpixbuf-input.cpp

src/extension/internal/latex-pstricks.cpp

src/extension/internal/latex-text-renderer.cpp

src/extension/internal/pdfinput/pdf-parser.cpp

src/extension/internal/pdfinput/svg-builder.cpp

src/flood-context.cpp

src/flood-context.h

src/helper/Makefile_insert

src/helper/pixbuf-ops.cpp

src/live_effects/lpe-path_length.cpp

src/live_effects/lpe-ruler.cpp

src/live_effects/parameter/unit.cpp

src/live_effects/parameter/unit.h

src/lpe-tool-context.cpp

src/lpe-tool-context.h

src/main.cpp

src/measure-context.cpp

src/pen-context.cpp

src/preferences.cpp

src/rect-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/snap-preferences.h

src/sp-guide.cpp

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-text.cpp

src/spiral-context.cpp

src/star-context.cpp

src/style.cpp

src/svg/svg-length.cpp

src/text-context.cpp

src/text-editing.cpp

src/ui/CMakeLists.txt

src/ui/clipboard.cpp

src/ui/dialog/clonetiler.cpp

src/ui/dialog/clonetiler.h

src/ui/dialog/document-properties.cpp

src/ui/dialog/export.cpp

src/ui/dialog/export.h

src/ui/dialog/guides.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/print.cpp

src/ui/dialog/text-edit.cpp

src/ui/tool/node.cpp

src/ui/widget/Makefile_insert

src/ui/widget/page-sizer.cpp

src/ui/widget/page-sizer.h

src/ui/widget/registered-widget.cpp

src/ui/widget/registered-widget.h

src/ui/widget/rendering-options.cpp

src/ui/widget/scalar-unit.cpp

src/ui/widget/selected-style.cpp

src/ui/widget/selected-style.h

src/ui/widget/style-swatch.cpp

src/ui/widget/style-swatch.h

src/ui/widget/unit-menu.cpp

src/ui/widget/unit-menu.h

src/util/expression-evaluator.cpp

src/util/units.cpp

src/util/units.h

src/widgets/arc-toolbar.cpp

src/widgets/box3d-toolbar.cpp

src/widgets/calligraphy-toolbar.cpp

src/widgets/connector-toolbar.cpp

src/widgets/desktop-widget.cpp

src/widgets/dropper-toolbar.cpp

src/widgets/eraser-toolbar.cpp

src/widgets/font-selector.cpp

src/widgets/gradient-toolbar.cpp

src/widgets/lpe-toolbar.cpp

src/widgets/measure-toolbar.cpp

src/widgets/mesh-toolbar.cpp

src/widgets/node-toolbar.cpp

src/widgets/paintbucket-toolbar.cpp

src/widgets/pencil-toolbar.cpp

src/widgets/rect-toolbar.cpp

src/widgets/ruler.cpp

src/widgets/ruler.h

src/widgets/select-toolbar.cpp

src/widgets/spiral-toolbar.cpp

src/widgets/spray-toolbar.cpp

src/widgets/spw-utilities.cpp

src/widgets/spw-utilities.h

src/widgets/star-toolbar.cpp

src/widgets/stroke-style.cpp

src/widgets/stroke-style.h

src/widgets/text-toolbar.cpp

src/widgets/toolbox.cpp

src/widgets/toolbox.h

src/widgets/tweak-toolbar.cpp

src/widgets/zoom-toolbar.cpp

Show diffs side-by-side

added added

removed removed

#include "file.h"

#include "helper/action.h"

#include "helper/action-context.h"

#include "helper/units.h"

#include "helper/unit-tracker.h"

#include "util/units.h"

#include "ui/widget/unit-tracker.h"

#include "inkscape-private.h"

#include "interface.h"

#include "macros.h"

using Inkscape::round;

#endif

using Inkscape::UnitTracker;

using Inkscape::UI::Widget::UnitTracker;

using Inkscape::UI::UXManager;

using Inkscape::UI::ToolboxFactory;

using ege::AppearTimeTracker;

using Inkscape::Util::unit_table;

enum {

ACTIVATE,

393

394

GtkWidget *eventbox = gtk_event_box_new ();

394

395

dtw->hruler = sp_ruler_new(GTK_ORIENTATION_HORIZONTAL);

395

396

dtw->hruler_box = eventbox;

396

sp_ruler_set_unit(SP_RULER(dtw->hruler), SP_PT);

397

gtk_widget_set_tooltip_text (dtw->hruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))));

397

Inkscape::Util::Unit pt = unit_table.getUnit("pt");

398

sp_ruler_set_unit(SP_RULER(dtw->hruler), pt);

399

gtk_widget_set_tooltip_text (dtw->hruler_box, gettext(pt.name_plural.c_str()));

398

400

gtk_container_add (GTK_CONTAINER (eventbox), dtw->hruler);

399

401

g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_hruler_event), dtw);

400

402

g_signal_connect (G_OBJECT (eventbox), "button_release_event", G_CALLBACK (sp_dt_hruler_event), dtw);

422

424

eventbox = gtk_event_box_new ();

423

425

dtw->vruler = sp_ruler_new(GTK_ORIENTATION_VERTICAL);

424

426

dtw->vruler_box = eventbox;

425

sp_ruler_set_unit (SP_RULER (dtw->vruler), SP_PT);

426

gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))));

427

sp_ruler_set_unit (SP_RULER (dtw->vruler), pt);

428

gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(pt.name_plural.c_str()));

427

429

gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (dtw->vruler));

428

430

429

431

#if GTK_CHECK_VERSION(3,0,0)

1674

1676

{

1675

1677

SPDesktopWidget *dtw = static_cast<SPDesktopWidget*>(g_object_new(SP_TYPE_DESKTOP_WIDGET, NULL));

1676

1678

1677

dtw->dt2r = 1.0 / namedview->doc_units->unittobase;

1679

dtw->dt2r = 1. / namedview->doc_units->factor;

1678

1680

1679

1681

dtw->ruler_origin = Geom::Point(0,0); //namedview->gridorigin; Why was the grid origin used here?

1680

1682

1746

1748

SPNamedView *nv=SP_NAMEDVIEW(obj);

1747

1749

1748

1750

if (flags & SP_OBJECT_MODIFIED_FLAG) {

1749

this->dt2r = 1.0 / nv->doc_units->unittobase;

1751

this->dt2r = 1. / nv->doc_units->factor;

1750

1752

this->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here?

1751

1753

1752

sp_ruler_set_unit(SP_RULER (this->vruler), nv->getDefaultMetric());

1753

sp_ruler_set_unit(SP_RULER (this->hruler), nv->getDefaultMetric());

1754

sp_ruler_set_unit(SP_RULER (this->vruler), nv->getDefaultUnit());

1755

sp_ruler_set_unit(SP_RULER (this->hruler), nv->getDefaultUnit());

1754

1756

1755

1757

/* This loops through all the grandchildren of aux toolbox,

1756

1758

* and for each that it finds, it performs an sp_search_by_data_recursive(),

1786

1788

} // children

1787

1789

} // if aux_toolbox is a container

1788

1790

1789

gtk_widget_set_tooltip_text(this->hruler_box, gettext(sp_unit_get_plural (nv->doc_units)));

1790

gtk_widget_set_tooltip_text(this->vruler_box, gettext(sp_unit_get_plural (nv->doc_units)));

1791

gtk_widget_set_tooltip_text(this->hruler_box, gettext(nv->doc_units->name_plural.c_str()));

1792

gtk_widget_set_tooltip_text(this->vruler_box, gettext(nv->doc_units->name_plural.c_str()));

1791

1793

1792

1794

sp_desktop_widget_update_rulers(this);

1793

1795

ToolboxFactory::updateSnapToolbox(this->desktop, 0, this->snap_toolbox);

Older »