Commit 7ce94758 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Merge branch 'master' into krita-testing-wolthera

parents 38c4fc32 9ed50d15
......@@ -83,9 +83,9 @@ endif()
# define common versions of Krita applications, used to generate kritaversion.h
# update these version for every release:
set(KRITA_VERSION_STRING "3.1 Alpha")
set(KRITA_VERSION_STRING "3.0.1 Alpha")
set(KRITA_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc.
set(KRITA_STABLE_VERSION_MINOR 1) # 0 for 3.0, 1 for 3.1, etc.
set(KRITA_STABLE_VERSION_MINOR 0) # 0 for 3.0, 1 for 3.1, etc.
set(KRITA_VERSION_RELEASE 89) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
set(KRITA_ALPHA 1) # uncomment only for Alpha
#set(KRITA_BETA 1) # uncomment only for Beta
......@@ -324,6 +324,7 @@ add_definitions(
#
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_KRITADEVS "-O3 -g" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
endif()
if(UNIX)
......
......@@ -17,9 +17,11 @@ ACTIONFILES=`find . -name \*.action`
perl extracti18n.pl > i18ndata
# Ignore sdk/templates which contains templates for writing future plugins.
# Also ignore crashreporter, it has it's own catalog
# None of the placeholder strings inside will be seen by users.
krita_xgettext krita.pot i18ndata rc.cpp \
`find . -name \*.cc -o -name \*.h -o -name \*.cpp | grep -v '/tests/' | grep -v './sdk/templates'`
`find . -name \*.cc -o -name \*.h -o -name \*.cpp | \
grep -v '/tests/' | grep -v './sdk/templates' | grep -v './krita/crashreporter/'`
# Clean up
rm -f i18ndata rc.cpp
......@@ -5,7 +5,7 @@ Krita is a free and open source digital painting application. It is for artists
If you are reading this on Github, be aware that this is just a mirror. Our real
code repository is provided by KDE: https://phabricator.kde.org/diffusion/KRITA/
This repository contains the current, Qt5-based, development version of Krita. The Krita 2.9 repository is located from KDE: https://phabricator.kde.org/diffusion/CALLIGRA/
This repository contains the current, Qt5-based, development version of Krita 3. Krita 3.0 has been released and development on Krita 2.9 has stopped. Krita 2.9 was part of Calligra: https://phabricator.kde.org/diffusion/CALLIGRA/
![Picture] (https://krita.org/wp-content/uploads/2016/04/krita-30-screenshot.jpg)
......@@ -14,9 +14,9 @@ This repository contains the current, Qt5-based, development version of Krita. T
https://docs.krita.org/Category:User_Manual
### Development Notes and Build Instructions
If you're building on Windows you'll need to build some third-party dependencies first. You should look at the README in the 3rdparty folder for directions. There is some additional build instructions on the KDE community site.
If you're building on Windows or OSX you'll need to build some third-party dependencies first. You should look at the README in the 3rdparty folder for directions.
https://community.kde.org/Krita
If you're building on Linux, please follow David Revoy's Cat Guide: http://www.davidrevoy.com/article193/guide-building-krita-on-linux-for-cats
### Bugs and Wishes
......
# - Try to find the shared-mime-info package
#
# Once done this will define
#
# SHAREDMIMEINFO_FOUND - system has the shared-mime-info package
# UPDATE_MIME_DATABASE_EXECUTABLE - the update-mime-database executable
#
# The minimum required version of SharedMimeInfo can be specified using the
# standard syntax, e.g. find_package(SharedMimeInfo 0.20)
#
# For backward compatibility, the following two variables are also supported:
# SHARED_MIME_INFO_FOUND - same as SHAREDMIMEINFO_FOUND
# SHARED_MIME_INFO_MINIMUM_VERSION - set to the minimum version you need, default is 0.18.
# When both are used, i.e. the version is set in the find_package() call and
# SHARED_MIME_INFO_MINIMUM_VERSION is set, the version specified in the find_package()
# call takes precedence.
# Copyright (c) 2007, Pino Toscano, <toscano.pino@tiscali.it>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# Support SHARED_MIME_INFO_MINIMUM_VERSION for compatibility:
if(NOT SharedMimeInfo_FIND_VERSION)
set(SharedMimeInfo_FIND_VERSION "${SHARED_MIME_INFO_MINIMUM_VERSION}")
endif(NOT SharedMimeInfo_FIND_VERSION)
# the minimum version of shared-mime-database we require
if(NOT SharedMimeInfo_FIND_VERSION)
set(SharedMimeInfo_FIND_VERSION "0.18")
endif(NOT SharedMimeInfo_FIND_VERSION)
find_program (UPDATE_MIME_DATABASE_EXECUTABLE NAMES update-mime-database)
# Store the version number in the cache, so we don't have to search the next time again:
if (UPDATE_MIME_DATABASE_EXECUTABLE AND NOT SHAREDMIMEINFO_VERSION)
exec_program (${UPDATE_MIME_DATABASE_EXECUTABLE} ARGS -v RETURN_VALUE _null OUTPUT_VARIABLE _smiVersionRaw)
string(REGEX REPLACE "update-mime-database \\([a-zA-Z\\-]+\\) ([0-9]\\.[0-9]+).*"
"\\1" smiVersion "${_smiVersionRaw}")
set(SHAREDMIMEINFO_VERSION "${smiVersion}" CACHE STRING "Version number of SharedMimeInfo" FORCE)
endif (UPDATE_MIME_DATABASE_EXECUTABLE AND NOT SHAREDMIMEINFO_VERSION)
# Use the new FPHSA() syntax:
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SharedMimeInfo REQUIRED_VARS UPDATE_MIME_DATABASE_EXECUTABLE
VERSION_VAR SHAREDMIMEINFO_VERSION )
# For backward compatibility:
set(SHARED_MIME_INFO_FOUND ${SHAREDMIMEINFO_FOUND} )
# This should go into MacroLogFeature/FeatureSummary:
# message(FATAL_ERROR "Could NOT find shared-mime-info. See http://freedesktop.org/wiki/Software/shared-mime-info.")
mark_as_advanced(UPDATE_MIME_DATABASE_EXECUTABLE)
macro(UPDATE_XDG_MIMETYPES _path)
get_filename_component(_xdgmimeDir "${_path}" NAME)
if("${_xdgmimeDir}" STREQUAL packages )
get_filename_component(_xdgmimeDir "${_path}" PATH)
else("${_xdgmimeDir}" STREQUAL packages )
set(_xdgmimeDir "${_path}")
endif("${_xdgmimeDir}" STREQUAL packages )
install(CODE "
set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
if (NOT DESTDIR_VALUE)
# under Windows relative paths are used, that's why it runs from CMAKE_INSTALL_PREFIX
execute_process(COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${_xdgmimeDir}
WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\")
endif (NOT DESTDIR_VALUE)
")
endmacro (UPDATE_XDG_MIMETYPES)
......@@ -98,9 +98,9 @@ if (APPLE)
endif ()
install(TARGETS krita ${INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(PROGRAMS org.kde.krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES krita.action kritamenu.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
install(FILES krita.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ )
install(FILES org.kde.krita.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
install(DIRECTORY DESTINATION ${DATA_INSTALL_DIR}/krita/shortcuts)
include_directories(${CMAKE_SOURCE_DIR}/krita/ui)
remove_definitions(
-DTRANSLATION_DOMAIN=\"krita\"
)
add_definitions(
-DTRANSLATION_DOMAIN=\"kritacrashhandler\"
)
set(crashhandler_SRCS main.cpp mainwindow.cpp)
ki18n_wrap_ui(crashhandler_SRCS wdg_crash_reporter.ui)
add_executable(crashhandler ${crashhandler_SRCS})
......
#! /bin/sh
source ../../krita_xgettext.sh
krita_xgettext crashhandler.pot *.cpp
$EXTRACTRC `find . -name \*.ui` >> rc.cpp
krita_xgettext kritacrashhandler.pot *.cpp
......@@ -37,7 +37,7 @@ int main( int argc, char **argv )
QString kritaVersion(KRITA_VERSION_STRING);
QString version;
KLocalizedString::setApplicationDomain( "crashhandler" );
KLocalizedString::setApplicationDomain( "kritacrashhandler" );
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
......
......@@ -22,6 +22,16 @@
<isCheckable>false</isCheckable>
<text>Move down</text>
</Action>
<Action name="movetool-show-coordinates">
<iconText>Show Coordinates</iconText>
<shortcut>Ctrl+Alt+Shift+C</shortcut>
<toolTip>Show absolute coordinates and offset while move action</toolTip>
<icon></icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Show Coordinates</text>
</Action>
<Action name="movetool-move-left">
<iconText>Move left</iconText>
<shortcut>Left</shortcut>
......
......@@ -5,6 +5,8 @@ Icon=template_animation
Name=Animation-Japanese-En
Name[ca]=Animació-Japonès-EN
Name[ca@valencia]=Animació-Japonés-EN
Name[de]=Animation-Japanisch-En
Name[en_GB]=Animation-Japanese-En
Name[es]=Animación-Japonés-En
Name[it]=Animazione-Giapponese-EN
Name[nl]=Animatie-Japans-En
......
......@@ -5,6 +5,8 @@ Icon=template_animation
Name=Animation-Japanese-JP
Name[ca]=Animació-Japonès-JP
Name[ca@valencia]=Animació-Japonés-JP
Name[de]=Animation-Japanisch-JP
Name[en_GB]=Animation-Japanese-JP
Name[es]=Animación-Japonés-JP
Name[it]=Animazione-Giapponese-JP
Name[nl]=Animatie-Japans-JP
......
......@@ -2448,6 +2448,18 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="convert_group_to_animated">
<icon></icon>
<text>Convert group to &amp;animated layer</text>
<whatsThis></whatsThis>
<toolTip>Convert child layers into animation frames</toolTip>
<iconText>Convert child layers into animation frames</iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="import_layer_from_file">
<icon></icon>
<text>I&amp;mport Layer...</text>
......
......@@ -179,6 +179,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org
<Action name="convert_to_transparency_mask"/>
<Action name="convert_to_filter_mask"/>
<Action name="convert_to_selection_mask"/>
<Action name="convert_group_to_animated"/>
</Menu>
<Separator/>
<Menu name="LayerSelect">
......
......@@ -542,8 +542,8 @@
<icon></icon>
<text>Out of Gamut Warnings</text>
<whatsThis></whatsThis>
<toolTip>Turns on warnings for colors our of proofed gamut, needs soft proofing to be turned on.</toolTip>
<iconText>Turns on warnings for colors our of proofed gamut, needs soft proofing to be turned on.</iconText>
<toolTip>Turns on warnings for colors out of proofed gamut, needs soft proofing to be turned on.</toolTip>
<iconText>Turns on warnings for colors out of proofed gamut, needs soft proofing to be turned on.</iconText>
<shortcut>Ctrl+Shift+Y</shortcut>
<isCheckable>true</isCheckable>
<statusTip></statusTip>
......
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
<id>krita.desktop</id>
<id>org.kde.krita.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<summary>Digital Painting, Creative Freedom</summary>
<summary xml:lang="ast">Pintura dixital, llibertá creativa</summary>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
viewBox="0 0 22 22"
id="svg3385"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="dark_transform_icons_mirror_x.svg">
<defs
id="defs3387" />
<sodipodi:namedview
id="base"
pagecolor="#707070"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.64705882"
inkscape:pageshadow="2"
inkscape:zoom="45.254834"
inkscape:cx="10.015702"
inkscape:cy="10.394722"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-intersection-paths="true"
inkscape:window-width="3124"
inkscape:window-height="1747"
inkscape:window-x="76"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3393" />
<sodipodi:guide
position="10.5,6"
orientation="1,0"
id="guide3399"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="11.5,7"
orientation="1,0"
id="guide3401"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="5,2"
orientation="0,1"
id="guide3403" />
<sodipodi:guide
position="1,20"
orientation="0,1"
id="guide3405" />
<sodipodi:guide
position="8,11"
orientation="1,0"
id="guide3407" />
<sodipodi:guide
position="14,7"
orientation="1,0"
id="guide3409" />
<sodipodi:guide
position="1,4"
orientation="1,0"
id="guide3411" />
<sodipodi:guide
position="21,1"
orientation="1,0"
id="guide3413" />
<sodipodi:guide
position="9,6"
orientation="1,0"
id="guide3415" />
<sodipodi:guide
position="13,0"
orientation="1,0"
id="guide3417" />
<sodipodi:guide
position="-6,3"
orientation="0,1"
id="guide3419" />
<sodipodi:guide
position="1,21"
orientation="0,1"
id="guide3421" />
<sodipodi:guide
position="2,1"
orientation="0,1"
id="guide3423" />
<sodipodi:guide
position="1,3"
orientation="-0.88701083,0.46174861"
id="guide4773"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="2,3"
orientation="-0.88701083,0.46174861"
id="guide4775"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="21,3"
orientation="0.88701083,0.46174861"
id="guide4783"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="20,3"
orientation="0.88701083,0.46174861"
id="guide4785"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
</sodipodi:namedview>
<metadata
id="metadata3390">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3621)">
<path
style="fill:#4d4d4d;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 10.5,1031.3621 1,0 0,20 -1,0 z"
id="path3427"
inkscape:connector-curvature="0" />
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 7.983534,1033.9949 -7.50501838,16.3672 7.50501838,0 0,-16.3672 z m -0.8807173,3.8418 0,11.5254 -5.2843035,0 5.2843035,-11.5254 z"
id="path4777"
inkscape:connector-curvature="0" />
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 14.016466,1033.9949 0,16.3672 7.505018,0 -7.505018,-16.3672 z m 0.880717,3.8418 5.284304,11.5254 -5.284304,0 0,-11.5254 z"
id="path4789"
inkscape:connector-curvature="0" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
viewBox="0 0 22 22"
id="svg3385"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="dark_transform_icons_mirror_y.svg">
<defs
id="defs3387" />
<sodipodi:namedview
id="base"
pagecolor="#707070"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.64705882"
inkscape:pageshadow="2"
inkscape:zoom="45.254834"
inkscape:cx="10.015702"
inkscape:cy="10.394722"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-intersection-paths="true"
inkscape:window-width="3124"
inkscape:window-height="1747"
inkscape:window-x="76"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3393" />
<sodipodi:guide
position="10.5,6"
orientation="1,0"
id="guide3399"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="11.5,7"
orientation="1,0"
id="guide3401"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="5,2"
orientation="0,1"
id="guide3403" />
<sodipodi:guide
position="1,20"
orientation="0,1"
id="guide3405" />
<sodipodi:guide
position="8,11"
orientation="1,0"
id="guide3407" />
<sodipodi:guide
position="14,7"
orientation="1,0"
id="guide3409" />
<sodipodi:guide
position="1,4"
orientation="1,0"
id="guide3411" />
<sodipodi:guide
position="21,1"
orientation="1,0"
id="guide3413" />
<sodipodi:guide
position="9,6"
orientation="1,0"
id="guide3415" />
<sodipodi:guide
position="13,0"
orientation="1,0"
id="guide3417" />
<sodipodi:guide
position="-6,3"
orientation="0,1"
id="guide3419" />
<sodipodi:guide
position="1,21"
orientation="0,1"
id="guide3421" />
<sodipodi:guide
position="2,1"
orientation="0,1"
id="guide3423" />
<sodipodi:guide
position="1,3"
orientation="-0.88701083,0.46174861"
id="guide4773"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="2,3"
orientation="-0.88701083,0.46174861"
id="guide4775"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="21,3"
orientation="0.88701083,0.46174861"
id="guide4783"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
<sodipodi:guide
position="20,3"
orientation="0.88701083,0.46174861"
id="guide4785"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
</sodipodi:namedview>
<metadata
id="metadata3390">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3621)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 21,1040.8621 0,1 -20,0 0,-1 z"
id="path3427"
inkscape:connector-curvature="0" />
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 18.3672,1038.3456 2,1030.8406 l 0,7.505 16.3672,0 z m -3.8418,-0.8807 -11.5254,0 0,-5.2843 11.5254,5.2843 z"
id="path4777"
inkscape:connector-curvature="0" />
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 18.3672,1044.3786 -16.3672,0 0,7.505 16.3672,-7.505 z m -3.8418,0.8807 -11.5254,5.2843 0,-5.2843 11.5254,0 z"
id="path4789"
inkscape:connector-curvature="0" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
viewBox="0 0 22 22"
id="svg4982"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="dark_transform_icons_rotate_ccw.svg">
<defs
id="defs4984">
<inkscape:path-effect
effect="spiro"
id="path-effect5575"
is_visible="true" />
<inkscape:path-effect
effect="spiro"
id="path-effect5571"
is_visible="true" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#7a7474"