Commit e7a35329 authored by Halla Rempt's avatar Halla Rempt

Merge branch 'rempt/impex-refactoring'

parents 2cec3621 ca924bc5
......@@ -35,8 +35,8 @@ elseif (NOT APPLE)
INSTALL_DIR ${EXTPREFIX_qt}
CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXTPREFIX_qt} -opensource -confirm-license -nomake examples -no-sql-sqlite -no-openssl -no-qml-debug -no-mtdev -no-journald -no-syslog -no-nis -no-cups -no-tslib -no-directfb -no-linuxfb -no-libproxy -no-pch -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-harfbuzz -qt-freetype -qt-xcb -qt-xkbcommon-x11 -optimized-qmake -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtandroidextras -skip qtserialport
BUILD_COMMAND make
INSTALL_COMMAND make install
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
......
......@@ -58,7 +58,7 @@ if (APPLE)
set(KDE_SKIP_RPATH_SETTINGS TRUE)
set(CMAKE_MACOSX_RPATH 1)
set(BUILD_WITH_INSTALL_RPATH 1)
add_definitions(-mmacosx-version-min=10.9 -Wno-deprecated-register)
add_definitions(-mmacosx-version-min=10.9 -Wno-macro-redefined -Wno-deprecated-register)
endif()
######################
......@@ -69,10 +69,10 @@ endif()
# define common versions of Krita applications, used to generate kritaversion.h
# update these version for every release:
set(KRITA_VERSION_STRING "3.0.92")
set(KRITA_VERSION_STRING "3.1.88")
set(KRITA_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc.
set(KRITA_STABLE_VERSION_MINOR 0) # 0 for 3.0, 1 for 3.1, etc.
set(KRITA_VERSION_RELEASE 91) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
set(KRITA_STABLE_VERSION_MINOR 1) # 0 for 3.0, 1 for 3.1, etc.
set(KRITA_VERSION_RELEASE 88) # 88 for pre-alpha, 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
#set(KRITA_RC 1) # uncomment only for RC
......@@ -340,6 +340,7 @@ macro(macro_add_unittest_definitions)
add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
add_definitions(-DFILES_DEFAULT_DATA_DIR="${KRITA_DEFAULT_TEST_DATA_DIR}")
add_definitions(-DSYSTEM_RESOURCES_DATA_DIR="${CMAKE_SOURCE_DIR}/krita/data/")
endmacro()
......
#! /bin/sh
source krita_xgettext.sh
source kundo2_aware_xgettext.sh
$EXTRACTRC `find . -name \*.ui | grep -v '/tests/'` >> rc.cpp
RCFILES=`find . -name \*.xmlgui \
......@@ -19,7 +19,7 @@ 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 \
kundo2_aware_xgettext krita.pot i18ndata rc.cpp \
`find . -name \*.cc -o -name \*.h -o -name \*.cpp | \
grep -v '/tests/' | grep -v './sdk/templates' | grep -v './krita/crashreporter/'`
......
......@@ -44,7 +44,7 @@ void KisProjectionBenchmark::benchmarkProjection()
KisDocument *doc = KisPart::instance()->createDocument();
doc->loadNativeFormat(QString(FILES_DATA_DIR) + QDir::separator() + "load_test.kra");
doc->image()->refreshGraph();
doc->saveNativeFormat(QString(FILES_OUTPUT_DIR) + QDir::separator() + "save_test.kra");
doc->exportDocument(QUrl::fromLocalFile(QString(FILES_OUTPUT_DIR) + QDir::separator() + "save_test.kra"));
delete doc;
}
}
......
......@@ -66,7 +66,7 @@ void KisThumbnailBenchmark::initTestCase()
const float angle = 2 * 3.1415926 / 360.;
const float endWidth = 30;
for (float i = 0; i < 90; i += 5) {
for (int i = 0; i < 90; i += 5) {
painter.drawThickLine(QPointF(0, 0), QPointF(radius * std::sin(angle * i), radius * std::cos(angle * i)), 1, endWidth);
painter.drawThickLine(QPointF(IMAGE_WIDTH, IMAGE_HEIGHT),
QPointF(IMAGE_WIDTH - radius * std::sin(angle * i), IMAGE_HEIGHT - radius * std::cos(angle * i)), 1, endWidth);
......
......@@ -49,7 +49,7 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
# .bat because of rpath handling
set(_executable "${loc}.bat")
else()
if (Q_WS_MAC AND NOT _nogui)
if (Q_OS_OSX AND NOT _nogui)
set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME})
else ()
# .shell because of rpath handling
......
<!-- Disabled, since Connection Tool is disabled in Krita
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="connection-tool">
......@@ -154,3 +156,5 @@
</Action>
</Actions>
</ActionCollection>
commented out! -->
This diff is collapsed.
......@@ -41,9 +41,11 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
if (appPlist != nil || appPlist.length) {
appIcon = [[NSImage alloc] initWithData:appPlist];
NSImageRep *rep = [[appIcon representations] objectAtIndex:0];
NSSize canvasSize = appIcon.size;
NSRect renderRect = NSMakeRect(0.0, 0.0, appIcon.size.width, appIcon.size.height);
NSSize canvasSize = NSMakeSize(rep.pixelsWide, rep.pixelsHigh);
NSRect renderRect = NSMakeRect(0.0, 0.0, rep.pixelsWide, rep.pixelsHigh);
CGContextRef _context = QLPreviewRequestCreateContext(preview, canvasSize, true, NULL);
......
......@@ -73,7 +73,9 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
appIcon = [[NSImage alloc] initWithData:appPlist];
NSRect renderRect = NSMakeRect(0.0, 0.0, appIcon.size.width, appIcon.size.height);
NSImageRep *rep = [[appIcon representations] objectAtIndex:0];
NSRect renderRect = NSMakeRect(0.0, 0.0, rep.pixelsWide, rep.pixelsHigh);
CGImageRef cgImage = [appIcon CGImageForProposedRect:&renderRect context:NULL hints:nil];
......
......@@ -50,18 +50,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="import_resources">
<icon></icon>
<text>Import Resources or Bundles...</text>
<whatsThis></whatsThis>
<toolTip>Import Resources or Bundles</toolTip>
<iconText>Import Resources or Bundles</iconText>
<activationFlags>0</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="create_bundle">
<icon></icon>
<text>Create Resource Bundle...</text>
......@@ -189,6 +177,18 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="update_composition">
<icon></icon>
<text>Update Composition</text>
<whatsThis></whatsThis>
<toolTip>Update Composition</toolTip>
<iconText>Update Composition</iconText>
<activationFlags>0</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
<Actions category="Painting">
......@@ -500,26 +500,6 @@
<isCheckable>true</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="zoom_in">
<icon>zoom-in</icon>
<text>Zoom &amp;In</text>
<whatsThis></whatsThis>
<toolTip>Zoom In</toolTip>
<iconText>Zoom In</iconText>
<shortcut>Ctrl++; Ctrl+=</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="zoom_out">
<icon>zoom-out</icon>
<text>Zoom &amp;Out</text>
<whatsThis></whatsThis>
<toolTip>Zoom Out</toolTip>
<iconText>Zoom Out</iconText>
<shortcut>Ctrl+-</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="reset_fg_bg">
<icon></icon>
<text>Reset Foreground and Background Color</text>
......@@ -1602,20 +1582,12 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectBrush">
<icon></icon>
<text>Brush Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Brush Selection Tool</toolTip>
<iconText>Brush Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
<Actions category="Blending Modes">
<text>Blending Modes</text>
<!-- commented out in the code right now
<Action name="Next Blending Mode">
<icon></icon>
<text>Next Blending Mode</text>
......@@ -1636,6 +1608,7 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
-->
<Action name="Select Normal Blending Mode">
<icon></icon>
<text>Select Normal Blending Mode</text>
......@@ -2369,7 +2342,7 @@
<whatsThis></whatsThis>
<toolTip>Create a group layer containing selected layers</toolTip>
<iconText>Quick Group</iconText>
<activationFlags>0</activationFlags>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut>Ctrl+G</shortcut>
<isCheckable>false</isCheckable>
......@@ -2381,7 +2354,7 @@
<whatsThis></whatsThis>
<toolTip>Remove grouping of the layers or remove one layer out of the group</toolTip>
<iconText>Quick Ungroup</iconText>
<activationFlags>0</activationFlags>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut>Ctrl+Alt+G</shortcut>
<isCheckable>false</isCheckable>
......@@ -2393,7 +2366,7 @@
<whatsThis></whatsThis>
<toolTip>Group selected layers and add a layer with clipped alpha channel</toolTip>
<iconText>Quick Clipping Group</iconText>
<activationFlags>0</activationFlags>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut>Ctrl+Shift+G</shortcut>
<isCheckable>false</isCheckable>
......@@ -2867,16 +2840,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="merge_selected_layers">
<icon></icon>
<text>&amp;Merge Selected Layers</text>
<whatsThis></whatsThis>
<toolTip>Merge Selected Layers</toolTip>
<iconText>Merge Selected Layers</iconText>
<shortcut>Ctrl+Alt+E</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="layer_style">
<icon></icon>
<text>La&amp;yer Style...</text>
......
......@@ -2,7 +2,7 @@
<kpartgui xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
name="Krita"
version="98"
version="103"
xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
<MenuBar>
<Menu name="file">
......
......@@ -62,6 +62,7 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<!-- commented out in the code right now
<Action name="file_reload_file">
<icon></icon>
<text>Reload</text>
......@@ -74,6 +75,7 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
-->
<Action name="file_import_file">
<icon>document-import</icon>
<text>Open ex&amp;isting Document as Untitled Document...</text>
......@@ -440,7 +442,7 @@
</Action>
<Action name="stroke_selection">
<icon></icon>
<text>Stroke selec&amp;tion</text>
<text>Stroke Selec&amp;tion...</text>
<whatsThis></whatsThis>
<toolTip>Stroke selection</toolTip>
<iconText>Stroke selection</iconText>
......
......@@ -91,7 +91,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4139"
width="5.0000019"
height="5.0000019"
......@@ -99,12 +99,12 @@
y="1033.3622"
ry="2.500001" />
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 5.5 14 C 4.1149999 14 3 15.115 3 16.5 C 3 17.885 4.1149999 19 5.5 19 C 6.8850001 19 8 17.885 8 16.5 C 8 15.115 6.8850001 14 5.5 14 z M 5.5 15 C 6.3310001 15 7 15.669 7 16.5 C 7 17.331 6.3310001 18 5.5 18 C 4.6689999 18 4 17.331 4 16.5 C 4 15.669 4.6689999 15 5.5 15 z "
id="rect4141"
transform="translate(0,1030.3622)" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4200"
width="16"
height="0.9999826"
......@@ -112,7 +112,7 @@
y="1035.3622"
ry="0" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4206"
width="12"
height="0.9999826"
......
......@@ -255,7 +255,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 3.7070312 7 L 3 7.7070312 L 9.125 13.832031 L 11 15.707031 L 12.875 13.832031 L 19 7.7070312 L 18.292969 7 L 12.167969 13.125 L 11 14.292969 L 9.8320312 13.125 L 3.7070312 7 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17,1047.3622 0,-0.9964 -10.9999998,0 0,-11.0036 -1,0 0,12 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17,1035.3622 -0.9964,0 0,11 -11.0035997,0 0,1 11.9999997,0 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -239,7 +239,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 14.292969 3 L 8.1679688 9.125 L 6.2929688 11 L 8.1679688 12.875 L 14.292969 19 L 15 18.292969 L 8.875 12.167969 L 7.7070312 11 L 8.875 9.8320312 L 15 3.7070312 L 14.292969 3 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -275,7 +275,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 7.7070312 3 L 7 3.7070312 L 13.125 9.8320312 L 14.292969 11 L 13.125 12.167969 L 7 18.292969 L 7.7070312 19 L 13.832031 12.875 L 15.707031 11 L 13.832031 9.125 L 7.7070312 3 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.999999,1047.3622 0.9964361,0 0,-11 11.0035639,0 3e-6,-1 -11.9999985,0 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 5.0000005,1035.3622 0,0.9964 10.9999995,0 0,11.0036 1,0 0,-12 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -231,7 +231,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 3.7070307,1044.3622 -0.7070312,-0.707 6.125,-6.125 1.8750005,-1.875 1.875,1.875 6.125,6.125 -0.707032,0.707 -6.125,-6.125 -1.167968,-1.168 -1.1679693,1.168 -6.125,6.125 z"
id="rect4176"
inkscape:connector-curvature="0" />
......
......@@ -110,7 +110,7 @@
id="layer1"
transform="translate(-238.85715,-522.93362)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="M 6 3 L 6 4 L 6 18 L 6 19 L 11 17 L 16 19 L 16 18 L 16 4 L 16 3 L 6 3 z M 7 4 L 15 4 L 15 17.599609 L 11 16 L 7 17.599609 L 7 4 z "
transform="translate(238.85715,522.93362)"
id="rect4136" />
......
......@@ -83,7 +83,7 @@
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 2,2 0,3 0,9 1,0 11,0 0,-1 L 14,2 3,2 Z m 1,3 10,0 0,8 -10,0 z m 1,1 0,6 2,0 0,-6 z m 3,1 0,1 5,0 0,-1 z m 0,3 0,1 5,0 0,-1 z"
transform="translate(421.71429,531.79074)"
id="rect4083"
......
......@@ -126,7 +126,7 @@
id="layer1"
transform="translate(-550.28572,-606.6479)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 12 4 C 9.9724023 4 8.1286798 4.7566937 6.71875 6 C 6.592511 6.1113202 6.4627201 6.2247799 6.34375 6.34375 L 6 6.71875 C 4.7566937 8.1286798 4 9.9724023 4 12 C 4 16.41828 7.58172 20 12 20 C 14.027598 20 15.87132 19.243306 17.28125 18 L 17.65625 17.65625 C 17.77522 17.53728 17.88868 17.407489 18 17.28125 C 19.243306 15.87132 20 14.027598 20 12 C 20 7.58172 16.41828 4 12 4 z M 12 5 C 15.86599 5 19 8.13401 19 12 C 19 13.75366 18.346785 15.334268 17.28125 16.5625 L 7.4375 6.71875 C 8.6657315 5.6532151 10.24634 5 12 5 z M 6.71875 7.4375 L 16.5625 17.28125 C 15.334268 18.346785 13.75366 19 12 19 C 8.13401 19 5 15.86599 5 12 C 5 10.24634 5.6532151 8.6657315 6.71875 7.4375 z "
transform="translate(550.28572,606.6479)"
id="rect4203" />
......
......@@ -103,7 +103,7 @@
id="layer1"
transform="translate(-364.57143,-525.79075)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="m 382.8643,530.79077 -10.43876,10.56644 -4.14699,-4.19772 -0.70712,0.71578 4.14699,4.1977 -0.002,0.002 0.70713,0.71577 0.002,-0.002 0.002,0.002 0.70711,-0.71577 -0.002,-0.002 10.43877,-10.56645 -0.70712,-0.71576 z"
id="rect4113"
inkscape:connector-curvature="0" />
......
......@@ -84,7 +84,7 @@
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 423.71429,542.18849 0,3.60225 3.60225,0 8.39775,-8.39774 -3.60225,-3.60226 -5.1107,5.11069 z m 1.08068,0.36022 1.19324,-1.19323 0,1.62101 1.03565,0 0.99062,0 0.0225,0.6529 -1.08068,1.08067 -1.44091,0 -0.72044,-0.72045 z m 2.20637,-2.20637 1.4409,-1.44091 1.62102,-1.62101 2.16135,2.16135 -3.17448,3.17449 0,-0.67542 -1.01313,0.0225 -1.03566,0 0,-1.03565 z"
id="rect4132"
inkscape:connector-curvature="0"
......
......@@ -131,7 +131,7 @@
inkscape:connector-curvature="0"
id="rect4292"
d="m 18,1033.3622 0,15 0,1 -1,0 -6,0 0,-1 6,0 0,-14 -12,0 0,11 4.292969,0 L 7,1043.0692 l 0.707031,-0.707 2.792969,2.793 0.707031,0.707 -0.707031,0.707 -2.792969,2.793 L 7,1048.6552 l 2.292969,-2.293 -5.292969,0 0,-1 0,-12 13,0 1,0 z"
style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
style="fill:#373737;fill-opacity:1;stroke:none" />
</g>
</g>
</svg>
......@@ -132,7 +132,7 @@
inkscape:connector-curvature="0"
id="rect4292"
d="m 18,1033.3622 0,15 0,1 -1,0 -6,0 0,-1 6,0 0,-14 -12,0 0,11 4.292969,0 L 7,1043.0692 l 0.707031,-0.707 2.792969,2.793 0.707031,0.707 -0.707031,0.707 -2.792969,2.793 L 7,1048.6552 l 2.292969,-2.293 -5.292969,0 0,-1 0,-12 13,0 1,0 z"
style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
style="fill:#373737;fill-opacity:1;stroke:none" />
</g>
</g>
</svg>
......@@ -125,7 +125,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 4 3 L 4 19 L 5 19 L 13 19 L 14 19 L 14 18.990234 L 14.007812 19 L 18 15.007812 L 18 15 L 18 13.59375 L 18 3 L 17 3 L 5 3 L 4 3 z M 5 4 L 17 4 L 17 14 L 13 14 L 13 15 L 13 18 L 5 18 L 5 4 z "
transform="translate(0,1030.3622)"
id="rect4139" />
......
......@@ -125,7 +125,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 4 3 L 4 19 L 5 19 L 10 19 L 10 18 L 5 18 L 5 4 L 17 4 L 17 11 L 18 11 L 18 3 L 17 3 L 5 3 L 4 3 z M 14 11 C 11.784005 11 10 12.784005 10 15 C 10 17.215995 11.784005 19 14 19 C 16.215995 19 18 17.215995 18 15 C 18 12.784005 16.215995 11 14 11 z M 14 12 C 15.661995 12 17 13.338005 17 15 C 17 16.661995 15.661995 18 14 18 C 12.338005 18 11 16.661995 11 15 C 11 13.338005 12.338005 12 14 12 z M 13 13 L 13 15 L 13 16 L 14 16 L 15 16 L 15 15 L 14 15 L 14 13 L 13 13 z "
transform="translate(0,1030.3622)"
id="rect4139" />
......
......@@ -93,7 +93,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 3 3 L 3 4 L 3 19 L 4 19 L 19 19 L 19 18 L 19 5 L 12.007812 5 L 10.007812 3 L 10 3.0078125 L 10 3 L 4 3 L 3 3 z M 9.0078125 8 L 18 8 L 18 18 L 4 18 L 4 10 L 7 10 L 7 9.9921875 L 7.0078125 10 L 9.0078125 8 z "
transform="translate(0,1030.3622)"
id="rect4069" />
......
......@@ -157,7 +157,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 4 3 L 4 19 L 5 19 L 12 19 L 12 18 L 5 18 L 5 4 L 17 4 L 17 13 L 18 13 L 18 3 L 17 3 L 5 3 L 4 3 z M 13 11 C 11.337997 11 10 12.337997 10 14 C 10 15.662003 11.337997 17 13 17 C 13.649392 17 14.246354 16.791414 14.736328 16.443359 L 17.292969 19 L 18 18.292969 L 15.443359 15.736328 C 15.791414 15.246354 16 14.649392 16 14 C 16 12.337997 14.662003 11 13 11 z M 13 12 C 14.108003 12 15 12.891997 15 14 C 15 15.108003 14.108003 16 13 16 C 11.891997 16 11 15.108003 11 14 C 11 12.891997 11.891997 12 13 12 z "
transform="translate(0,1030.3622)"
id="rect4139" />
......
......@@ -94,7 +94,7 @@
id="layer1"
transform="translate(-384.57143,-482.93361)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="M 5 3 L 5 4 L 5 8 L 3 8 L 3 9 L 3 16 L 4 16 L 7 16 L 7 18 L 7 19 L 15 19 L 15 18 L 15 16 L 19 16 L 19 15 L 19 9 L 19 8 L 17 8 L 17 4 L 17 3 L 5 3 z M 6 4 L 16 4 L 16 8 L 15 8 L 15 7 L 7 7 L 7 8 L 6 8 L 6 4 z M 7 5 L 7 6 L 15 6 L 15 5 L 7 5 z M 4 9 L 18 9 L 18 15 L 16 15 L 16 13 L 6 13 L 6 15 L 4 15 L 4 9 z M 14 10 L 14 11 L 17 11 L 17 10 L 14 10 z M 8 16 L 14 16 L 14 18 L 8 18 L 8 16 z "
transform="translate(384.57143,482.93361)"
id="rect4145" />
......
......@@ -106,7 +106,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 2 2.9980469 L 2 3 L 2 4 L 2 19 L 3 19 L 11 19 L 11 18 L 6 18 L 6 12 L 11 12 L 11 11 L 6 11 L 5 11 L 5 18 L 3 18 L 3 4 L 6 4 L 6 8 L 6 9 L 14 9 L 14 8 L 14 4 L 14.292969 4 L 17 6.7070312 L 17 7 L 17 10 L 18 10 L 18 7 L 18 6.3007812 L 17.992188 6.3007812 L 18 6.2910156 L 14.707031 2.9980469 L 14.699219 3.0078125 L 14.699219 2.9980469 L 14 2.9980469 L 2 2.9980469 z M 7 4 L 10.900391 4 L 10.900391 8 L 7 8 L 7 4 z M 18 11 L 17.003906 11.994141 L 17 11.994141 L 12 16.992188 L 12.007812 17.001953 L 12.003906 18.005859 L 12 18.005859 L 12 18.996094 L 12 19.005859 L 14 19.005859 L 14.005859 18.996094 L 14.009766 18.996094 L 14.019531 18.996094 L 14.013672 18.986328 L 15 18 L 19 14.003906 L 18.294922 13.294922 L 13.304688 18.28125 L 12.710938 17.689453 L 17.703125 12.701172 L 18.294922 13.294922 L 19 13.998047 L 20 12.998047 L 18 11 z "
transform="translate(0,1030.3622)"
id="rect4126" />
......
......@@ -116,7 +116,7 @@
id="rect4126"
transform="translate(0,1030.3622)"
d="m 3,3 0,1 0,15 1,0 15,0 0,-1 0,-11 0,-0.6992188 -0.0078,0 L 19,6.2929688 15.707031,3 15.699231,3.00781 15.699231,3 15,3 3,3 Z M 4,4 7,4 7,8 7,9 15,9 15,8 15,4 15.292969,4 18,6.7070312 18,7 l 0,11 -2,0 0,-7 -1,0 -8,0 -1,0 0,7 -2,0 0,-14 z m 4,0 3.900391,0 0,4 L 8,8 8,4 Z m -1,8 8,0 0,6 -8,0 0,-6 z"
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
inkscape:connector-curvature="0" />
</g>
<rect
......
......@@ -109,7 +109,7 @@
id="layer1"
transform="translate(0,-1036.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 6 2 L 6 3 L 6 6 L 7 6 L 7 3 L 9 3 L 9 6 L 10 6 L 10 3 L 10 2 L 6 2 z M 3.7070312 6 L 3 6.7070312 L 6.2929688 10 L 8 11.707031 L 9.7070312 10 L 13 6.7070312 L 12.292969 6 L 9 9.2929688 L 8 10.292969 L 7 9.2929688 L 3.7070312 6 z M 2 12 L 2 14 L 3 14 L 14 14 L 14 13 L 14 12 L 13 12 L 13 13 L 3 13 L 3 12 L 2 12 z "
transform="translate(0,1036.3622)"
id="rect4099" />
......
......@@ -77,7 +77,7 @@
id="layer1"
transform="translate(0,-1036.3622)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="M 2 2 L 2 14 L 3 14 L 13 14 L 14 14 L 14 2 L 2 2 z M 3 3 L 13 3 L 13 10 L 13 11 L 8 11 L 8 12 L 6 12 L 6 11 L 3 11 L 3 10 L 3 3 z M 4 4 L 4 10 L 12 10 L 12 4 L 4 4 z M 5 5 L 6 5 L 6 7 L 10 7 L 10 5 L 11 5 L 11 9 L 5 9 L 5 5 z M 3 12 L 5 12 L 5 13 L 3 13 L 3 12 z M 9 12 L 12 12 L 12 13 L 9 13 L 9 12 z "
transform="translate(0,1036.3622)"
id="rect4142" />
......
......@@ -122,7 +122,7 @@
id="layer1"
transform="translate(-768.57143,-676.07647)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="M 8 3 L 0.94335938 10.056641 L 0 11 L 0.94335938 11.943359 L 8 19 L 20.333984 19 L 22 19 L 22 3 L 20.333984 3 L 8 3 z M 11.320312 7 L 14 9.6796875 L 16.679688 7 L 18 8.3203125 L 15.320312 11 L 18 13.679688 L 16.679688 15 L 14 12.320312 L 11.320312 15 L 10 13.679688 L 12.679688 11 L 10 8.3203125 L 11.320312 7 z "
transform="translate(768.57143,676.07647)"
id="path4160" />
......