~liampwhite/inkscape/inkscape

« back to all changes in this revision

Viewing changes to src/ui/dialog/dialog.cpp

Committer: Jabiertxof
Date: 2014-03-30 22:08:13 UTC
mfrom: (13090.1.146 inkscape)
mto: (11950.1.339 bspline+spirolive) (13090.1.252 inkscape)
mto: This revision was merged to the branch mainline in revision 13163.
Revision ID: jtx@jtx.marker.es-20140330220813-2tx5soz31e38f7ic

update to trunk

files added:
src/ui/dialog/arrange-tab.h

src/ui/dialog/grid-arrange-tab.cpp

src/ui/dialog/grid-arrange-tab.h

src/ui/dialog/polar-arrange-tab.cpp

src/ui/dialog/polar-arrange-tab.h

src/ui/widget/anchor-selector.cpp

src/ui/widget/anchor-selector.h

files removed:
src/modifier-fns.h

files modified:
configure.ac

po/POTFILES.in

share/icons/icons.svg

share/icons/tango_icons.svg

share/keys/default.xml

share/keys/inkscape.xml

share/keys/macromedia-freehand-mx.xml

share/keys/right-handed-illustration.xml

share/keys/xara.xml

src/CMakeLists.txt

src/Makefile_insert

src/display/canvas-axonomgrid.cpp

src/display/canvas-grid.cpp

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/io/inkjar.cpp

src/io/inkjar.h

src/knot-holder-entity.cpp

src/knot-holder-entity.h

src/knot.cpp

src/knot.h

src/knotholder.cpp

src/knotholder.h

src/libuemf/uemf.h

src/libuemf/uemf_endian.c

src/libuemf/upmf.c

src/libuemf/uwmf_endian.c

src/main.cpp

src/menus-skeleton.h

src/seltrans.cpp

src/seltrans.h

src/sp-guide.cpp

src/ui/CMakeLists.txt

src/ui/dialog/Makefile_insert

src/ui/dialog/dialog-manager.cpp

src/ui/dialog/dialog.cpp

src/ui/dialog/document-metadata.cpp

src/ui/dialog/document-properties.cpp

src/ui/dialog/fill-and-stroke.cpp

src/ui/dialog/guides.cpp

src/ui/dialog/guides.h

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/input.cpp

src/ui/dialog/layer-properties.cpp

src/ui/dialog/layers.cpp

src/ui/dialog/livepatheffect-editor.cpp

src/ui/dialog/new-from-template.cpp

src/ui/dialog/pixelartdialog.cpp

src/ui/dialog/swatches.cpp

src/ui/dialog/template-load-tab.cpp

src/ui/dialog/template-widget.cpp

src/ui/dialog/tile.cpp

src/ui/dialog/tile.h

src/ui/dialog/tracedialog.cpp

src/ui/previewholder.cpp

src/ui/tool/node.h

src/ui/tools/connector-tool.cpp

src/ui/tools/connector-tool.h

src/ui/tools/pencil-tool.cpp

src/ui/tools/pencil-tool.h

src/ui/tools/tool-base.cpp

src/ui/tools/tool-base.h

src/ui/widget/Makefile_insert

src/ui/widget/licensor.cpp

src/ui/widget/panel.cpp

src/ui/widget/registered-widget.cpp

src/ui/widget/tolerance-slider.cpp

src/util/unordered-containers.h

src/vanishing-point.cpp

src/vanishing-point.h

src/verbs.cpp

src/verbs.h

src/widgets/stroke-style.cpp

Show diffs side-by-side

added added

removed removed

src/ui/dialog/dialog.cpp

#include "ui/tools/tool-base.h"

#include "desktop.h"

#include "desktop-handles.h"

#include "modifier-fns.h"

#include "shortcuts.h"

#include "preferences.h"

#include "interface.h"

#include "verbs.h"

#include "ui/tool/event-utils.h"

#include <gtk/gtk.h>

279

case GDK_KEY_F4:

280

case GDK_KEY_w:

281

case GDK_KEY_W: {

282

if (mod_ctrl_only(event->key.state)) {

282

if (Inkscape::UI::held_only_control(event->key)) {

283

_close();

284

ret = true;

285

}

Older »