summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt917
-rw-r--r--src/attribute-sort-util.cpp9
-rw-r--r--src/ui/dialog/aboutbox.cpp24
-rw-r--r--src/ui/dialog/svg-fonts-dialog.cpp2
-rw-r--r--src/xml/event.h14
5 files changed, 489 insertions, 477 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 393ffa5ab..b2890da74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,463 +2,444 @@
# Define the main source
# -----------------------------------------------------------------------------
-set(main_SRC
- main.cpp
-)
-
set(sp_SRC
- attribute-rel-css.cpp
- attribute-rel-svg.cpp
- attribute-rel-util.cpp
- attribute-sort-util.cpp
- sp-anchor.cpp
- sp-clippath.cpp
- sp-conn-end-pair.cpp
- sp-conn-end.cpp
- sp-cursor.cpp
- sp-defs.cpp
- sp-desc.cpp
- sp-ellipse.cpp
- sp-factory.cpp
- sp-filter-primitive.cpp
- sp-filter-reference.cpp
- sp-filter.cpp
- sp-flowdiv.cpp
- sp-flowregion.cpp
- sp-flowtext.cpp
- sp-font-face.cpp
- sp-font.cpp
- sp-glyph-kerning.cpp
- sp-glyph.cpp
- sp-gradient-reference.cpp
- sp-gradient.cpp
- sp-guide.cpp
- sp-hatch-path.cpp
- sp-hatch.cpp
- sp-image.cpp
- sp-item-group.cpp
- sp-item-notify-moveto.cpp
- sp-item-rm-unsatisfied-cns.cpp
- sp-item-transform.cpp
- sp-item-update-cns.cpp
- sp-item.cpp
- sp-line.cpp
- sp-linear-gradient.cpp
- sp-lpe-item.cpp
- sp-marker.cpp
- sp-mask.cpp
- sp-mesh-array.cpp
- sp-mesh-patch.cpp
- sp-mesh-row.cpp
- sp-mesh.cpp
- sp-metadata.cpp
- sp-missing-glyph.cpp
- sp-namedview.cpp
- sp-object-group.cpp
- sp-object.cpp
- sp-offset.cpp
- sp-paint-server.cpp
- sp-path.cpp
- sp-pattern.cpp
- sp-polygon.cpp
- sp-polyline.cpp
- sp-radial-gradient.cpp
- sp-rect.cpp
- sp-root.cpp
- sp-script.cpp
- sp-shape.cpp
- sp-solid-color.cpp
- sp-spiral.cpp
- sp-star.cpp
- sp-stop.cpp
- sp-string.cpp
- sp-style-elem.cpp
- sp-switch.cpp
- sp-symbol.cpp
- sp-tag-use-reference.cpp
- sp-tag-use.cpp
- sp-tag.cpp
- sp-text.cpp
- sp-title.cpp
- sp-tref-reference.cpp
- sp-tref.cpp
- sp-tspan.cpp
- sp-use-reference.cpp
- sp-use.cpp
- splivarot.cpp
- viewbox.cpp
-
- # -------
- # Headers
- attribute-rel-css.h
- attribute-rel-svg.h
- attribute-rel-util.h
- attribute-sort-util.h
- sp-anchor.h
- sp-clippath.h
- sp-conn-end-pair.h
- sp-conn-end.h
- sp-cursor.h
- sp-defs.h
- sp-desc.h
- sp-ellipse.h
- sp-factory.h
- sp-filter-primitive.h
- sp-filter-reference.h
- sp-filter-units.h
- sp-filter.h
- sp-flowdiv.h
- sp-flowregion.h
- sp-flowtext.h
- sp-font-face.h
- sp-font.h
- sp-glyph-kerning.h
- sp-glyph.h
- sp-gradient-reference.h
- sp-gradient-spread.h
- sp-gradient-test.h
- sp-gradient-units.h
- sp-gradient-vector.h
- sp-gradient.h
- sp-guide-attachment.h
- sp-guide-constraint.h
- sp-guide.h
- sp-hatch-path.h
- sp-hatch.h
- sp-image.h
- sp-item-group.h
- sp-item-notify-moveto.h
- sp-item-rm-unsatisfied-cns.h
- sp-item-transform.h
- sp-item-update-cns.h
- sp-item.h
- sp-line.h
- sp-linear-gradient.h
- sp-lpe-item.h
- sp-marker-loc.h
- sp-marker.h
- sp-mask.h
- sp-mesh-array.h
- sp-mesh-patch.h
- sp-mesh-row.h
- sp-mesh.h
- sp-metadata.h
- sp-missing-glyph.h
- sp-namedview.h
- sp-object-group.h
- sp-object.h
- sp-offset.h
- sp-paint-server-reference.h
- sp-paint-server.h
- sp-path.h
- sp-pattern.h
- sp-polygon.h
- sp-polyline.h
- sp-radial-gradient.h
- sp-rect.h
- sp-root.h
- sp-script.h
- sp-shape.h
- sp-solid-color.h
- sp-spiral.h
- sp-star.h
- sp-stop.h
- sp-string.h
- sp-style-elem-test.h
- sp-style-elem.h
- sp-switch.h
- sp-symbol.h
- sp-tag.h
- sp-tag-use.h
- sp-tag-use-reference.h
- sp-text.h
- sp-textpath.h
- sp-title.h
- sp-tref-reference.h
- sp-tref.h
- sp-tspan.h
- sp-use-reference.h
- sp-use.h
- viewbox.h
+ attribute-rel-css.cpp
+ attribute-rel-svg.cpp
+ attribute-rel-util.cpp
+ attribute-sort-util.cpp
+ sp-anchor.cpp
+ sp-clippath.cpp
+ sp-conn-end-pair.cpp
+ sp-conn-end.cpp
+ sp-cursor.cpp
+ sp-defs.cpp
+ sp-desc.cpp
+ sp-ellipse.cpp
+ sp-factory.cpp
+ sp-filter-primitive.cpp
+ sp-filter-reference.cpp
+ sp-filter.cpp
+ sp-flowdiv.cpp
+ sp-flowregion.cpp
+ sp-flowtext.cpp
+ sp-font-face.cpp
+ sp-font.cpp
+ sp-glyph-kerning.cpp
+ sp-glyph.cpp
+ sp-gradient-reference.cpp
+ sp-gradient.cpp
+ sp-guide.cpp
+ sp-hatch-path.cpp
+ sp-hatch.cpp
+ sp-image.cpp
+ sp-item-group.cpp
+ sp-item-notify-moveto.cpp
+ sp-item-rm-unsatisfied-cns.cpp
+ sp-item-transform.cpp
+ sp-item-update-cns.cpp
+ sp-item.cpp
+ sp-line.cpp
+ sp-linear-gradient.cpp
+ sp-lpe-item.cpp
+ sp-marker.cpp
+ sp-mask.cpp
+ sp-mesh-array.cpp
+ sp-mesh-patch.cpp
+ sp-mesh-row.cpp
+ sp-mesh.cpp
+ sp-metadata.cpp
+ sp-missing-glyph.cpp
+ sp-namedview.cpp
+ sp-object-group.cpp
+ sp-object.cpp
+ sp-offset.cpp
+ sp-paint-server.cpp
+ sp-path.cpp
+ sp-pattern.cpp
+ sp-polygon.cpp
+ sp-polyline.cpp
+ sp-radial-gradient.cpp
+ sp-rect.cpp
+ sp-root.cpp
+ sp-script.cpp
+ sp-shape.cpp
+ sp-solid-color.cpp
+ sp-spiral.cpp
+ sp-star.cpp
+ sp-stop.cpp
+ sp-string.cpp
+ sp-style-elem.cpp
+ sp-switch.cpp
+ sp-symbol.cpp
+ sp-tag-use-reference.cpp
+ sp-tag-use.cpp
+ sp-tag.cpp
+ sp-text.cpp
+ sp-title.cpp
+ sp-tref-reference.cpp
+ sp-tref.cpp
+ sp-tspan.cpp
+ sp-use-reference.cpp
+ sp-use.cpp
+ splivarot.cpp
+ viewbox.cpp
+
+ # -------
+ # Headers
+ attribute-rel-css.h
+ attribute-rel-svg.h
+ attribute-rel-util.h
+ attribute-sort-util.h
+ sp-anchor.h
+ sp-clippath.h
+ sp-conn-end-pair.h
+ sp-conn-end.h
+ sp-cursor.h
+ sp-defs.h
+ sp-desc.h
+ sp-ellipse.h
+ sp-factory.h
+ sp-filter-primitive.h
+ sp-filter-reference.h
+ sp-filter-units.h
+ sp-filter.h
+ sp-flowdiv.h
+ sp-flowregion.h
+ sp-flowtext.h
+ sp-font-face.h
+ sp-font.h
+ sp-glyph-kerning.h
+ sp-glyph.h
+ sp-gradient-reference.h
+ sp-gradient-spread.h
+ sp-gradient-test.h
+ sp-gradient-units.h
+ sp-gradient-vector.h
+ sp-gradient.h
+ sp-guide-attachment.h
+ sp-guide-constraint.h
+ sp-guide.h
+ sp-hatch-path.h
+ sp-hatch.h
+ sp-image.h
+ sp-item-group.h
+ sp-item-notify-moveto.h
+ sp-item-rm-unsatisfied-cns.h
+ sp-item-transform.h
+ sp-item-update-cns.h
+ sp-item.h
+ sp-line.h
+ sp-linear-gradient.h
+ sp-lpe-item.h
+ sp-marker-loc.h
+ sp-marker.h
+ sp-mask.h
+ sp-mesh-array.h
+ sp-mesh-patch.h
+ sp-mesh-row.h
+ sp-mesh.h
+ sp-metadata.h
+ sp-missing-glyph.h
+ sp-namedview.h
+ sp-object-group.h
+ sp-object.h
+ sp-offset.h
+ sp-paint-server-reference.h
+ sp-paint-server.h
+ sp-path.h
+ sp-pattern.h
+ sp-polygon.h
+ sp-polyline.h
+ sp-radial-gradient.h
+ sp-rect.h
+ sp-root.h
+ sp-script.h
+ sp-shape.h
+ sp-solid-color.h
+ sp-spiral.h
+ sp-star.h
+ sp-stop.h
+ sp-string.h
+ sp-style-elem-test.h
+ sp-style-elem.h
+ sp-switch.h
+ sp-symbol.h
+ sp-tag.h
+ sp-tag-use.h
+ sp-tag-use-reference.h
+ sp-text.h
+ sp-textpath.h
+ sp-title.h
+ sp-tref-reference.h
+ sp-tref.h
+ sp-tspan.h
+ sp-use-reference.h
+ sp-use.h
+ viewbox.h
)
set(inkscape_SRC
- attributes.cpp
- axis-manip.cpp
- box3d-side.cpp
- box3d.cpp
- color-profile.cpp
- color.cpp
- composite-undo-stack-observer.cpp
- conditions.cpp
- conn-avoid-ref.cpp
- console-output-undo-observer.cpp
- context-fns.cpp
- desktop-events.cpp
- desktop-style.cpp
- desktop.cpp
- device-manager.cpp
- dir-util.cpp
- document-subset.cpp
- document-undo.cpp
- document.cpp
- ege-color-prof-tracker.cpp
- event-log.cpp
- extract-uri.cpp
- file.cpp
- filter-chemistry.cpp
- filter-enums.cpp
- gc-anchored.cpp
- gc-finalized.cpp
- gradient-chemistry.cpp
- gradient-drag.cpp
- graphlayout.cpp
- guide-snapper.cpp
- help.cpp
- id-clash.cpp
- inkscape.cpp
- knot-holder-entity.cpp
- knot-ptr.cpp
- knot.cpp
- knotholder.cpp
- layer-fns.cpp
- layer-manager.cpp
- layer-model.cpp
- line-geometry.cpp
- line-snapper.cpp
- main-cmdlineact.cpp
- media.cpp
- message-context.cpp
- message-stack.cpp
- mod360.cpp
- object-hierarchy.cpp
- object-set.cpp
- object-snapper.cpp
- path-chemistry.cpp
- persp3d-reference.cpp
- persp3d.cpp
- perspective-line.cpp
- preferences.cpp
- prefix.cpp
- print.cpp
- profile-manager.cpp
- proj_pt.cpp
- pure-transform.cpp
- rdf.cpp
- removeoverlap.cpp
- resource-manager.cpp
- rubberband.cpp
- satisfied-guide-cns.cpp
- selcue.cpp
- selection-chemistry.cpp
- selection-describer.cpp
- selection.cpp
- seltrans-handles.cpp
- seltrans.cpp
- shortcuts.cpp
- snap-preferences.cpp
- snap.cpp
- snapped-curve.cpp
- snapped-line.cpp
- snapped-point.cpp
- snapper.cpp
- style-internal.cpp
- style.cpp
- svg-view-widget.cpp
- svg-view.cpp
- text-chemistry.cpp
- text-editing.cpp
- transf_mat_3x4.cpp
- unclump.cpp
- unicoderange.cpp
- uri-references.cpp
- uri.cpp
- vanishing-point.cpp
- verbs.cpp
- version.cpp
-
- # -------
- # Headers
- MultiPrinter.h
- PylogFormatter.h
- TRPIFormatter.h
- attributes-test.h
- attributes.h
- axis-manip.h
- bad-uri-exception.h
- box3d-side.h
- box3d.h
- cms-color-types.h
- cms-system.h
- color-profile-cms-fns.h
- color-profile-test.h
- color-profile.h
- color-rgba.h
- color.h
- colorspace.h
- composite-undo-stack-observer.h
- conditions.h
- conn-avoid-ref.h
- console-output-undo-observer.h
- context-fns.h
- decimal-round.h
- desktop-events.h
- desktop-style.h
- desktop.h
- device-manager.h
- dir-util-test.h
- dir-util.h
- document-private.h
- document-subset.h
- document-undo.h
- document.h
- ege-color-prof-tracker.h
- enums.h
- event-log.h
- event.h
- extract-uri-test.h
- extract-uri.h
- file.h
- fill-or-stroke.h
- filter-chemistry.h
- filter-enums.h
- gc-anchored.h
- gc-finalized.h
- gradient-chemistry.h
- gradient-drag.h
- graphlayout.h
- guide-snapper.h
- help.h
- helper-fns.h
- icon-size.h
- id-clash.h
- inkscape-version.h
- inkscape.h
- isinf.h
- knot-enums.h
- knot-holder-entity.h
- knot-ptr.h
- knot.h
- knotholder.h
- layer-fns.h
- layer-manager.h
- layer-model.h
- line-geometry.h
- line-snapper.h
- macros.h
- main-cmdlineact.h
- marker-test.h
- media.h
- menus-skeleton.h
- message-context.h
- message-stack.h
- message.h
- mod360-test.h
- mod360.h
- number-opt-number.h
- object-hierarchy.h
- object-set.h
- object-snapper.h
- object-test.h
- path-chemistry.h
- path-prefix.h
- persp3d-reference.h
- persp3d.h
- perspective-line.h
- preferences-skeleton.h
- preferences-test.h
- preferences.h
- prefix.h
- print.h
- profile-manager.h
- proj_pt.h
- pure-transform.h
- rdf.h
- remove-last.h
- removeoverlap.h
- require-config.h
- resource-manager.h
- round-test.h
- round.h
- rubberband.h
- satisfied-guide-cns.h
- selcue.h
- selection-chemistry.h
- selection-describer.h
- selection.h
- seltrans-handles.h
- seltrans.h
- shortcuts.h
- snap-candidate.h
- snap-enums.h
- snap-preferences.h
- snap.h
- snapped-curve.h
- snapped-line.h
- snapped-point.h
- snapper.h
- splivarot.h
- streq.h
- strneq.h
- style-enums.h
- style-internal.h
- style-test.h
- style.h
- svg-profile.h
- svg-view-widget.h
- svg-view.h
- syseq.h
- test-helpers.h
- text-chemistry.h
- text-editing.h
- text-tag-attributes.h
- transf_mat_3x4.h
- unclump.h
- undo-stack-observer.h
- unicoderange.h
- uri-references.h
- uri-test.h
- uri.h
- vanishing-point.h
- verbs-test.h
- verbs.h
- version.h
+ attributes.cpp
+ axis-manip.cpp
+ box3d-side.cpp
+ box3d.cpp
+ color-profile.cpp
+ color.cpp
+ composite-undo-stack-observer.cpp
+ conditions.cpp
+ conn-avoid-ref.cpp
+ console-output-undo-observer.cpp
+ context-fns.cpp
+ desktop-events.cpp
+ desktop-style.cpp
+ desktop.cpp
+ device-manager.cpp
+ dir-util.cpp
+ document-subset.cpp
+ document-undo.cpp
+ document.cpp
+ ege-color-prof-tracker.cpp
+ event-log.cpp
+ extract-uri.cpp
+ file.cpp
+ filter-chemistry.cpp
+ filter-enums.cpp
+ gc-anchored.cpp
+ gc-finalized.cpp
+ gradient-chemistry.cpp
+ gradient-drag.cpp
+ graphlayout.cpp
+ guide-snapper.cpp
+ help.cpp
+ id-clash.cpp
+ inkscape.cpp
+ knot-holder-entity.cpp
+ knot-ptr.cpp
+ knot.cpp
+ knotholder.cpp
+ layer-fns.cpp
+ layer-manager.cpp
+ layer-model.cpp
+ line-geometry.cpp
+ line-snapper.cpp
+ main-cmdlineact.cpp
+ media.cpp
+ message-context.cpp
+ message-stack.cpp
+ mod360.cpp
+ object-hierarchy.cpp
+ object-set.cpp
+ object-snapper.cpp
+ path-chemistry.cpp
+ persp3d-reference.cpp
+ persp3d.cpp
+ perspective-line.cpp
+ preferences.cpp
+ prefix.cpp
+ print.cpp
+ profile-manager.cpp
+ proj_pt.cpp
+ pure-transform.cpp
+ rdf.cpp
+ removeoverlap.cpp
+ resource-manager.cpp
+ rubberband.cpp
+ satisfied-guide-cns.cpp
+ selcue.cpp
+ selection-chemistry.cpp
+ selection-describer.cpp
+ selection.cpp
+ seltrans-handles.cpp
+ seltrans.cpp
+ shortcuts.cpp
+ snap-preferences.cpp
+ snap.cpp
+ snapped-curve.cpp
+ snapped-line.cpp
+ snapped-point.cpp
+ snapper.cpp
+ style-internal.cpp
+ style.cpp
+ svg-view-widget.cpp
+ svg-view.cpp
+ text-chemistry.cpp
+ text-editing.cpp
+ transf_mat_3x4.cpp
+ unclump.cpp
+ unicoderange.cpp
+ uri-references.cpp
+ uri.cpp
+ vanishing-point.cpp
+ verbs.cpp
+ version.cpp
+
+ # -------
+ # Headers
+ MultiPrinter.h
+ PylogFormatter.h
+ TRPIFormatter.h
+ attributes-test.h
+ attributes.h
+ axis-manip.h
+ bad-uri-exception.h
+ box3d-side.h
+ box3d.h
+ cms-color-types.h
+ cms-system.h
+ color-profile-cms-fns.h
+ color-profile-test.h
+ color-profile.h
+ color-rgba.h
+ color.h
+ colorspace.h
+ composite-undo-stack-observer.h
+ conditions.h
+ conn-avoid-ref.h
+ console-output-undo-observer.h
+ context-fns.h
+ decimal-round.h
+ desktop-events.h
+ desktop-style.h
+ desktop.h
+ device-manager.h
+ dir-util-test.h
+ dir-util.h
+ document-private.h
+ document-subset.h
+ document-undo.h
+ document.h
+ ege-color-prof-tracker.h
+ enums.h
+ event-log.h
+ event.h
+ extract-uri-test.h
+ extract-uri.h
+ file.h
+ fill-or-stroke.h
+ filter-chemistry.h
+ filter-enums.h
+ gc-anchored.h
+ gc-finalized.h
+ gradient-chemistry.h
+ gradient-drag.h
+ graphlayout.h
+ guide-snapper.h
+ help.h
+ helper-fns.h
+ icon-size.h
+ id-clash.h
+ inkscape-version.h
+ inkscape.h
+ isinf.h
+ knot-enums.h
+ knot-holder-entity.h
+ knot-ptr.h
+ knot.h
+ knotholder.h
+ layer-fns.h
+ layer-manager.h
+ layer-model.h
+ line-geometry.h
+ line-snapper.h
+ macros.h
+ main-cmdlineact.h
+ marker-test.h
+ media.h
+ menus-skeleton.h
+ message-context.h
+ message-stack.h
+ message.h
+ mod360-test.h
+ mod360.h
+ number-opt-number.h
+ object-hierarchy.h
+ object-set.h
+ object-snapper.h
+ object-test.h
+ path-chemistry.h
+ path-prefix.h
+ persp3d-reference.h
+ persp3d.h
+ perspective-line.h
+ preferences-skeleton.h
+ preferences-test.h
+ preferences.h
+ prefix.h
+ print.h
+ profile-manager.h
+ proj_pt.h
+ pure-transform.h
+ rdf.h
+ remove-last.h
+ removeoverlap.h
+ require-config.h
+ resource-manager.h
+ round-test.h
+ round.h
+ rubberband.h
+ satisfied-guide-cns.h
+ selcue.h
+ selection-chemistry.h
+ selection-describer.h
+ selection.h
+ seltrans-handles.h
+ seltrans.h
+ shortcuts.h
+ snap-candidate.h
+ snap-enums.h
+ snap-preferences.h
+ snap.h
+ snapped-curve.h
+ snapped-line.h
+ snapped-point.h
+ snapper.h
+ splivarot.h
+ streq.h
+ strneq.h
+ style-enums.h
+ style-internal.h
+ style-test.h
+ style.h
+ svg-profile.h
+ svg-view-widget.h
+ svg-view.h
+ syseq.h
+ test-helpers.h
+ text-chemistry.h
+ text-editing.h
+ text-tag-attributes.h
+ transf_mat_3x4.h
+ unclump.h
+ undo-stack-observer.h
+ unicoderange.h
+ uri-references.h
+ uri-test.h
+ uri.h
+ vanishing-point.h
+ verbs-test.h
+ verbs.h
+ version.h
)
-if(WIN32)
- list(APPEND inkscape_SRC
- inkscape.rc
- registrytool.cpp
- #deptool.cpp
- winconsole.cpp
- winmain.cpp
-
- # -------
- # Headers
- registrytool.h
- )
-endif()
-
-
# -----------------------------------------------------------------------------
# Generate version file
# -----------------------------------------------------------------------------
# a custom target that is always built
add_custom_target(
- inkscape_version ALL
- COMMAND ${CMAKE_COMMAND}
- -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
- -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR}
- -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake)
+ inkscape_version ALL
+ COMMAND ${CMAKE_COMMAND}
+ -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+ -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR}
+ -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake)
# buildinfo.h is a generated file
set_source_files_properties(
- ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp
- PROPERTIES GENERATED TRUE)
+ ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp
+ PROPERTIES GENERATED TRUE)
list(APPEND inkscape_SRC
- ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp
+ ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp
)
@@ -483,7 +464,6 @@ add_subdirectory(widgets)
add_subdirectory(xml)
add_subdirectory(2geom)
-
# Directories containing lists files that describe building internal libraries
add_subdirectory(libavoid)
add_subdirectory(libcola)
@@ -496,12 +476,11 @@ add_subdirectory(livarot)
add_subdirectory(libnrtype)
add_subdirectory(libdepixelize)
-
get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC)
set(inkscape_SRC
- ${inkscape_global_SRC}
- ${inkscape_SRC}
+ ${inkscape_global_SRC}
+ ${inkscape_SRC}
)
# -----------------------------------------------------------------------------
@@ -510,12 +489,32 @@ set(inkscape_SRC
#add_inkscape_lib(sp_LIB "${sp_SRC}")
#add_inkscape_lib(inkscape_LIB "${inkscape_SRC}")
+if(WIN32)
+ # Sources for the inkscape executable on Windows.
+ set(main_SRC
+ registrytool.h
+ registrytool.cpp
+ main.cpp
+ winmain.cpp
+ #winconsole.cpp
+ )
+
+ # Add the platform specific resource files (enabling the app icon).
+ if(${HAVE_MINGW64})
+ list(APPEND main_SRC inkscape-x64.rc)
+ else()
+ list(APPEND main_SRC inkscape.rc)
+ endif()
+else()
+ set(main_SRC main.cpp)
+endif()
+
# Build everything except main and inkview.c in a shared library.
add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC})
# make executables for inkscape and inkview
-add_executable(inkscape ${main_SRC} )
-add_executable(inkview inkview.cpp )
+add_executable(inkscape ${main_SRC})
+add_executable(inkview inkview.cpp)
add_dependencies(inkscape inkscape_version)
@@ -527,11 +526,9 @@ set(INKSCAPE_TARGET_LIBS
# order from automake
#sp_LIB
#nrtype_LIB
-
#inkscape_LIB
#sp_LIB # annoying, we need both!
nrtype_LIB # annoying, we need both!
-
croco_LIB
avoid_LIB
cola_LIB
@@ -550,22 +547,20 @@ if (NOT "${WITH_EXT_GDL}")
list (INSERT INKSCAPE_TARGET_LIBS 0 "gdl_LIB")
endif()
-
-
-
# Link the inkscape_base library against all external dependencies
target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS})
# Link inkscape and inkview against inkscape_base
-target_link_libraries(inkscape inkscape_base )
+target_link_libraries(inkscape inkscape_base)
target_link_libraries(inkview inkscape_base)
-#Define the installation
-install(
- TARGETS inkscape_base inkscape inkview
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/inkscape
- ARCHIVE DESTINATION lib/inkscape
- )
-
-
+if(NOT WIN32)
+ #Define the installation
+ install(TARGETS
+ inkscape_base
+ inkscape
+ inkview
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib/inkscape
+ ARCHIVE DESTINATION lib/inkscape)
+endif()
diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
index d0f45c418..5c01f7914 100644
--- a/src/attribute-sort-util.cpp
+++ b/src/attribute-sort-util.cpp
@@ -105,12 +105,17 @@ void sp_attribute_sort_element(Node *repr) {
//for (auto it: my_list) {
for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
it != my_list.end(); ++it) {
- repr->setAttribute( it->first.c_str(), NULL, false );
+ // Removing "inkscape:label" results in crash when Layers dialog is open.
+ if (it->first != "inkscape:label") {
+ repr->setAttribute( it->first.c_str(), NULL, false );
+ }
}
// Insert all attributes in proper order
for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
it != my_list.end(); ++it) {
- repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+ if (it->first != "inkscape:label") {
+ repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+ }
}
}
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 1a87a9718..6276d3391 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -467,7 +467,8 @@ void AboutBox::initStrings() {
"Adib Taraben <theadib@gmail.com>, 2004-2014.\n"
"Alan Monfort <alan.monfort@free.fr>, 2009-2010.\n"
"Alastair McKinstry <mckinstry@computer.org>, 2000.\n"
-"Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2006.\n"
+"Aleksandar Marković <alleksandar.markovic@gmail.com>, 2015.\n"
+"Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2009.\n"
"Alessio Frusciante <algol@firenze.linux.it>, 2002, 2003.\n"
"Alexander Shopov <ash@contact.bg>, 2006.\n"
"Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2005, 2010-2014.\n"
@@ -499,18 +500,19 @@ void AboutBox::initStrings() {
"Cédric Gemy <radar.map35@free.fr>, 2006.\n"
"Daniel Díaz <yosoy@danieldiaz.org>, 2004.\n"
"Didier Conchaudron <conchaudron@free.fr>, 2003.\n"
-"Dimitris Spingos <dmtrs32@gmail.com>, 2011-2013.\n"
+"Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2011-2015.\n"
"Dorji Tashi <dorjee_doss@hotmail.com>, 2006.\n"
"Duarte Loreto <happyguy_pt@hotmail.com> 2002, 2003 (Maintainer).\n"
"Elias Norberg <elno0959 at student.su.se>, 2009.\n"
"Equipe de Tradução Inkscape Brasil <www.inkscapebrasil.org>, 2007.\n"
"Fatih Demir <kabalak@gtranslator.org>, 2000.\n"
-"Firas Hanife <FirasHanife@gmail.com>, 2014-2015.\n"
+"Firas Hanife <FirasHanife@gmail.com>, 2014-2016.\n"
"Foppe Benedictus <foppe.benedictus@gmail.com>, 2007-2009.\n"
"Francesc Dorca <f.dorca@filnet.es>, 2003. Traducció sodipodi.\n"
"Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.\n"
"Francisco Xosé Vázquez Grandal <fxvazquez@arrakis.es>, 2001.\n"
"Frederic Rodrigo <f.rodrigo free.fr>, 2004-2005.\n"
+"Ganesh Murmu <g_murmu_in@yahoo.com>, 2014.\n"
"Ge'ez Frontier Foundation <locales@geez.org>, 2002.\n"
"George Boukeas <boukeas@gmail.com>, 2011.\n"
"Heiko Wöhrle <mail@heikowoehrle.de>, 2014.\n"
@@ -528,6 +530,7 @@ void AboutBox::initStrings() {
"Jeroen van der Vegt <jvdvegt@gmail.com>, 2003, 2005, 2008.\n"
"Jin-Hwan Jeong <yongdoria@gmail.com>, 2009.\n"
"Jonathan Ernst <jernst@users.sourceforge.net>, 2006.\n"
+"Jordi Mas i Hernàndez <jmas@softcatala.org>, 2015.\n"
"Jose Antonio Salgueiro Aquino <developer@telefonica.net>, 2003.\n"
"Josef Vybiral <josef.vybiral@gmail.com>, 2005-2006.\n"
"Juarez Rudsatz <juarez@correio.com>, 2004.\n"
@@ -542,10 +545,11 @@ void AboutBox::initStrings() {
"Kingsley Turner <kingsley@maddogsbreakfast.com.au>, 2006.\n"
"Kitae <bluetux@gmail.com>, 2006.\n"
"Kjartan Maraas <kmaraas@gnome.org>, 2000-2002.\n"
-"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2014.\n"
+"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2015.\n"
"Lauris Kaplinski <lauris@ariman.ee>, 2000.\n"
"Leandro Regueiro <leandro.regueiro@gmail.com>, 2006-2008, 2010.\n"
"Liu Xiaoqin <liuxqsmile@gmail.com>, 2008.\n"
+"Louni Kandulna <kandulna.louni@gmail.com>, 2014.\n"
"Luca Bruno <luca.br@uno.it>, 2005.\n"
"Lucas Vieites Fariña<lucas@codexion.com>, 2003-2013.\n"
"Mahesh subedi <submanesh@hotmail.com>, 2006.\n"
@@ -561,8 +565,10 @@ void AboutBox::initStrings() {
"Mufit Eribol <meribol@ere.com.tr>, 2000.\n"
"Muhammad Bashir Al-Noimi <mhdbnoimi@gmail.com>, 2008.\n"
"Myckel Habets <myckel@sdf.lonestar.org>, 2008.\n"
+"Nasreen <nasreen_saifee@hotmail.com>, 2013.\n"
"Nguyen Dinh Trung <nguyendinhtrung141@gmail.com>, 2007, 2008.\n"
-"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2014.\n"
+"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2016.\n"
+"Paresh prabhu <goa.paresh@Gmail.com>, 2013.\n"
"Pawan Chitrakar <pchitrakar@gmail.com>, 2006.\n"
"Przemysław Loesch <p_loesch@poczta.onet.pl>, 2005.\n"
"Quico Llach <quico@softcatala.org>, 2000. Traducció sodipodi.\n"
@@ -570,6 +576,8 @@ void AboutBox::initStrings() {
"Riku Leino <tsoots@gmail.com>, 2006-2011.\n"
"Rune Rønde Laursen <runerl@skjoldhoej.dk>, 2006.\n"
"Ruud Steltenpool <svg@steltenpower.com>, 2006.\n"
+"Sangeeta <sk@gma.co>, 2011.\n"
+"Savitha <savithasprasad@yahoo.co.in>, 2013.\n"
"Serdar Soytetir <sendirom@gmail.com>, 2005.\n"
"shivaken <shivaken@owls-nest.net>, 2004.\n"
"Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.\n"
@@ -577,8 +585,11 @@ void AboutBox::initStrings() {
"Spyros Blanas <cid_e@users.sourceforge.net>, 2006, 2011.\n"
"Stefan Graubner <pflaumenmus92@gmx.net>, 2005.\n"
"Supranee Thirawatthanasuk <supranee@opentle.org>, 2006.\n"
+"Sushma Joshi <shshma_joshi8266@vsnl.net>, 2011.\n"
+"Sveinn í Felli <sv1@fellsnet.is>, 2014-2015.\n"
+"Sylvain Chiron <chironsylvain@orange.fr>, 2016.\n"
"Takeshi Aihana <aihana@muc.biglobe.ne.jp>, 2000, 2001.\n"
-"Tim Sheridan <tghs@tghs.net>, 2007-2014.\n"
+"Tim Sheridan <tghs@tghs.net>, 2007-2016.\n"
"Theppitak Karoonboonyanan <thep@linux.thai.net>, 2006.\n"
"Thiago Pimentel <thiago.merces@gmail.com>, 2006.\n"
"Toshifumi Sato <sato@centrosystem.com>, 2005.\n"
@@ -592,6 +603,7 @@ void AboutBox::initStrings() {
"Vital Khilko <dojlid@mova.org>, 2003.\n"
"Vitaly Lipatov <lav@altlinux.ru>, 2002, 2004.\n"
"vonHalenbach <vonHalenbach@users.sourceforge.net>, 2005.\n"
+"vrundeshw <vrundeshw@cdac.in>, 2012.\n"
"Waluyo Adi Siswanto <was.uthm@gmail.com>, 2011.\n"
"Wang Li <charlesw1234@163.com>, 2002.\n"
"Wei-Lun Chao <william.chao@ossii.com.tw>, 2006.\n"
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1ca10e282..7b256fc8f 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -497,7 +497,7 @@ SvgFontsDialog::flip_coordinate_system(Geom::PathVector pathv){
for (obj = get_selected_spfont()->children; obj; obj=obj->next){
if (SP_IS_FONTFACE(obj)){
//XML Tree being directly used here while it shouldn't be.
- sp_repr_get_double(obj->getRepr(), "units_per_em", &units_per_em);
+ sp_repr_get_double(obj->getRepr(), "units-per-em", &units_per_em);
}
}
diff --git a/src/xml/event.h b/src/xml/event.h
index 73e68daeb..f6b734c29 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -33,13 +33,13 @@ namespace XML {
/**
* @brief Enumeration of all XML event types
*/
-enum EventType {
- EVENT_ADD, ///< Child added
- EVENT_DEL, ///< Child removed
- EVENT_CHG_ATTR, ///< Attribute changed
- EVENT_CHG_CONTENT, ///< Content changed
- EVENT_CHG_ORDER ///< Order of children changed
-};
+// enum EventType {
+// EVENT_ADD, ///< Child added
+// EVENT_DEL, ///< Child removed
+// EVENT_CHG_ATTR, ///< Attribute changed
+// EVENT_CHG_CONTENT, ///< Content changed
+// EVENT_CHG_ORDER ///< Order of children changed
+// };
/**
* @brief Generic XML modification event
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 01:26:27 +0000