diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-09-03 16:43:38 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-09-03 17:10:40 +0300 |
| commit | ee8f69c96cba62b083fb089432cddd0bce5d08e1 (patch) | |
| tree | 3be49501a9174fcf6d271ac2a3938a6304abddfb /release | |
| parent | 545f565426562604eeaa84c6f098a4dda829ba0a (diff) | |
UI: File Browser Design Overhaul
This is a general redesign of the File Browser GUI and interaction
methods. For screenshots, check patch D5601.
Main changes in short:
* File Browser as floating window
* New layout of regions
* Popovers for view and filter options
* Vertical list view with interactive column header
* New and updated icons
* Keymap consistency fixes
* Many tweaks and fixes to the drawing of views
----
General:
* The file browser now opens as temporary floating window. It closes on
Esc. The header is hidden then.
* When the file browser is opened as regular editor, the header remains
visible.
* All file browser regions are now defined in Python (the button
layout).
* Adjusted related operator UI names.
Keymap:
Keymap is now consistent with other list-based views in Blender, such as
the Outliner.
* Left click to select, double-click to open
* Right-click context menus
* Shift-click to fill selection
* Ctrl-click to extend selection
Operator options:
These previously overlapped with the source list, which caused numerous
issues with resizing and presenting many settings in a small panel area.
It was also generally inconsistent with Blender.
* Moved to new sidebar, which can easily be shown or hidden using a
prominent Options toggle.
* IO operators have new layouts to match this new sidebar, using
sub-panels. This will have to be committed separately (Add-on
repository).
* If operators want to show the options by default, they have the option
to do so (see `WM_FILESEL_SHOW_PROPS`, `hide_props_region`), otherwise
they are hidden by default.
General Layout:
The layout has been changed to be simpler, more standard, and fits
better in with Blender 2.8.
* More conventional layout (file path at top, file name at the bottom,
execute/cancel buttons in bottom right).
* Use of popovers to group controls, and allow for more descriptive
naming.
* Search box is always live now, just like Outliner.
Views:
* Date Modified column combines both date and time, also uses user
friendly strings for recent dates (i.e. "Yesterday", "Today").
* Details columns (file size, modification date/time) are now toggleable
for all display types, they are not hardcoded per display type.
* File sizes now show as B, KB, MB, ... rather than B, KiB, MiB, … They
are now also calculated using base 10 of course.
* Option to sort in inverse order.
Vertical List View:
* This view now used a much simpler single vertical list with columns
for information.
* Users can click on the headers of these columns to order by that
category, and click again to reverse the ordering.
Icons:
* Updated icons by Jendrzych, with better centering.
* Files and folders have new icons in Icon view.
* Both files and folders have reworked superimposed icons that show
users the file/folder type.
* 3D file documents correctly use the 3d file icon, which was unused
previously.
* Workspaces now show their icon on Link/Append - also when listed in
the Outliner.
Minor Python-API breakage:
* `bpy.types.FileSelectParams.display_type`: `LIST_SHORT` and
`LIST_LONG` are replaced by `LIST_VERTICAL` and `LIST_HORIZONTAL`.
Removes the feature where directories would automatically be created if
they are entered into the file path text button, but don't exist. We
were not sure if users use it enough to keep it. We can definitely bring
it back.
----
//Combined effort by @billreynish, @harley, @jendrzych, my university
colleague Brian Meisenheimer and myself.//
Differential Revision: https://developer.blender.org/D5601
Reviewers: Brecht, Bastien
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/prvicons.png | bin | 3518 -> 10766 bytes | |||
| -rw-r--r-- | release/datafiles/prvicons.svg | 1153 | ||||
| -rw-r--r--[-rwxr-xr-x] | release/datafiles/prvicons_update.py | 48 | ||||
| -rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 9 | ||||
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 25 | ||||
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py | 9 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_filebrowser.py | 354 |
7 files changed, 727 insertions, 871 deletions
diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png Binary files differindex edbffae420b..dbc0f11124e 100644 --- a/release/datafiles/prvicons.png +++ b/release/datafiles/prvicons.png diff --git a/release/datafiles/prvicons.svg b/release/datafiles/prvicons.svg index 63cd8dc1954..80929124251 100644 --- a/release/datafiles/prvicons.svg +++ b/release/datafiles/prvicons.svg @@ -10,20 +10,20 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="192" - height="192" + width="1536" + height="256" id="svg2" sodipodi:version="0.32" - inkscape:version="0.92.2 2405546, 2018-03-11" + inkscape:version="0.92.3 (2405546, 2018-03-11)" version="1.0" sodipodi:docname="prvicons.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" style="display:inline;enable-background:new" - inkscape:export-filename="blender_icons.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="prvicons.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> <metadata - id="metadata2373"> + id="metadata2699"> <rdf:RDF> <cc:Work rdf:about=""> @@ -35,7 +35,7 @@ </rdf:RDF> </metadata> <sodipodi:namedview - pagecolor="#ffffff" + pagecolor="#5b5b5b" bordercolor="#666666" borderopacity="1" objecttolerance="10" @@ -43,17 +43,93 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1074" - inkscape:window-height="1896" - id="namedview2371" - showgrid="false" - inkscape:zoom="1.2291667" - inkscape:cx="60.20339" - inkscape:cy="13.830508" - inkscape:window-x="1080" - inkscape:window-y="0" - inkscape:window-maximized="0" - inkscape:current-layer="layer1" /> + inkscape:window-width="1920" + inkscape:window-height="1017" + id="namedview2697" + showgrid="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox-midpoints="true" + inkscape:zoom="0.70710678" + inkscape:cx="752.76338" + inkscape:cy="111.39186" + inkscape:window-x="1912" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + inkscape:snap-page="true" + inkscape:object-paths="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-grids="true" + inkscape:snap-intersection-paths="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-nodes="true" + inkscape:snap-global="true" + showborder="true" + inkscape:showpageshadow="true" + inkscape:pagecheckerboard="true"> + <inkscape:grid + type="xygrid" + id="grid6640" + color="#d3d3d3" + opacity="0.1254902" + empcolor="#ffffff" + empopacity="0.25098039" + spacingx="0.5" + spacingy="0.5" + empspacing="2" + originx="116" + originy="-514" + visible="true" + enabled="true" /> + <inkscape:grid + type="xygrid" + id="grid5463" + enabled="false" + empspacing="0" + spacingx="256" + spacingy="256" /> + <sodipodi:guide + position="256,68" + orientation="1,0" + id="guide5465" + inkscape:locked="false" /> + <sodipodi:guide + position="512,77" + orientation="1,0" + id="guide5467" + inkscape:locked="false" /> + <sodipodi:guide + position="768,27" + orientation="1,0" + id="guide5469" + inkscape:locked="false" /> + <sodipodi:guide + position="1024,5.75" + orientation="1,0" + id="guide5471" + inkscape:locked="false" /> + <sodipodi:guide + position="1280,-2.5" + orientation="1,0" + id="guide5473" + inkscape:locked="false" /> + <inkscape:grid + type="xygrid" + id="grid5475" + spacingx="32" + spacingy="32" + enabled="false" /> + <inkscape:grid + type="xygrid" + id="grid5500" + spacingx="8" + spacingy="8" + enabled="false" /> + </sodipodi:namedview> <defs id="defs4"> <linearGradient @@ -703,7 +779,7 @@ x2="24.25" y1="245" x1="22.75" - gradientTransform="translate(-61,0)" + gradientTransform="translate(-61)" gradientUnits="userSpaceOnUse" id="linearGradient23201" xlink:href="#linearGradient1610" @@ -713,7 +789,7 @@ x2="24.5" y1="245" x1="22.75" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient23199" xlink:href="#linearGradient1610" @@ -957,7 +1033,7 @@ x2="424.75217" y1="77.44017" x1="441.98615" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient22896" xlink:href="#linearGradient319" @@ -967,7 +1043,7 @@ x2="424.75217" y1="78" x1="438.61115" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient22846" xlink:href="#linearGradient319" @@ -977,7 +1053,7 @@ x2="424.75217" y1="77" x1="437.98615" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient22844" xlink:href="#linearGradient319" @@ -2342,7 +2418,7 @@ x2="336.72485" y1="143.70836" x1="349.04059" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,-241.7085,428.4841)" + gradientTransform="rotate(-45,396.37194,506.00979)" gradientUnits="userSpaceOnUse" id="linearGradient15748" xlink:href="#linearGradient37542" @@ -3952,7 +4028,7 @@ x2="54.8125" y1="500" x1="108" - gradientTransform="translate(42,0)" + gradientTransform="translate(42)" gradientUnits="userSpaceOnUse" id="linearGradient16638" xlink:href="#linearGradient1610" @@ -3962,7 +4038,7 @@ x2="26.561054" y1="501.74075" x1="85.874489" - gradientTransform="translate(42,0)" + gradientTransform="translate(42)" gradientUnits="userSpaceOnUse" id="linearGradient16640" xlink:href="#linearGradient15809" @@ -4088,7 +4164,7 @@ x2="415.94211" y1="-34" x1="416.00461" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30243" xlink:href="#linearGradient24081" @@ -4098,7 +4174,7 @@ x2="416.5" y1="-29.933779" x1="416.5" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30245" xlink:href="#linearGradient16500" @@ -4108,7 +4184,7 @@ x2="416.46497" y1="-34.342831" x1="416.41162" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient30247" xlink:href="#linearGradient20324" @@ -4190,7 +4266,7 @@ x2="415.45193" y1="-31.506163" x1="415.41223" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30340" xlink:href="#linearGradient1610" @@ -4200,7 +4276,7 @@ x2="416.5" y1="-29.933779" x1="416.5" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30342" xlink:href="#linearGradient16500" @@ -4210,7 +4286,7 @@ x2="416.46497" y1="-33.8125" x1="416.5" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient30344" xlink:href="#linearGradient16500" @@ -4301,7 +4377,7 @@ x2="415.45193" y1="-31.506163" x1="415.41223" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30408" xlink:href="#linearGradient1610" @@ -4311,7 +4387,7 @@ x2="416.5" y1="-29.933779" x1="416.5" - gradientTransform="translate(-0.004608,0)" + gradientTransform="translate(-0.004608)" gradientUnits="userSpaceOnUse" id="linearGradient30410" xlink:href="#linearGradient16500" @@ -4321,7 +4397,7 @@ x2="416.46497" y1="-33.8125" x1="416.5" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient30412" xlink:href="#linearGradient16500" @@ -4558,7 +4634,7 @@ x2="-42.377892" y1="442.6875" x1="-51.6875" - gradientTransform="translate(18,0)" + gradientTransform="translate(18)" gradientUnits="userSpaceOnUse" id="linearGradient17135" xlink:href="#linearGradient1610" @@ -4883,7 +4959,7 @@ inkscape:collect="always" /> <linearGradient y2="-32.351803" - x2="4.8398785e-16" + x2="4.8398785e-016" y1="-29.678047" x1="4.9341426" gradientUnits="userSpaceOnUse" @@ -5632,7 +5708,7 @@ x2="476.76578" y1="163.08553" x1="480.09564" - gradientTransform="translate(-6,0)" + gradientTransform="translate(-6)" gradientUnits="userSpaceOnUse" id="linearGradient23241" xlink:href="#linearGradient19625" @@ -5681,7 +5757,7 @@ x2="475.50031" y1="163.08553" x1="480.09564" - gradientTransform="translate(-6,0)" + gradientTransform="translate(-6)" gradientUnits="userSpaceOnUse" id="linearGradient23445" xlink:href="#linearGradient23974" @@ -5759,7 +5835,7 @@ x2="60.155113" y1="253.5" x1="79.04213" - gradientTransform="translate(-21,0)" + gradientTransform="translate(-21)" gradientUnits="userSpaceOnUse" id="linearGradient40967" xlink:href="#linearGradient32842" @@ -6107,7 +6183,7 @@ x2="476.68781" y1="163" x1="483.00034" - gradientTransform="translate(-6,0)" + gradientTransform="translate(-6)" gradientUnits="userSpaceOnUse" id="linearGradient24543" xlink:href="#linearGradient1610" @@ -6309,7 +6385,7 @@ x2="284.9375" y1="200.66605" x1="268.21783" - gradientTransform="translate(0.01612278,0)" + gradientTransform="translate(0.01612278)" gradientUnits="userSpaceOnUse" id="linearGradient41172" xlink:href="#linearGradient319" @@ -6361,7 +6437,7 @@ x2="265.70886" y1="215.3125" x1="276.39999" - gradientTransform="translate(0.01612278,0)" + gradientTransform="translate(0.01612278)" gradientUnits="userSpaceOnUse" id="linearGradient42093" xlink:href="#linearGradient23974" @@ -6402,7 +6478,7 @@ x2="290.98389" y1="195" x1="265.98389" - gradientTransform="translate(0.01612278,0)" + gradientTransform="translate(0.01612278)" gradientUnits="userSpaceOnUse" id="linearGradient42290" xlink:href="#linearGradient319" @@ -6581,7 +6657,7 @@ x2="388.78125" y1="410" x1="387" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient22249" xlink:href="#linearGradient319" @@ -6591,7 +6667,7 @@ x2="389.14081" y1="409.84152" x1="386.88852" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient22251" xlink:href="#linearGradient319" @@ -6601,7 +6677,7 @@ x2="388.86676" y1="409.86362" x1="387" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient22253" xlink:href="#linearGradient319" @@ -6839,7 +6915,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,1,-1,0,850,297)" + gradientTransform="rotate(90,276.5,573.5)" gradientUnits="userSpaceOnUse" id="linearGradient23177" xlink:href="#linearGradient20324" @@ -6849,7 +6925,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(-1,0,0,-1,366,1072)" + gradientTransform="rotate(180,183,536)" gradientUnits="userSpaceOnUse" id="linearGradient23179" xlink:href="#linearGradient20324" @@ -6859,7 +6935,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,-1,1,0,-409,588)" + gradientTransform="rotate(-90,89.5,498.5)" gradientUnits="userSpaceOnUse" id="linearGradient23181" xlink:href="#linearGradient20324" @@ -6889,7 +6965,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,1,-1,0,870,292)" + gradientTransform="rotate(90,289,581)" gradientUnits="userSpaceOnUse" id="linearGradient23187" xlink:href="#linearGradient37623" @@ -6909,7 +6985,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,-1,1,0,-429,593)" + gradientTransform="rotate(-90,82,511)" gradientUnits="userSpaceOnUse" id="linearGradient23191" xlink:href="#linearGradient37623" @@ -7079,7 +7155,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,1,-1,0,850,297)" + gradientTransform="rotate(90,276.5,573.5)" gradientUnits="userSpaceOnUse" id="linearGradient23580" xlink:href="#linearGradient20324" @@ -7089,7 +7165,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(-1,0,0,-1,366,1072)" + gradientTransform="rotate(180,183,536)" gradientUnits="userSpaceOnUse" id="linearGradient23582" xlink:href="#linearGradient20324" @@ -7099,7 +7175,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,-1,1,0,-409,588)" + gradientTransform="rotate(-90,89.5,498.5)" gradientUnits="userSpaceOnUse" id="linearGradient23587" xlink:href="#linearGradient20324" @@ -7129,7 +7205,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,1,-1,0,870,292)" + gradientTransform="rotate(90,289,581)" gradientUnits="userSpaceOnUse" id="linearGradient23593" xlink:href="#linearGradient37623" @@ -7149,7 +7225,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,-1,1,0,-429,593)" + gradientTransform="rotate(-90,82,511)" gradientUnits="userSpaceOnUse" id="linearGradient23600" xlink:href="#linearGradient37623" @@ -7399,7 +7475,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,1,-1,0,850,297)" + gradientTransform="rotate(90,276.5,573.5)" gradientUnits="userSpaceOnUse" id="linearGradient23813" xlink:href="#linearGradient24632" @@ -7409,7 +7485,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(-1,0,0,-1,366,1072)" + gradientTransform="rotate(180,183,536)" gradientUnits="userSpaceOnUse" id="linearGradient23815" xlink:href="#linearGradient24632" @@ -7419,7 +7495,7 @@ x2="145.5" y1="627.5" x1="145.5" - gradientTransform="matrix(0,-1,1,0,-409,588)" + gradientTransform="rotate(-90,89.5,498.5)" gradientUnits="userSpaceOnUse" id="linearGradient23817" xlink:href="#linearGradient24632" @@ -7449,7 +7525,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,1,-1,0,870,292)" + gradientTransform="rotate(90,289,581)" gradientUnits="userSpaceOnUse" id="linearGradient23823" xlink:href="#linearGradient24642" @@ -7469,7 +7545,7 @@ x2="150.5" y1="647.75" x1="150.5" - gradientTransform="matrix(0,-1,1,0,-429,593)" + gradientTransform="rotate(-90,82,511)" gradientUnits="userSpaceOnUse" id="linearGradient23827" xlink:href="#linearGradient24642" @@ -8133,7 +8209,7 @@ x2="269.3085" y1="279.72827" x1="248.69196" - gradientTransform="translate(-1,0)" + gradientTransform="translate(-1)" gradientUnits="userSpaceOnUse" id="linearGradient62436" xlink:href="#linearGradient319" @@ -8153,7 +8229,7 @@ x2="327.92044" y1="283.61511" x1="354.50601" - gradientTransform="matrix(0,-1,1,0,59,638)" + gradientTransform="rotate(-90,348.5,289.5)" gradientUnits="userSpaceOnUse" id="linearGradient62560" xlink:href="#linearGradient319" @@ -8173,7 +8249,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(0,1,-1,0,638,-40)" + gradientTransform="rotate(90,339,299)" gradientUnits="userSpaceOnUse" id="linearGradient25383" xlink:href="#linearGradient1610" @@ -8183,7 +8259,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(-1,0,0,-1,699,599)" + gradientTransform="rotate(180,349.5,299.5)" gradientUnits="userSpaceOnUse" id="linearGradient25385" xlink:href="#linearGradient1610" @@ -8193,7 +8269,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(0,-1,1,0,60,660)" + gradientTransform="rotate(-90,360,300)" gradientUnits="userSpaceOnUse" id="linearGradient25387" xlink:href="#linearGradient1610" @@ -8213,7 +8289,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(0,1,-1,0,638,-40)" + gradientTransform="rotate(90,339,299)" gradientUnits="userSpaceOnUse" id="linearGradient25575" xlink:href="#linearGradient1610" @@ -8223,7 +8299,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(-1,0,0,-1,699,599)" + gradientTransform="rotate(180,349.5,299.5)" gradientUnits="userSpaceOnUse" id="linearGradient25577" xlink:href="#linearGradient1610" @@ -8233,7 +8309,7 @@ x2="344.5" y1="288.5" x1="342" - gradientTransform="matrix(0,-1,1,0,60,660)" + gradientTransform="rotate(-90,360,300)" gradientUnits="userSpaceOnUse" id="linearGradient25579" xlink:href="#linearGradient1610" @@ -8821,7 +8897,7 @@ x2="99.628899" y1="114.71685" x1="112.18942" - gradientTransform="translate(19.367382,0)" + gradientTransform="translate(19.367382)" gradientUnits="userSpaceOnUse" id="linearGradient27771" xlink:href="#linearGradient13973" @@ -8923,7 +8999,7 @@ x2="353.72073" y1="314.11398" x1="352.98236" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,-346.7085,428.4841)" + gradientTransform="rotate(-45,343.872,632.75601)" gradientUnits="userSpaceOnUse" id="linearGradient53127" xlink:href="#linearGradient37542" @@ -9157,7 +9233,7 @@ x2="-14.000002" y1="448" x1="-22.902081" - gradientTransform="translate(2e-6,0)" + gradientTransform="translate(2e-6)" gradientUnits="userSpaceOnUse" id="linearGradient50870" xlink:href="#linearGradient23178" @@ -9185,7 +9261,7 @@ x2="452.63602" y1="89.363937" x1="458.99997" - gradientTransform="matrix(0.7071068,-0.7071068,0.7071067,0.7071067,-140.04288,401.30258)" + gradientTransform="rotate(-45,414.39357,369.69801)" gradientUnits="userSpaceOnUse" id="linearGradient33585" xlink:href="#linearGradient9030" @@ -9824,7 +9900,7 @@ x2="332.88193" y1="126.23978" x1="387.30396" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,-241.7085,428.4841)" + gradientTransform="rotate(-45,396.37194,506.00979)" gradientUnits="userSpaceOnUse" id="linearGradient37636" xlink:href="#linearGradient37542" @@ -9834,7 +9910,7 @@ x2="353.72073" y1="314.11398" x1="352.98236" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,-346.7085,428.4841)" + gradientTransform="rotate(-45,343.872,632.75601)" gradientUnits="userSpaceOnUse" id="linearGradient37638" xlink:href="#linearGradient37542" @@ -11307,7 +11383,7 @@ x2="-20" y1="283" x1="-20" - gradientTransform="translate(-2,0)" + gradientTransform="translate(-2)" gradientUnits="userSpaceOnUse" id="linearGradient38570" xlink:href="#linearGradient1610" @@ -11473,7 +11549,7 @@ x2="97.75" y1="84.25" x1="101" - gradientTransform="translate(21,0)" + gradientTransform="translate(21)" gradientUnits="userSpaceOnUse" id="linearGradient39843-3" xlink:href="#linearGradient1610-8" @@ -11494,7 +11570,7 @@ x2="96.592278" y1="81.439644" x1="87.44548" - gradientTransform="translate(21,0)" + gradientTransform="translate(21)" gradientUnits="userSpaceOnUse" id="linearGradient39845-2" xlink:href="#linearGradient319-77" @@ -11606,7 +11682,7 @@ x2="424.75217" y1="77" x1="437.98615" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient41672" xlink:href="#linearGradient319" @@ -11616,7 +11692,7 @@ x2="424.75217" y1="78" x1="438.61115" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient41674" xlink:href="#linearGradient319" @@ -11626,7 +11702,7 @@ x2="424.75217" y1="77.44017" x1="441.98615" - gradientTransform="translate(0.01387,0)" + gradientTransform="translate(0.01387)" gradientUnits="userSpaceOnUse" id="linearGradient41676" xlink:href="#linearGradient319" @@ -11718,7 +11794,7 @@ x2="99.628899" y1="113.45913" x1="111.46314" - gradientTransform="translate(19.367382,0)" + gradientTransform="translate(19.367382)" gradientUnits="userSpaceOnUse" id="linearGradient38724" xlink:href="#linearGradient13973" @@ -11864,7 +11940,7 @@ x2="-28.177105" y1="-121.58411" x1="-70.605209" - gradientTransform="translate(22,0)" + gradientTransform="translate(22)" gradientUnits="userSpaceOnUse" id="linearGradient39686-1" xlink:href="#linearGradient1610-3-7" @@ -11885,7 +11961,7 @@ x2="-55.5975" y1="-124" x1="-74" - gradientTransform="translate(22,0)" + gradientTransform="translate(22)" gradientUnits="userSpaceOnUse" id="linearGradient39688-9" xlink:href="#linearGradient319-5-9-4" @@ -13353,7 +13429,7 @@ x2="-88" y1="408" x1="-97" - gradientTransform="translate(6,0)" + gradientTransform="translate(6)" gradientUnits="userSpaceOnUse" id="linearGradient38695" xlink:href="#linearGradient16500" @@ -13393,7 +13469,7 @@ x2="-88" y1="413.51562" x1="-90.5" - gradientTransform="matrix(-1,0,0,-1,-157,821.03125)" + gradientTransform="rotate(180,-78.5,410.51562)" gradientUnits="userSpaceOnUse" id="linearGradient38706" xlink:href="#linearGradient319" @@ -13413,7 +13489,7 @@ x2="-88" y1="408" x1="-97" - gradientTransform="translate(8,0)" + gradientTransform="translate(8)" gradientUnits="userSpaceOnUse" id="linearGradient38723" xlink:href="#linearGradient16500" @@ -13443,7 +13519,7 @@ x2="-86.75" y1="413.98114" x1="-89.75" - gradientTransform="matrix(-1,0,0,-1,-156,821.03125)" + gradientTransform="rotate(180,-78,410.51562)" gradientUnits="userSpaceOnUse" id="linearGradient38729" xlink:href="#linearGradient319" @@ -13463,7 +13539,7 @@ x2="-86.75" y1="413.98114" x1="-89.75" - gradientTransform="matrix(-1,0,0,-1,-156,824.54874)" + gradientTransform="rotate(180,-78,412.27437)" gradientUnits="userSpaceOnUse" id="linearGradient38736" xlink:href="#linearGradient319" @@ -13492,7 +13568,7 @@ x2="-88" y1="408" x1="-97" - gradientTransform="translate(6,0)" + gradientTransform="translate(6)" gradientUnits="userSpaceOnUse" id="linearGradient39203" xlink:href="#linearGradient16500" @@ -13541,7 +13617,7 @@ x2="-88" y1="408" x1="-97" - gradientTransform="translate(6,0)" + gradientTransform="translate(6)" gradientUnits="userSpaceOnUse" id="linearGradient39252" xlink:href="#linearGradient16500" @@ -13654,7 +13730,7 @@ x2="58.680996" y1="641.73358" x1="39.102718" - gradientTransform="translate(-20,0)" + gradientTransform="translate(-20)" gradientUnits="userSpaceOnUse" id="linearGradient39508" xlink:href="#linearGradient319-46" @@ -13885,7 +13961,7 @@ x2="99.628899" y1="112.62726" x1="111.2239" - gradientTransform="translate(19.367382,0)" + gradientTransform="translate(19.367382)" gradientUnits="userSpaceOnUse" id="linearGradient40639-1-2-1" xlink:href="#linearGradient13973-3-7-8" @@ -14295,7 +14371,7 @@ x2="336.40625" y1="108.35222" x1="351.15625" - gradientTransform="matrix(-1,0,0,-1,698,183)" + gradientTransform="rotate(180,349,91.5)" gradientUnits="userSpaceOnUse" id="linearGradient44944" xlink:href="#linearGradient44939-8" @@ -14563,7 +14639,7 @@ x2="353.72073" y1="314.11398" x1="352.98236" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,-346.7085,428.4841)" + gradientTransform="rotate(-45,343.872,632.75601)" gradientUnits="userSpaceOnUse" id="linearGradient25449" xlink:href="#linearGradient37542" @@ -14818,7 +14894,7 @@ id="stop37546-94" /> </linearGradient> <linearGradient - gradientTransform="matrix(0,1,-1,0,634.98585,-146.00607)" + gradientTransform="rotate(90,390.49596,244.48989)" y2="247.99998" x2="392.0101" y1="222.99998" @@ -15112,13 +15188,13 @@ x2="752" y1="402" x1="743" - gradientTransform="matrix(0,-1,1,0,-239.00001,1286)" + gradientTransform="rotate(-90,523.5,762.5)" gradientUnits="userSpaceOnUse" id="linearGradient28583" xlink:href="#linearGradient16500" inkscape:collect="always" /> <linearGradient - gradientTransform="matrix(0,1,-1,0,574.99991,384.00001)" + gradientTransform="rotate(90,95.49995,479.49996)" y2="406.47784" x2="161.83331" y1="413.87982" @@ -15142,7 +15218,7 @@ x2="163.11441" y1="544.21143" x1="148.56801" - gradientTransform="matrix(0,1,-1,0,719.99999,383.00001)" + gradientTransform="rotate(90,168.49999,551.5)" gradientUnits="userSpaceOnUse" id="linearGradient28600" xlink:href="#linearGradient319" @@ -15685,7 +15761,7 @@ x2="85.347076" y1="100.22395" x1="85.548706" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,257.1483,118.6716)" + gradientTransform="rotate(-45,271.82331,-251.06972)" gradientUnits="userSpaceOnUse" id="linearGradient31019" xlink:href="#linearGradient319" @@ -15705,7 +15781,7 @@ x2="85.347076" y1="100.22395" x1="85.548706" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,257.1483,118.6716)" + gradientTransform="rotate(-45,271.82331,-251.06972)" gradientUnits="userSpaceOnUse" id="linearGradient31055" xlink:href="#linearGradient319" @@ -15725,7 +15801,7 @@ x2="85.347076" y1="100.22395" x1="85.548706" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,257.1483,118.6716)" + gradientTransform="rotate(-45,271.82331,-251.06972)" gradientUnits="userSpaceOnUse" id="linearGradient31151" xlink:href="#linearGradient319" @@ -15745,7 +15821,7 @@ x2="85.60022" y1="99.348953" x1="85.861206" - gradientTransform="matrix(0.707107,-0.707107,0.707107,0.707107,257.14826,118.6716)" + gradientTransform="rotate(-45,271.82329,-251.06967)" gradientUnits="userSpaceOnUse" id="linearGradient31155" xlink:href="#linearGradient30958" @@ -15850,7 +15926,7 @@ x2="-303.00003" y1="475" x1="-307" - gradientTransform="translate(-42,0)" + gradientTransform="translate(-42)" gradientUnits="userSpaceOnUse" id="linearGradient52998-5-5" xlink:href="#linearGradient319-31-8-9-1" @@ -15882,7 +15958,7 @@ x2="-304.76843" y1="476.0105" x1="-308.7684" - gradientTransform="translate(-42,0)" + gradientTransform="translate(-42)" gradientUnits="userSpaceOnUse" id="linearGradient53000-3-9" xlink:href="#linearGradient319-31-8-9-1" @@ -16560,25 +16636,30 @@ d="" sodipodi:nodetypes="cc" id="path23417" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#1a1a1a;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#1a1a1a;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> <path inkscape:connector-curvature="0" d="" sodipodi:nodetypes="cc" id="path23347" - style="fill:none;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <g inkscape:groupmode="layer" id="layer4" inkscape:label="sheet_layout" - style="display:inline" /> + style="display:none" + transform="translate(116,578)" /> <g - transform="translate(-872,-180)" + transform="translate(-756,398)" style="display:inline" id="layer1" inkscape:groupmode="layer" inkscape:label="ICONS"> <g + style="opacity:0.5" + id="g7488" + transform="translate(218)" /> + <g transform="translate(-211.20006,170)" id="g10203" /> <g @@ -16748,7 +16829,7 @@ <g id="g17117" /> <g - transform="translate(9,0)" + transform="translate(9)" id="g17121" /> <g id="g17128" @@ -16797,7 +16878,7 @@ transform="translate(67,200.06499)" id="g22051" /> <g - transform="translate(-23,0)" + transform="translate(-23)" id="g40816"> <g id="g40830" /> @@ -16855,7 +16936,7 @@ inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\BLENDER ICONSET\blender-cvs-windows\.blender\.blender\icons\jendrzych's iconset.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - transform="matrix(-1,0,0,-1,104.1613,262.99999)" + transform="rotate(180,52.08065,131.5)" style="display:inline;stroke:#ffffff"> <path inkscape:connector-curvature="0" @@ -16918,13 +16999,6 @@ inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - <rect - y="180" - x="872" - height="192" - width="192" - id="rect30285" - style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.39191818;marker:none;enable-background:accumulate" /> <g transform="translate(0,12)" id="g46790" /> @@ -16937,714 +17011,233 @@ d="" inkscape:connector-curvature="0" /> <g - id="g15770-4" - transform="translate(-1653.0047,902.99644)" - style="display:inline;opacity:0.6;enable-background:new"> - <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - id="path15766-8" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="cccccccc" - inkscape:connector-curvature="0" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path15768-2" /> - </g> - <path - sodipodi:nodetypes="ccssssssccccscssscccccsscscsccccssccc" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 875.49998,329 c -0.4167,0 -0.7749,0.19292 -1.041,0.45898 -0.2661,0.26607 -0.459,0.62435 -0.459,1.04102 v 32 c 0,3.03164 2.4684,5.5 5.5,5.5 H 912.5 c 3.0316,0 5.5,-2.46836 5.5,-5.5 v -20 c 0,-0.42425 -0.1991,-0.77237 -0.4648,-1.04883 -0.2658,-0.27646 -0.6395,-0.51191 -1.1055,-0.44531 l 0.07,-0.006 h -6.5 -27.50002 c -0.095,0 -0.1807,0.0361 -0.3223,0.17773 -0.1417,0.14177 -0.1777,0.22697 -0.1777,0.32227 v 21 c 0,1.20549 -0.8756,2.25014 -2.0625,2.46094 -1.1869,0.2108 -2.3701,-0.46784 -2.7852,-1.59961 -0.041,-0.1158 -0.061,-0.23824 -0.058,-0.36119 h 2.4062 v -0.008 c 0.03,-2.1e-4 0.058,0.005 0.088,0 0.2451,-0.0435 0.4121,-0.2432 0.4121,-0.49219 v -21 c 0,-0.74923 0.3782,-1.35083 0.7637,-1.73633 0.3856,-0.38565 0.9871,-0.76367 1.7363,-0.76367 h 27.50002 v -4.5 c 0,-0.41667 -0.1929,-0.77495 -0.459,-1.04102 -0.2661,-0.26606 -0.6243,-0.45898 -1.041,-0.45898 l -18.02732,0.0449 c -0.055,1.2e-4 -0.1892,-0.0544 -0.2989,-0.17383 -0.1114,-0.1193 -0.1738,-0.28349 -0.1738,-0.37109 v -2 c 0,-0.41667 -0.1929,-0.77495 -0.459,-1.04102 -0.2661,-0.26606 -0.6243,-0.45898 -1.041,-0.45898 z" - id="path15794" - inkscape:connector-curvature="0" /> - <g - transform="translate(-1139.094,997)" + transform="translate(810,316.5)" style="display:inline;enable-background:new" - id="g16516"> - <g - id="g15792" - transform="translate(-500,-182)" - style="opacity:0.6"> - <path - sodipodi:nodetypes="cscssscssssssssssccsc" - inkscape:connector-curvature="0" - d="m 2564.8618,-451.50005 c 0.3211,0.5561 0.8787,0.91004 1.4878,0.98518 0.2496,0.0308 0.5078,0.0148 0.7619,-0.0533 0.8744,-0.23427 1.4824,-1.02663 1.4824,-1.93185 v -22 c 0,-0.4714 0.5286,-1 1,-1 l 34,2e-5 c 0.4667,-0.0667 1,0.52863 1,1.00003 v 22 c 0,2.76142 -2.2386,5 -5,5 h -33 c -2.7614,0 -5,-2.23858 -5,-5 v -33 c 0,-0.5 0.5,-1 1,-1 h 13 c 0.5,0 1,0.5 1,1 v 2 c 0,0.5 0.4872,1.0452 0.9723,1.0442 l 18.0277,-0.0442 c 0.5,0 1,0.5 1,1 v 2" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path15787" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path15790" - d="m 2596.5,-479.5 v 1.5" - style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - </g> - <g - id="g15799" - transform="matrix(0,1,1,0,2028.5,-908.5)" - style="display:inline;opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new" - inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> - <path - id="path15797" - style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke" - d="m 271.5,63.5 v -5 c 0,-1.104569 -0.89543,-2 -2,-2 h -11 m 4,5 -5,-5 5,-5" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccc" /> - </g> - </g> + id="g72880" /> + <image + sodipodi:absref="C:\Users\Andrzej Ambroż\Desktop\a230341b4bf9a9d653c3e8062c4702e859d6d32f.png" + y="143.4964" + x="8460.25" + id="image7203" + xlink:href="file:///C:/Users/Andrzej%20Ambro%C5%BC/Desktop/a230341b4bf9a9d653c3e8062c4702e859d6d32f.png" + style="stroke-width:0.69403505;image-rendering:optimizeSpeed" + preserveAspectRatio="none" + height="487.00717" + width="1377.452" /> <g - style="display:inline;opacity:0.6;enable-background:new" - transform="translate(-1653.0001,855.00002)" - id="g6937"> + transform="translate(-30,-450)" + id="g7205" /> + <g + id="g7480" + transform="matrix(8.4250411,0,0,8.2967687,-7333.563,3000.3193)" + style="stroke-width:0.1196078" /> + <g + style="stroke-width:0.1196078" + transform="matrix(8.4250411,0,0,-8.2967687,-7336.563,-3470.4526)" + id="g7569" /> + <g + id="g7599" + style="display:inline;opacity:1;enable-background:new" + transform="matrix(1.4999383,0,0,1.4999989,-371.4454,70.499748)"> <path + sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" - id="path6933" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + d="m 884,-165 c 0,0.55581 -0.4477,1.00353 -1,1 h -92.0036 c -0.5558,0.004 -1.0036,-0.44419 -1,-1 v -86 c 0,-1.32609 0.5269,-2.59785 1.4824,-3.51777 l 34,-34 c 0.9198,-0.95544 2.1916,-1.48222 3.5176,-1.48223 l 53.9911,2e-5 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 z" + style="display:inline;opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + id="path7410" /> <path - id="path6935" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 76.996094,21 c -1.59084,10e-6 -3.126431,0.634133 -4.238282,1.789062 L 38.785156,56.761719 C 37.630236,57.873629 36.996094,59.40902 36.996094,61 v 85.99414 c -0.007,1.09637 0.910592,2.01376 2.007812,2.00586 H 130.99414 C 132.09029,149.007 133,148.0928 133,147 L 132.9883,23 v -0.002 c -0.003,-1.09124 -0.90724,-1.998107 -2,-1.998047 z M 130.33323,146.33338 H 39.66283 V 62.999985 c 0.0019,-1.44306 0.588363,-2.666668 2.000083,-2.666668 h 32.001316 c 1.09262,-1.2e-4 2.666576,-0.914632 2.666776,-2.000002 v -32.66669 c 0,-1.411771 0.588253,-2.000002 2.000083,-2.000002 h 52.002142 z" + transform="translate(752,-312)" + id="path7412" inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccc" /> + sodipodi:nodetypes="cccscccccccccccsccsscc" /> </g> <g - id="g6943" - transform="translate(-1701.0001,855.00002)" - style="display:inline;opacity:0.6;enable-background:new"> + style="display:inline;stroke-width:0.10177074;enable-background:new" + id="g7452" + transform="matrix(14.821991,0,0,14.654739,-7507.9905,-1149.2844)"> + <path + style="display:inline;opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.20354147;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + d="m 613.67414,61.535437 h 8.65173 c 0.57439,0 1.03681,0.46242 1.03681,1.036816 v 2.839759 c 0,0.574396 -0.46242,1.036815 -1.03681,1.036815 h -8.65173 c -0.57439,0 -1.03681,-0.462419 -1.03681,-1.036815 v -2.839759 c 0,-0.574396 0.46242,-1.036816 1.03681,-1.036816 z" + id="rect7450" + inkscape:connector-curvature="0" /> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - id="path6939" + id="path7424" + transform="matrix(0.10118267,0,0,0.10236222,598.97766,126.33073)" + d="M 145.24609,-711 C 139.56927,-711 135,-706.4825 135,-700.87109 v 78 C 135,-628.4825 139.56927,-633 145.24609,-633 h 85.50782 c 5.67682,0 10.24609,4.5175 10.24609,10.12891 v -78 C 241,-706.4825 236.43073,-711 230.75391,-711 Z" + style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" inkscape:connector-curvature="0" /> <path - sodipodi:nodetypes="cccccccc" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 553.24414,21.003906 c -6.21668,0 -11.25391,4.978036 -11.25391,11.123047 v 78.001957 27.74414 c 0,6.14501 5.03723,11.12304 11.25391,11.12304 h 85.51172 c 2.7198,0 5.21303,-0.95235 7.1582,-2.53906 2.50094,-2.04005 4.09571,-5.12741 4.09571,-8.58398 V 110.12891 32.126953 c 0,-6.145011 -5.03723,-11.123047 -11.25391,-11.123047 z m 0,1.984375 h 85.51172 c 5.13704,0 9.24609,4.060861 9.24609,9.138672 v 71.667967 c -2.03176,-2.89305 -5.41213,-4.789061 -9.24609,-4.789061 h -85.51172 c -3.83396,0 -7.21433,1.896011 -9.24609,4.789061 V 32.126953 c 0,-5.077811 4.10905,-9.138672 9.24609,-9.138672 z m 0,78.001949 h 85.51172 c 5.13704,0 8.58679,4.26374 8.58679,9.34155 v 27.33166 c 0,5.07781 -3.53119,8.66614 -8.66823,8.66614 h -85.34878 c -5.13704,0 -8.66823,-3.58833 -8.66823,-8.66614 v -27.33166 c 0,-5.07781 3.44969,-9.34155 8.58673,-9.34155 z" + id="rect7426" + transform="matrix(0.10118267,0,0,0.10236222,557.69513,51.299216)" inkscape:connector-curvature="0" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path6941" /> - </g> - <g - style="display:inline;opacity:0.6;enable-background:new" - transform="translate(-1749.0047,854.99644)" - id="g6949"> + sodipodi:nodetypes="sscssscscsssssscsscsssssssssss" /> <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.10177073;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 621.91311,62.457001 c 0.22334,0 0.40429,0.180956 0.40429,0.404297 v 0.0098 c 0,0.22334 -0.18095,0.404297 -0.40429,0.404297 -0.22335,0 -0.40625,-0.180957 -0.40625,-0.404297 v -0.0098 c 0,-0.223341 0.1829,-0.404297 0.40625,-0.404297 z" + id="rect7434" inkscape:connector-curvature="0" - id="path6945" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + sodipodi:nodetypes="sssssss" /> <path - id="path6947" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.20354147;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 613.57935,62.45579 c -0.056,0.0012 -0.10057,0.04747 -0.0996,0.103516 v 2.867187 c -0.01,0.144644 0.21266,0.144644 0.20312,0 v -2.867187 c 9.9e-4,-0.05757 -0.0459,-0.104503 -0.10351,-0.103516 z m 0.60742,0 c -0.056,0.0012 -0.10057,0.04747 -0.0996,0.103516 v 2.867187 c -0.01,0.144644 0.21266,0.144644 0.20312,0 v -2.867187 c 9.9e-4,-0.05757 -0.0459,-0.104503 -0.10351,-0.103516 z m 0.60742,0 c -0.0568,1.15e-4 -0.10253,0.04671 -0.10156,0.103516 v 2.867187 c 0,0.136713 0.20507,0.136713 0.20507,0 v -2.867187 c 9.9e-4,-0.05757 -0.0459,-0.104503 -0.10351,-0.103516 z m 0.60742,0 c -0.0568,1.15e-4 -0.10253,0.04671 -0.10156,0.103516 v 2.867187 c -0.01,0.144644 0.21266,0.144644 0.20312,0 v -2.867187 c 9.7e-4,-0.0568 -0.0447,-0.103401 -0.10156,-0.103516 z m 0.60547,0 c -0.056,0.0012 -0.10057,0.04747 -0.0996,0.103516 v 2.867187 c -0.01,0.144644 0.21266,0.144644 0.20312,0 v -2.867187 c 9.9e-4,-0.05757 -0.0459,-0.104503 -0.10351,-0.103516 z" + id="path7444" inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccc" /> + sodipodi:nodetypes="ccccccccccccccccssccccccccccccccc" /> </g> <g - id="g6955" - transform="translate(-1797.0001,855.00002)" - style="display:inline;opacity:0.6;enable-background:new"> + transform="matrix(12.319682,0,0,12.172353,-5727.9739,-984.34032)" + id="g7322" + style="display:inline;stroke-width:0.12309717;enable-background:new"> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - id="path6951" + style="display:inline;opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.24619435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + d="m 613.67414,61.612633 h 8.65173 c 0.57439,0 1.03681,0.46242 1.03681,1.036815 v 2.762566 c 0,0.574395 -0.46242,1.036815 -1.03681,1.036815 h -8.65173 c -0.57439,0 -1.03681,-0.46242 -1.03681,-1.036815 v -2.762566 c 0,-0.574395 0.46242,-1.036815 1.03681,-1.036815 z" + id="rect7418" inkscape:connector-curvature="0" /> <path - sodipodi:nodetypes="cccccccc" + style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.41910744;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + d="M 145.24609,-711 C 139.56928,-711.01185 135,-706.4825 135,-700.87109 v 78 c 0,-5.61141 4.56928,-10.14076 10.24609,-10.12891 l 85.17749,0.17786 c 5.67681,0.0118 10.24609,4.5175 10.24609,10.12891 v -78 c 0,-5.61141 -4.56928,-10.11706 -10.24609,-10.12891 l -42.58875,-0.0889 z" + transform="matrix(0.10118267,0,0,0.10236222,598.97766,126.33073)" + id="rect7413" inkscape:connector-curvature="0" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path6953" /> - </g> - <g - id="g6961" - transform="translate(-1653.0001,807.00002)" - style="display:inline;opacity:0.6;enable-background:new"> - <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - id="path6957" - inkscape:connector-curvature="0" /> + sodipodi:nodetypes="sscsscsscs" /> <path - sodipodi:nodetypes="cccccccc" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 717.48242,42.996094 c -5.24135,0 -9.49414,4.190752 -9.49414,9.355468 v 65.017578 22.26953 c 0,5.16472 4.25279,9.35547 9.49414,9.35547 h 70.02539 c 5.24136,0 9.49414,-4.19075 9.49414,-9.35547 V 117.36914 52.351562 c 0,-5.164716 -4.25278,-9.355468 -9.49414,-9.355468 z m 0,1.984375 h 70.02539 c 4.15996,0 7.48047,3.271903 7.48047,7.371093 v 59.269528 c -1.73801,-2.19271 -4.43984,-3.60742 -7.48047,-3.60742 h -70.02539 c -3.04062,0 -5.74244,1.41471 -7.48047,3.60742 V 52.351562 c 0,-4.09919 3.32052,-7.371093 7.48047,-7.371093 z m 0,65.017581 h 70.02539 c 4.15996,0 6.83699,3.09749 6.83699,7.19667 v 22.52459 c 0,4.09919 -2.48286,6.62487 -6.64282,6.62487 h -70.41379 c -4.15995,0 -6.64281,-2.52568 -6.64281,-6.62487 v -22.52459 c 0,-4.09918 2.67709,-7.19667 6.83704,-7.19667 z" + transform="matrix(0.12219364,0,0,0.1240074,526.00203,48.095825)" + id="rect7312" inkscape:connector-curvature="0" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path6959" /> + sodipodi:nodetypes="sscsssscsssssscsscssssssssscs" /> + <g + id="g7411" + transform="matrix(-1,0,0,1,1235.8994,0)" + style="stroke-width:0.12309717"> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12309717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 613.88871,62.499044 c -0.23599,0 -0.42773,0.193143 -0.42773,0.429687 v 0.0098 c 0,0.236544 0.19174,0.429687 0.42773,0.429687 0.23599,0 0.42774,-0.193143 0.42774,-0.429687 v -0.0098 c 0,-0.236544 -0.19175,-0.429687 -0.42774,-0.429687 z" + id="rect7316" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssss" /> + <g + transform="translate(6.2733256)" + id="g7368" + style="display:inline;stroke-width:0.12309717;enable-background:new"> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.24619435;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 613.40672,62.503838 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 V 65.4804 c 0,0.165367 0.24805,0.165367 0.24805,0 v -2.851562 c 0.002,-0.07532 -0.0639,-0.13455 -0.13868,-0.125 z m 0.64679,10e-7 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 V 65.4804 c -0.005,0.169458 0.25158,0.169458 0.24609,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.124999 z m 0.64937,10e-7 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 v 2.85156 c -0.005,0.169458 0.25158,0.169458 0.24609,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.124998 z m 0.65195,1e-6 c -0.0633,0.0071 -0.11075,0.06131 -0.10938,0.125 v 2.85156 c -0.005,0.169247 0.25137,0.169247 0.2461,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.124998 z m 0.64937,-3e-6 c -0.0633,0.0071 -0.11075,0.06131 -0.10938,0.125 V 65.4804 c -0.005,0.169248 0.25136,0.169248 0.2461,0 v -2.851563 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.124999 z" + id="path7359" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccsscccccccccccccccccccccccccc" /> + </g> + </g> </g> <g - style="display:inline;opacity:0.6;enable-background:new" - transform="translate(-1701.0001,807.00002)" - id="g6967"> + id="g7565" + transform="matrix(1.4994746,0,0,1.4999989,314.92923,431.89982)"> <path + id="path28027-5" + transform="translate(294.00001,-553.00001)" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00098109;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 816.43612,111.73314 c 0,0.5515 0.7823,1.33328 1.3338,1.33333 h 10.0035 c 0.5538,-5e-5 1.3359,-0.77955 1.3338,-1.33333 v -8.00001 c -0.0108,-2.92338 -2.53774,-5.20733 -5.3352,-5.666667 l 3e-5,-63.33338 c -9e-4,-7.597621 -6.34645,-13.676694 -14.00685,-13.666674 l -44.01737,-3e-6 c -7.9872,0.0106 -13.99805,6.01116 -13.99805,14 v 9 l 2.07069,-0.06546 v -9 c 0,-7.01107 4.91866,-11.925191 11.93126,-11.934541 l 44.01542,3e-6 c 6.5948,-0.009 12.0041,5.153493 12.0049,11.666674 l -3e-5,63.331427 c -2.80192,0.45829 -5.33501,2.738541 -5.3359,5.668621 z m 2.0007,2.66667 v 5.33334 c 6e-5,0.55226 0.78364,1.33327 1.3359,1.33333 h 6 c 0.55226,-6e-5 1.33374,-0.78107 1.3338,-1.33333 v -5.33334 h -2.0007 v 4.66667 h -4.6683 v -4.66667 z" inkscape:connector-curvature="0" - id="path6963" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> - <path - id="path6965" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccc" /> + sodipodi:nodetypes="cccccccccsccsccccccccccccccccc" /> </g> <g - id="g6973" - transform="translate(-1749.0047,806.99644)" - style="display:inline;opacity:0.6;enable-background:new"> + id="g7749" + transform="matrix(1.4998278,0,0,1.4999989,-448.32862,-37.50017)" + style="display:inline;opacity:1;enable-background:new"> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - id="path6969" + sodipodi:nodetypes="sssssssss" + id="path7747" + d="m 998.5,-179 h 121 c 1.385,0 2.5,1.115 2.5,2.5 v 66 c 0,1.385 -1.115,2.5 -2.5,2.5 h -121 c -1.385,0 -2.5,-1.115 -2.5,-2.5 v -66 c 0,-1.385 1.115,-2.5 2.5,-2.5 z" + style="opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:105.70774078;stroke-opacity:1;marker:none;paint-order:fill markers stroke" inkscape:connector-curvature="0" /> <path - sodipodi:nodetypes="cccccccc" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:105.70774078;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 195.5,38 c -1.94642,0 -3.5,1.60898 -3.5,3.5 v 89 c 0,1.9217 1.5783,3.5 3.5,3.5 h 121 c 1.9217,0 3.5,-1.5783 3.5,-3.5 l 0.0147,-78.333361 c 0,-1.9217 -1.5783,-3.5 -3.5,-3.5 h -77 c -0.3983,10e-6 -0.77905,-0.157923 -1.06055,-0.439453 -0.2816,-0.2816 -0.43841,-0.662348 -0.43945,-1.060547 L 238,41.5 C 237.995,39.578306 236.4217,38 234.5,38 Z m -0.83305,27.333318 c 0,-0.8551 0.48518,-1.333334 1.33348,-1.333334 h 120.01378 c 0.8483,0 1.33349,0.485033 1.33349,1.333334 v 64.666712 c 0,0.84831 -0.48519,1.33334 -1.33349,1.33334 l -120.01378,0 c -0.8483,0 -1.33783,-0.48505 -1.33348,-1.33334" + transform="translate(803,-241)" + id="path7743" inkscape:connector-curvature="0" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - id="path6971" /> + sodipodi:nodetypes="sccssccsccsssscssssssc" /> </g> <g style="display:inline;opacity:0.6;enable-background:new" - transform="translate(-1797.0001,807.00002)" - id="g6979"> - <path - inkscape:connector-curvature="0" - id="path6975" - d="m 2691.4961,-577 c -1.4585,10e-6 -2.8611,0.57961 -3.877,1.63477 L 2673.293,-561 h 14.705 c 0.5523,-6e-5 0.9999,-0.44774 1,-1 v -10.5 c 0,-1.94484 1.5551,-3.5 3.5,-3.5 0.6573,-0.009 0.9864,-0.50465 0.9864,-1 z" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> - <path - id="path6977" - style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" - d="m 2691.4963,-576.50002 h 19.9969 c 0.5523,-3e-5 1,0.44769 1.0015,0.99998 l 0.01,41.00357 c 0,0.55581 -0.4477,1.00353 -1,1 h -37.0035 c -0.5559,0.004 -1.0036,-0.44419 -1,-1 v -24.00355" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccc" /> - </g> - <g - transform="translate(810,316.5)" - style="display:inline;enable-background:new" - id="g72880" /> - <g - id="g3789"> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 996,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 -1.25 h -1 V 193 h -1 v -3 h 2 v -1 z" - id="path72434" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect72436" - width="1" - height="5" - x="1029" - y="189" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 954,189 v 4 h -1 v -1 h -1 v 1 h 0.75 v 1 h 1.5 v -1 H 955 v -4 z" - id="path72438" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 999,189 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - id="path72440" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 975,189 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - id="path72442" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 940,189 v 0.75 h -1 v 1.5 h 1 V 192 h 1 v 1 h -2 v 1 h 2 v -0.75 h 1 v -1.5 h -1 V 191 h -1 v -1 h 1.5 v -1 z" - id="path72446" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 964,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path72448" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 943,189 v 4.25 h 1 V 194 h 2 v -0.75 h 1 V 189 h -1 v 4 h -2 v -4 z" - id="path72450" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 948,189 v 5 h 1 1 v -0.5 h 1 V 192 h -0.75 v -1 H 951 v -1.25 h -1 V 189 h -1 z m 1,1 h 1 v 1 h -1 z m 0,2 h 1 v 1 h -1 z" - id="path72452" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 961,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 h -2 v -3 h 2 v -1 z" - id="path72454" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 956,189 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - id="path72456" /> - <path - inkscape:connector-curvature="0" - id="path72458" - d="m 1019,189 v 5 h 1 2 v -1 h -2 v -4 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" /> - <path - id="path72460" - d="m 970,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 981,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path72462" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 985,189 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - id="path72464" /> - <path - id="path72466" - d="m 989,189 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72468" - d="m 1004,189 v 4.25 h 1 V 194 h 2 v -0.75 h 1 V 189 h -1 v 4 h -2 v -4 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72470" - d="m 1012,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 -1.25 h -1 V 193 h -1 v -3 h 2 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1015,189 v 5 h 1 v -2 h 1.25 v -1 h 0.75 v -1.25 h -1 V 189 h -1 z m 1,1 h 1 v 1 h -1 z" - id="path72472" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1025,189 v 5 h 1 2 v -1 h -2 v -4 z" - id="path72474" - inkscape:connector-curvature="0" /> - <path - id="path72476" - d="m 1032,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 h -2 v -3 h 2 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1035,189 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - id="path72478" /> - <path - id="path72480" - d="m 1039,189 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72482" - d="m 1045,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 h -2 v -3 h 2 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72484" - d="m 1048,189 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1052.75,193 v 1 H 1052 v 1 h 1 v -1 h 1 v -1 z" - id="path72486" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 882,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path32008-7" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 886,189 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - id="path32010-4" - inkscape:connector-curvature="0" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect32012-0" - width="1" - height="5" - x="890" - y="189" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 893,189 v 0.75 h -1 v 1.5 h 1 V 192 h 1 v 1 h -2 v 1 h 2 v -0.75 h 1 v -1.5 h -1 V 191 h -1 v -1 h 1.5 v -1 z" - id="path32015-9" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 899,189 v 0.75 h -1 v 3.5 h 1 V 194 h 2 v -1 h -2 v -3 h 2 v -1 z" - id="path32017-4" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 907,189 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - id="path32019-8" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 903,189 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - id="path32021-8" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 912,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path32023-2" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 916,189 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - id="path32026-4" - inkscape:connector-curvature="0" /> - <path - id="path32029-5" - d="m 920,189 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path32031-5" - d="m 925,189 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect32033-1" - width="1" - height="5" - x="931" - y="189" /> - <path - id="path32035-7" - d="m 934,189 v 0.75 h -1 v 1.5 h 1 V 192 h 1 v 1 h -2 v 1 h 2 v -0.75 h 1 v -1.5 h -1 V 191 h -1 v -1 h 1.5 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 888,197 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - id="path72562" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect72564" - width="1" - height="5" - x="892" - y="197" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 882,197 v 3.25 h 1 V 202 h 1 v -1.75 h 1 V 202 h 1 v -1.75 h 1 V 197 h -1 v 3 h -1 v -2 h -1 v 2 h -1 v -3 z" - id="path72576" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 940,197 v 2.25 h 1 V 202 h 1 v -2.75 h 1 V 197 h -1 v 2 h -1 v -2 z" - id="path72578" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 904.75,197 v 1 H 904 v 4 h 1 v -2 h 1 v 2 h 1 v -4 h -0.75 v -1 z m 0.25,1 h 1 v 1 h -1 z" - id="path72580" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 895,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 h -2 v -3 h 2 v -1 z" - id="path72582" /> - <path - id="path72588" - d="m 898,197 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72590" - d="m 909,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 h -2 v -3 h 2 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 913,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 h -2 v -3 h 2 v -1 z" - id="path72592" /> - <path - id="path72594" - d="m 917,197 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 921,197 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v -1 z m 1,0 h 1 v 3 h 1 v -5 h -1 v 1 h -1 z" - id="path72596" /> - <path - id="path72598" - d="m 927,197 v 5 h 1 v -2 h 1.25 v -1 H 930 v -1.25 h -1 V 197 h -1 z m 1,1 h 1 v 1 h -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72600" - d="m 931.75,197 v 1 H 931 v 4 h 1 v -2 h 1 v 2 h 1 v -4 h -0.75 v -1 z m 0.25,1 h 1 v 1 h -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72602" - d="m 935,197 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <rect - y="197" - x="946" - height="5" - width="1" - id="rect72604" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" /> - <path - id="path72606" - d="m 948,197 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72608" - d="m 954.75,197 v 1 H 954 v 4 h 1 v -2 h 1 v 2 h 1 v -4 h -0.75 v -1 z m 0.25,1 h 1 v 1 h -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 958,197 v 5 h 1 2 v -1 h -2 v -4 z" - id="path72610" - inkscape:connector-curvature="0" /> - <path - id="path72612" - d="m 963,197 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72614" - d="m 967,197 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - id="path72616" - d="m 973,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 -1.25 h -1 V 201 h -1 v -3 h 2 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <rect - y="197" - x="984" - height="5" - width="1" - id="rect72618" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" /> - <path - id="path72620" - d="m 978,197 v 3.25 h 1 V 202 h 1 v -1.75 h 1 V 202 h 1 v -1.75 h 1 V 197 h -1 v 3 h -1 v -2 h -1 v 2 h -1 v -3 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 990,197 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - id="path72622" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 986,197 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path72624" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 997,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 h -2 v -3 h 2 v -1 z" - id="path32207-9-7" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1001,197 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - id="path32209-6-7" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1005,197 v 5 h 1 v -2 h 1.25 v -1 h 0.75 v -1.25 h -1 V 197 h -1 z m 1,1 h 1 v 1 h -1 z" - id="path32211-3-7" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1009,197 v 2.25 h 1 V 202 h 1 v -2.75 h 1 V 197 h -1 v 2 h -1 v -2 z" - id="path32213-7-3" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1013,197 v 5 h 1 v -2 h 1 v 2 h 1 v -2 h -0.75 v -1 h 0.75 v -1.25 h -1 V 197 h -1 z m 1,1 h 1 v 1 h -1 z" - id="path32216-8-3" - inkscape:connector-curvature="0" /> - <rect - y="197" - x="1017" - height="5" - width="1" - id="rect32218-8-5" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1020,197 v 0.75 h -1 v 3.5 h 1 V 202 h 2 v -1 -1.25 h -1 V 201 h -1 v -3 h 2 v -1 z" - id="path32220-2-9" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1023,197 v 5 h 1 v -2 h 1 v 2 h 1 v -5 h -1 v 2 h -1 v -2 z" - id="path32222-9-9" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1027,197 v 1 h 1 v 4 h 1 v -4 h 1 v -1 z" - id="path32224-1-8" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1035,197 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - id="path72678" /> - <path - inkscape:connector-curvature="0" - id="path72680" - d="m 1045,197 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect72682" - width="1" - height="5" - x="1033" - y="197" /> - <rect - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - id="rect72684" - width="1" - height="1" - x="1049" - y="201" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.6" - d="m 1040,197 v 5 h 1 v -2 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - id="path72686" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1028.75,209 v 1 H 1028 v 4 h 1 v -2 h 1 v 2 h 1 v -4 h -0.75 v -1 z m 0.25,1 h 1 v 1 h -1 z" - id="path32244-2" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1032,209 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v -1 z m 1,0 h 1 v 3 h 1 v -5 h -1 v 1 h -1 z" - id="path32246-0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1038,209 v 5 h 1 1 v -0.5 h 1 V 212 h -0.75 v -1 h 0.75 v -1.25 h -1 V 209 h -1 z m 1,1 h 1 v 1 h -1 z m 0,2 h 1 v 1 h -1 z" - id="path32248-9" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1042,209 v 5 h 1 v -2 h 1 v 2 h 1 v -2 h -0.75 v -1 h 0.75 v -1.25 h -1 V 209 h -1 z m 1,1 h 1 v 1 h -1 z" - id="path32250-7" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1047,209 v 1 h 2 v -1 z m 2,1 v 3 h 1 v -3 z m 0,3 h -2 v 1 h 2 z m -2,0 v -3 h -1 v 3 z" - id="path32252-3" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1051,209 v 1 h 2 v 1 h 1 v -1 -1 z m 2,2 h -1 v 1 h 1 z m -1,1 h -1 v 1 1 h 3 v -1 h -2 z" - id="path32254-7" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 997.75,209 v 1 H 997 v 4 h 1 v -2 h 1 v 2 h 1 v -4 h -0.75 v -1 z m 0.25,1 h 1 v 1 h -1 z" - id="path32256-2" /> - <path - inkscape:connector-curvature="0" - id="path32258-6" - d="m 1001,209 v 5 h 1 v -3 h 1 v -1 h -1 v -1 z m 2,2 v 1 h 1 v 2 h 1 v -5 h -1 v 2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> + transform="matrix(1.5,0,0,1.4999989,-192.5,-37.50017)" + id="g7067"> <path inkscape:connector-curvature="0" - id="path32260-0" - d="m 1006,209 v 1 3 1 h 2 v -0.75 h 1 v -3.5 h -1 V 209 Z m 1,1 h 1 v 3 h -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> + style="opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:105.70774078;stroke-opacity:1;marker:none;paint-order:fill markers stroke" + d="m 998.5,-179 h 121 c 1.385,0 2.5,1.115 2.5,2.5 v 66 c 0,1.385 -1.115,2.5 -2.5,2.5 h -121 c -1.385,0 -2.5,-1.115 -2.5,-2.5 v -66 c 0,-1.385 1.115,-2.5 2.5,-2.5 z" + id="path7065" + sodipodi:nodetypes="sssssssss" /> <path + sodipodi:nodetypes="sccssccsccsssscssssssc" inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1010,209 v 5 h 1 v -2 h 1 v 2 h 1 v -2 h -0.75 v -1 h 0.75 v -1.25 h -1 V 209 h -1 z m 1,1 h 1 v 1 h -1 z" - id="path32262-1" /> + id="path7063" + transform="translate(803,-241)" + d="m 195.5,38 c -1.94642,0 -3.5,1.60898 -3.5,3.5 v 89 c 0,1.9217 1.5783,3.5 3.5,3.5 h 121 c 1.9217,0 3.5,-1.5783 3.5,-3.5 l -0.0147,-78.333361 c 0,-1.9217 -1.5783,-3.5 -3.5,-3.5 h -77 c -0.3983,10e-6 -0.77905,-0.157923 -1.06055,-0.439453 -0.2816,-0.2816 -0.44049,-0.662348 -0.43945,-1.060547 L 238,41.5 c 0.005,-1.921694 -1.5783,-3.5 -3.5,-3.5 z m -0.83333,27.333318 c 0,-0.8551 0.48503,-1.333334 1.33333,-1.333334 l 120,0 c 0.8483,0 1.33333,0.485034 1.33333,1.333334 v 64.666712 c 0,0.8483 -0.48503,1.33334 -1.33333,1.33334 l -120,0 c -0.8483,0 -1.33771,-0.48505 -1.33333,-1.33334" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:105.70774078;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.98361349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 1059.6667,-155 7.2318,7.13082 c 2.8203,2.82167 7.0528,-1.4088 4.2325,-4.23047 l -12.0157,-12.01562 c -0.5714,-0.57187 -1.3499,-0.88819 -2.1582,-0.87696 l -10e-5,4e-5 c -0.7802,0.0111 -1.5251,0.32646 -2.0761,0.87891 l -11.9844,12.01758 c -2.9422,2.82368 1.4208,7.17459 4.2363,4.22461 L 1054.3333,-155 v 22.00002 c 0,4.42612 3.2913,8.00779 7.6802,8.00779 h 12 c 4.0871,0.10004 4.4069,-5.44117 0.3198,-5.34113 h -12 c -0.9323,0 -2.6654,-1.70279 -2.6666,-2.66666 z" + id="path15797-7" inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 1014,209 v 1 h 2 v 1 h 1 v -1 -1 z m 2,2 h -1 v 1 h 1 z m -1,1 h -1 v 1 1 h 3 v -1 h -2 z" - id="path32264-6" /> - <path - inkscape:connector-curvature="0" - id="path32266-5" - d="m 1018,209 v 5 h 1 2 v -1 h -2 v -1 h 1 v -1 h -1 v -1 h 2 v -1 h -2 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> + sodipodi:nodetypes="cccccccccccsccscc" /> + </g> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99947333;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 2238.2815,-365.92073 c -5.52,0.36326 -8.7584,3.47967 -8.7584,8.43246 0,4.43345 3.2458,8.13054 7.4769,8.85937 V -335 c 0,9.91268 -7.251,17.99291 -17,18 l -15.3901,0.0264 v 2.96484 H 2220 c 11.4103,-0.008 20.0341,-9.52115 20.0341,-20.99121 v -13.6289 c 4.2339,-0.72648 7.4827,-4.42393 7.4827,-8.85937 0,-4.95279 -3.4428,-8.31926 -9.2353,-8.43249 z m 0.406,2.98323 c 3.3303,0 5.8304,2.11776 5.8304,5.44923 0,3.33147 -2.6676,6 -5.9979,6 -3.3304,0 -5.9979,-2.66853 -5.9979,-6 0,-3.33147 2.835,-5.44923 6.1654,-5.44923 z M 2247,-291 c -4.4432,-10e-6 -8.6177,3.4839 -9,7 h -34 l 1,4 h 33 c 0.7202,4.24251 4.561,7.00001 9,7 4.9511,10e-6 9,-4.04722 9,-9 0,-4.95279 -4.0489,-9.00001 -9,-9 z m 0,3 c 3.3304,0 6,2.66853 6,6 0,3.33146 -2.6696,6 -6,6 -3.3303,0 -6,-2.66854 -6,-6 0,-3.33147 2.6697,-6 6,-6 z m -42,37 v 4 h 15 c 9.749,0.007 17,8.08732 17,18 v 13 c -4.2311,0.72882 -7.0144,4.57086 -7.0144,9.00433 0,4.9528 4.0457,9.00001 8.9969,8.99999 4.9511,2e-5 8.9968,-4.04719 8.9968,-8.99999 0,-4.43545 -2.7454,-8.27785 -6.9793,-9.00433 v -14 c 0,-11.47007 -9.5897,-20.99166 -21,-21 z m 33.9825,38.00433 c 3.3303,0 5.9979,2.66852 5.9979,6 0,3.33148 -2.6676,6 -5.9979,6 -3.3304,0 -5.9979,-2.66852 -5.9979,-6 0,-3.33148 2.6675,-6 5.9979,-6 z" + id="circle7536" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscsccccscscscsssccccccscscssscscscscscsccsssss" /> + <g + transform="matrix(12.319682,0,0,12.172353,-5471.9739,-984.3403)" + id="g7322-0" + style="display:inline;stroke-width:0.12309717;enable-background:new"> <path inkscape:connector-curvature="0" - id="path32268-7" - d="m 1024,209 v 4 h -1 v -1 h -1 v 1 h 0.75 v 1 h 1.5 v -1 h 0.75 v -4 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> - <rect - y="207" - x="1052" - height="1" - width="1" - id="rect32270-5" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /> + style="display:inline;opacity:0.2;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.24619435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + d="m 613.67414,61.612633 h 8.65173 c 0.57439,0 1.03681,0.46242 1.03681,1.036815 v 2.762566 c 0,0.574395 -0.46242,1.036815 -1.03681,1.036815 h -8.65173 c -0.57439,0 -1.03681,-0.46242 -1.03681,-1.036815 v -2.762566 c 0,-0.574395 0.46242,-1.036815 1.03681,-1.036815 z" + id="rect7418-6" /> <path + style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.41910744;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" + d="M 145.24609,-711 C 139.56928,-711.01185 135,-706.4825 135,-700.87109 v 78 c 0,-5.61141 4.56928,-10.14076 10.24609,-10.12891 l 85.17749,0.17786 c 5.67681,0.0118 10.24609,4.5175 10.24609,10.12891 v -78 c 0,-5.61141 -4.56928,-10.11706 -10.24609,-10.12891 l -42.58875,-0.0889 z" + transform="matrix(0.10118267,0,0,0.10236222,598.97766,126.33073)" + id="rect7413-9" inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 969.96875,208 v 0.75 h -1 V 209 h -0.25 v 1 h -0.75 v 3 h 0.75 v 1 h 0.25 v 0.25 h 1 V 215 h 3 v -0.75 h 1 V 214 h 0.25 v -1 h 0.75 v -3 h -0.75 v -1 h -0.25 v -0.25 h -1 V 208 Z m 0,1 h 3 v 1 h 1 v 3 h -1 v 1 h -3 v -1 h -1 v -3 h 1 z" - id="path32272-1" - sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccc" /> + sodipodi:nodetypes="sscsscsscs" /> <path inkscape:connector-curvature="0" - id="path32274-2" - d="m 970.96875,210 v 0.75 h -1 v 1.5 h 1 V 213 h 1.25 v -1 h -1.25 v -1 h 1.25 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - sodipodi:nodetypes="ccccccccccccc" /> - <path - id="path72688" - d="m 981.71875,209 v 1 h -0.75 v 3 h 0.75 v 1 h 1.5 v -1 h 0.75 v -3 h -0.75 v -1 z m 0.25,1 h 1 v 3 h -1 z m 0.25,1 v 1 h 0.5 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - inkscape:connector-curvature="0" /> - <path - id="path72690" - d="m 985.96875,209 v 1 h -1 v 1 h 1 v 3 h 1 v -5 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 976.96875,209 v 1 h 2 v 1 h -1 v 1 h 1 v -0.75 h 1 v -1.5 h -1 V 209 Z m 1,3 h -1 v 1 1 h 3 v -1 h -2 z" - id="path72694" /> - <path - id="path72696" - d="m 992.96875,210 v 1 h 1 v -1 z m -0.21875,3 v 1 H 992 v 1 h 1 v -1 h 1 v -1 z" - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - inkscape:connector-curvature="0" /> - <path - style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" - d="m 988.75,209 v 1 h -0.5 v 1 h 0.5 v 1 H 988 v 1 h 0.75 v 1 h 1.5 v -1 H 991 v -1 h -0.75 v -1 h 0.5 v -1 h -0.5 v -1 z m 0.25,1 h 1 v 1 h -1 z m 0,2 h 1 v 1 h -1 z" - id="path19551-18-1" - inkscape:connector-curvature="0" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00080741;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 717.48242,42.996094 c -5.24135,0 -9.49414,4.190752 -9.49414,9.355468 v 65.017578 22.26953 c 0,5.16472 4.25279,9.35547 9.49414,9.35547 h 70.02539 c 5.24136,0 9.49414,-4.19075 9.49414,-9.35547 V 117.36914 52.351562 c 0,-5.164716 -4.25278,-9.355468 -9.49414,-9.355468 z m 0,1.984375 h 70.02539 c 4.15996,0 7.48047,3.271903 7.48047,7.371093 v 59.269528 c -1.73801,-2.19271 -4.43984,-3.60742 -7.48047,-3.60742 h -70.02539 c -3.04062,0 -5.74244,1.41471 -7.48047,3.60742 V 52.351562 c 0,-4.09919 3.32052,-7.371093 7.48047,-7.371093 z m 0,65.017581 h 70.02539 c 4.15996,0 6.83699,3.09748 6.83699,7.19666 v 22.52458 c 0,4.09919 -3.14714,6.62488 -7.3071,6.62488 h -69.74951 c -4.15995,0 -6.64281,-2.52569 -6.64281,-6.62488 v -22.52458 c 0,-4.09918 2.67709,-7.19666 6.83704,-7.19666 z" + transform="matrix(0.12219364,0,0,0.1240074,526.00203,48.095825)" + id="rect7312-4" + sodipodi:nodetypes="sscsssscsssssscsscssssssssscs" /> + <g + id="g7411-1" + transform="matrix(-1,0,0,1,1235.8994,0)" + style="stroke-width:0.12309717"> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12309717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 613.88871,62.499042 c -0.23599,0 -0.42773,0.193143 -0.42773,0.429687 v 0.0098 c 0,0.236544 0.19174,0.429687 0.42773,0.429687 0.23599,0 0.42774,-0.193143 0.42774,-0.429687 v -0.0098 c 0,-0.236544 -0.19175,-0.429687 -0.42774,-0.429687 z" + id="rect7316-4" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssss" /> + <g + transform="translate(6.2733256)" + id="g7368-5" + style="display:inline;stroke-width:0.12309717;enable-background:new"> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.24619435;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" + d="m 613.40672,62.503836 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 v 2.851562 c 0,0.165367 0.24805,0.165367 0.24805,0 v -2.851562 c 0.002,-0.07532 -0.0639,-0.13455 -0.13868,-0.125 z m 0.64937,3e-6 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 v 2.851562 c -0.005,0.169458 0.25158,0.169458 0.24609,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.125 z m 0.64936,3e-6 c -0.0633,0.0071 -0.11074,0.06131 -0.10937,0.125 v 2.851562 c -0.005,0.169458 0.25158,0.169458 0.24609,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.125 z m 0.64938,3e-6 c -0.0633,0.0071 -0.11075,0.06131 -0.10938,0.125 v 2.851562 c -0.005,0.169248 0.25136,0.169248 0.2461,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.125 z m 0.64937,-9e-6 c -0.0633,0.0071 -0.11075,0.06131 -0.10938,0.125 v 2.851562 c -0.005,0.169248 0.25136,0.169248 0.2461,0 v -2.851562 c 0.002,-0.07444 -0.0627,-0.133249 -0.13672,-0.125 z" + id="path7359-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccsscccccccccccccccccccccccccc" /> + </g> + </g> </g> </g> </svg> diff --git a/release/datafiles/prvicons_update.py b/release/datafiles/prvicons_update.py index bc170b98545..96306f0cea9 100755..100644 --- a/release/datafiles/prvicons_update.py +++ b/release/datafiles/prvicons_update.py @@ -1,23 +1,25 @@ -#!/usr/bin/env python3 - -# This script updates icons from the SVG file -import os -import subprocess -import sys - -BASEDIR = os.path.abspath(os.path.dirname(__file__)) - -inkscape_path = 'inkscape' - -if sys.platform == 'darwin': - inkscape_app_path = '/Applications/Inkscape.app/Contents/Resources/script' - if os.path.exists(inkscape_app_path): - inkscape_path = inkscape_app_path - -cmd = ( - inkscape_path, - os.path.join(BASEDIR, "prvicons.svg"), - "--without-gui", - "--export-png=" + os.path.join(BASEDIR, "prvicons.png"), -) -subprocess.check_call(cmd) +#!/usr/bin/env python3
+
+# This script updates icons from the SVG file
+import os
+import subprocess
+import sys
+
+BASEDIR = os.path.abspath(os.path.dirname(__file__))
+
+inkscape_path = 'inkscape'
+
+if sys.platform == 'darwin':
+ inkscape_app_path = '/Applications/Inkscape.app/Contents/Resources/script'
+ if os.path.exists(inkscape_app_path):
+ inkscape_path = inkscape_app_path
+
+cmd = (
+ inkscape_path,
+ os.path.join(BASEDIR, "prvicons.svg"),
+ "--export-width=1536",
+ "--export-height=256",
+ "--without-gui",
+ "--export-png=" + os.path.join(BASEDIR, "prvicons.png"),
+)
+subprocess.check_call(cmd)
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 9f037fa4793..e9a85517647 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -370,7 +370,7 @@ const bTheme U_theme_default = { .paint_curve_handle = RGBA(0x7fff7f7f), }, .space_file = { - .back = RGBA(0x35353500), + .back = RGBA(0x33333300), .title = RGBA(0xffffffff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), @@ -381,13 +381,14 @@ const bTheme U_theme_default = { .tab_inactive = RGBA(0x2b2b2bff), .tab_back = RGBA(0x232323ff), .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .button = RGBA(0x4b4b4bff), .button_title = RGBA(0xffffffff), .button_text = RGBA(0xe5e5e5ff), .button_text_hi = RGBA(0xffffffff), + .execution_buts = RGBA(0x444444ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), + .header = RGBA(0x4b4b4bff), + .back = RGBA(0x404040ff), .sub_back = RGBA(0x0000003e), }, .hilite = RGBA(0x4f76b3ff), diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index ae2d2952f85..7cbea843ae8 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1771,6 +1771,11 @@ def km_file_browser(_params): ) items.extend([ + *_template_space_region_type_toggle( + toolbar_key={"type": 'T', "value": 'PRESS'}, + ), + ("screen.region_toggle", {"type": 'N', "value": 'PRESS'}, + {"properties": [("region_type", 'TOOL_PROPS')]}), ("file.parent", {"type": 'UP_ARROW', "value": 'PRESS', "alt": True}, None), ("file.previous", {"type": 'LEFT_ARROW', "value": 'PRESS', "alt": True}, None), ("file.next", {"type": 'RIGHT_ARROW', "value": 'PRESS', "alt": True}, None), @@ -1782,7 +1787,6 @@ def km_file_browser(_params): {"properties": [("data_path", 'space_data.params.show_hidden')]}), ("file.directory_new", {"type": 'I', "value": 'PRESS'}, None), ("file.smoothscroll", {"type": 'TIMER1', "value": 'ANY', "any": True}, None), - ("file.bookmark_toggle", {"type": 'T', "value": 'PRESS'}, None), ("file.bookmark_add", {"type": 'B', "value": 'PRESS', "ctrl": True}, None), ]) @@ -1801,17 +1805,13 @@ def km_file_browser_main(params): ("file.execute", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, {"properties": [("need_active", True)]}), ("file.refresh", {"type": 'NUMPAD_PERIOD', "value": 'PRESS'}, None), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK'}, None), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True}, + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK'}, + {"properties": [("open", False)]}), + ("file.select", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True}, {"properties": [("extend", True)]}), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True, "ctrl": True}, + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True}, {"properties": [("extend", True), ("fill", True)]}), - ("file.select", {"type": 'RIGHTMOUSE', "value": 'CLICK'}, - {"properties": [("open", False)]}), - ("file.select", {"type": 'RIGHTMOUSE', "value": 'CLICK', "shift": True}, - {"properties": [("extend", True), ("open", False)]}), - ("file.select", {"type": 'RIGHTMOUSE', "value": 'CLICK', "alt": True}, - {"properties": [("extend", True), ("fill", True), ("open", False)]}), ("file.select_walk", {"type": 'UP_ARROW', "value": 'PRESS'}, {"properties": [("direction", 'UP')]}), ("file.select_walk", {"type": 'UP_ARROW', "value": 'PRESS', "shift": True}, @@ -1843,8 +1843,11 @@ def km_file_browser_main(params): ("file.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), ("file.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "shift": True}, {"properties": [("mode", 'ADD')]}), - ("file.rename", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None), + ("file.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "ctrl": True}, + {"properties": [("mode", 'SUB')]}), ("file.highlight", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None), + ("file.sort_column_ui_context", {"type": 'LEFTMOUSE', "value": 'PRESS', "any": True}, None), + op_menu("FILEBROWSER_MT_context_menu", params.context_menu_event), ("file.filenum", {"type": 'NUMPAD_PLUS', "value": 'PRESS'}, {"properties": [("increment", 1)]}), ("file.filenum", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "shift": True}, diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 20f496adea9..1125ddb3d8c 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1196,10 +1196,11 @@ def km_file_browser_main(params): ("file.execute", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, {"properties": [("need_active", True)]}), ("file.refresh", {"type": 'R', "value": 'PRESS', "ctrl": True}, None), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK'}, None), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True}, + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK'}, + {"properties": [("open", False)]}), + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True}, {"properties": [("extend", True)]}), - ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True, "ctrl": True}, + ("file.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True,}, {"properties": [("extend", True), ("fill", True)]}), ("file.select", {"type": 'RIGHTMOUSE', "value": 'CLICK'}, {"properties": [("open", False)]}), @@ -1239,6 +1240,8 @@ def km_file_browser_main(params): ("file.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "shift": True}, {"properties": [("mode", 'ADD')]}), ("file.highlight", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None), + ("file.sort_column_ui_context", {"type": 'LEFTMOUSE', "value": 'PRESS', "any": True}, None), + op_menu("FILEBROWSER_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}), ("file.filenum", {"type": 'NUMPAD_PLUS', "value": 'PRESS'}, {"properties": [("increment", 1)]}), ("file.filenum", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "shift": True}, diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index b939586ff81..e9c11301909 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -34,58 +34,131 @@ class FILEBROWSER_HT_header(Header): layout.menu("FILEBROWSER_MT_view") - row = layout.row(align=True) - row.operator("file.previous", text="", icon='BACK') - row.operator("file.next", text="", icon='FORWARD') - row.operator("file.parent", text="", icon='FILE_PARENT') - row.operator("file.refresh", text="", icon='FILE_REFRESH') + # can be None when save/reload with a file selector open - layout.operator_context = 'EXEC_DEFAULT' - layout.operator("file.directory_new", icon='NEWFOLDER', text="") + layout.separator_spacer() - layout.operator_context = 'INVOKE_DEFAULT' + layout.template_running_jobs() + + +class FILEBROWSER_PT_display(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'HEADER' + bl_label = "Display" + @classmethod + def poll(cls, context): # can be None when save/reload with a file selector open - if params: - is_lib_browser = params.use_library_browsing + return context.space_data.params is not None - layout.prop(params, "display_type", expand=True, text="") - layout.prop(params, "sort_method", expand=True, text="") - layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN') + def draw(self, context): + layout = self.layout - layout.separator_spacer() + space = context.space_data + params = space.params + is_lib_browser = params.use_library_browsing - layout.template_running_jobs() + layout.label(text="Display as") + layout.column().prop(params, "display_type", expand=True) - if params: - layout.prop(params, "use_filter", text="", icon='FILTER') + layout.use_property_split = True + layout.use_property_decorate = False # No animation. - row = layout.row(align=True) - row.active = params.use_filter - row.prop(params, "use_filter_folder", text="") + if params.display_type == 'THUMBNAIL': + layout.prop(params, "display_size", text="Size") + else: + layout.prop(params, "show_details_size", text="Size") + layout.prop(params, "show_details_datetime", text="Date") - if params.filter_glob: - # if st.active_operator and hasattr(st.active_operator, "filter_glob"): - # row.prop(params, "filter_glob", text="") - row.label(text=params.filter_glob) - else: - row.prop(params, "use_filter_blender", text="") - row.prop(params, "use_filter_backup", text="") - row.prop(params, "use_filter_image", text="") - row.prop(params, "use_filter_movie", text="") - row.prop(params, "use_filter_script", text="") - row.prop(params, "use_filter_font", text="") - row.prop(params, "use_filter_sound", text="") - row.prop(params, "use_filter_text", text="") + layout.prop(params, "recursion_level", text="Recursions") - if is_lib_browser: - row.prop(params, "use_filter_blendid", text="") - if params.use_filter_blendid: - row.separator() - row.prop(params, "filter_id_category", text="") + layout.use_property_split = False + layout.separator() + + layout.label(text="Sort by") + layout.column().prop(params, "sort_method", expand=True) + layout.prop(params, "use_sort_invert") - row.separator() - row.prop(params, "filter_search", text="", icon='VIEWZOOM') + +class FILEBROWSER_PT_filter(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'HEADER' + bl_label = "Filter" + + @classmethod + def poll(cls, context): + # can be None when save/reload with a file selector open + return context.space_data.params is not None + + def draw(self, context): + layout = self.layout + + space = context.space_data + params = space.params + is_lib_browser = params.use_library_browsing + + row = layout.row(align=True) + row.prop(params, "use_filter", text="", toggle=0) + row.label(text="Filter") + + col = layout.column() + col.active = params.use_filter + + row = col.row() + row.label(icon='FILE_FOLDER') + row.prop(params, "use_filter_folder", text="Folders", toggle=0) + + if params.filter_glob: + col.label(text=params.filter_glob) + else: + row = col.row() + row.label(icon='FILE_BLEND') + row.prop(params, "use_filter_blender", + text=".blend Files", toggle=0) + row = col.row() + row.label(icon='FILE_BACKUP') + row.prop(params, "use_filter_backup", + text="Backup .blend Files", toggle=0) + row = col.row() + row.label(icon='FILE_IMAGE') + row.prop(params, "use_filter_image", text="Image Files", toggle=0) + row = col.row() + row.label(icon='FILE_MOVIE') + row.prop(params, "use_filter_movie", text="Movie Files", toggle=0) + row = col.row() + row.label(icon='FILE_SCRIPT') + row.prop(params, "use_filter_script", + text="Script Files", toggle=0) + row = col.row() + row.label(icon='FILE_FONT') + row.prop(params, "use_filter_font", text="Font Files", toggle=0) + row = col.row() + row.label(icon='FILE_SOUND') + row.prop(params, "use_filter_sound", text="Sound Files", toggle=0) + row = col.row() + row.label(icon='FILE_TEXT') + row.prop(params, "use_filter_text", text="Text Files", toggle=0) + + col.separator() + + if is_lib_browser: + row = col.row() + row.label(icon='BLANK1') # Indentation + row.prop(params, "use_filter_blendid", + text="Blender IDs", toggle=0) + if params.use_filter_blendid: + row = col.row() + row.label(icon='BLANK1') # Indentation + row.prop(params, "filter_id_category", text="") + + col.separator() + + layout.prop(params, "show_hidden") + + +def panel_poll_is_upper_region(region): + # The upper region is left-aligned, the lower is split into it then. + return region.alignment == 'LEFT' class FILEBROWSER_UL_dir(UIList): @@ -119,10 +192,13 @@ class FILEBROWSER_UL_dir(UIList): class FILEBROWSER_PT_bookmarks_volumes(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'TOOLS' - bl_options = {'DEFAULT_CLOSED'} bl_category = "Bookmarks" bl_label = "Volumes" + @classmethod + def poll(cls, context): + return panel_poll_is_upper_region(context.region) + def draw(self, context): layout = self.layout space = context.space_data @@ -141,7 +217,7 @@ class FILEBROWSER_PT_bookmarks_system(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_system_bookmarks + return not context.preferences.filepaths.hide_system_bookmarks and panel_poll_is_upper_region(context.region) def draw(self, context): layout = self.layout @@ -161,8 +237,10 @@ class FILEBROWSER_MT_bookmarks_context_menu(Menu): layout.operator("file.bookmark_cleanup", icon='X', text="Cleanup") layout.separator() - layout.operator("file.bookmark_move", icon='TRIA_UP_BAR', text="Move To Top").direction = 'TOP' - layout.operator("file.bookmark_move", icon='TRIA_DOWN_BAR', text="Move To Bottom").direction = 'BOTTOM' + layout.operator("file.bookmark_move", icon='TRIA_UP_BAR', + text="Move To Top").direction = 'TOP' + layout.operator("file.bookmark_move", icon='TRIA_DOWN_BAR', + text="Move To Bottom").direction = 'BOTTOM' class FILEBROWSER_PT_bookmarks_favorites(Panel): @@ -171,6 +249,10 @@ class FILEBROWSER_PT_bookmarks_favorites(Panel): bl_category = "Bookmarks" bl_label = "Favorites" + @classmethod + def poll(cls, context): + return panel_poll_is_upper_region(context.region) + def draw(self, context): layout = self.layout space = context.space_data @@ -185,12 +267,15 @@ class FILEBROWSER_PT_bookmarks_favorites(Panel): col = row.column(align=True) col.operator("file.bookmark_add", icon='ADD', text="") col.operator("file.bookmark_delete", icon='REMOVE', text="") - col.menu("FILEBROWSER_MT_bookmarks_context_menu", icon='DOWNARROW_HLT', text="") + col.menu("FILEBROWSER_MT_bookmarks_context_menu", + icon='DOWNARROW_HLT', text="") if num_rows > 1: col.separator() - col.operator("file.bookmark_move", icon='TRIA_UP', text="").direction = 'UP' - col.operator("file.bookmark_move", icon='TRIA_DOWN', text="").direction = 'DOWN' + col.operator("file.bookmark_move", icon='TRIA_UP', + text="").direction = 'UP' + col.operator("file.bookmark_move", icon='TRIA_DOWN', + text="").direction = 'DOWN' else: layout.operator("file.bookmark_add", icon='ADD') @@ -203,7 +288,7 @@ class FILEBROWSER_PT_bookmarks_recents(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_recent_locations + return not context.preferences.filepaths.hide_recent_locations and panel_poll_is_upper_region(context.region) def draw(self, context): layout = self.layout @@ -227,7 +312,7 @@ class FILEBROWSER_PT_advanced_filter(Panel): @classmethod def poll(cls, context): # only useful in append/link (library) context currently... - return context.space_data.params.use_library_browsing + return context.space_data.params.use_library_browsing and panel_poll_is_upper_region(context.region) def draw(self, context): layout = self.layout @@ -242,6 +327,133 @@ class FILEBROWSER_PT_advanced_filter(Panel): col.prop(params, "filter_id") +class FILEBROWSER_PT_options_toggle(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'TOOLS' + bl_label = "Options Toggle" + bl_options = {'HIDE_HEADER'} + + @classmethod + def poll(cls, context): + sfile = context.space_data + return context.region.alignment == 'BOTTOM' and sfile.active_operator + + def is_option_region_visible(self, context): + for region in context.area.regions: + if region.type == 'TOOL_PROPS' and region.width <= 1: + return False + + return True + + def draw(self, context): + layout = self.layout + label = "Hide Options" if self.is_option_region_visible( + context) else "Options" + + layout.scale_x = 1.3 + layout.scale_y = 1.3 + + layout.operator("screen.region_toggle", + text=label).region_type = 'TOOL_PROPS' + + +class FILEBROWSER_PT_directory_path(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'UI' + bl_label = "Directory Path" + bl_category = "Attributes" + bl_options = {'HIDE_HEADER'} + + def is_header_visible(self, context): + for region in context.area.regions: + if region.type == 'HEADER' and region.height <= 1: + return False + + return True + + def draw(self, context): + layout = self.layout + space = context.space_data + params = space.params + + layout.scale_x = 1.3 + layout.scale_y = 1.3 + + row = layout.row() + + subrow = row.row(align=True) + subrow.operator("file.previous", text="", icon='BACK') + subrow.operator("file.next", text="", icon='FORWARD') + subrow.operator("file.parent", text="", icon='FILE_PARENT') + subrow.operator("file.refresh", text="", icon='FILE_REFRESH') + + row.operator("file.directory_new", icon='NEWFOLDER', text="") + + subrow = row.row() + subrow.prop(params, "directory", text="") + + subrow = row.row() + subrow.scale_x = 0.5 + subrow.prop(params, "filter_search", text="", icon='VIEWZOOM') + + # Uses prop_with_popover() as popover() only adds the triangle icon in headers. + row.prop_with_popover( + params, + "display_type", + panel="FILEBROWSER_PT_display", + text="", + icon_only=True, + ) + row.prop_with_popover( + params, + "display_type", + panel="FILEBROWSER_PT_filter", + text="", + icon='FILTER', + icon_only=True, + ) + + +class FILEBROWSER_PT_file_operation(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'EXECUTE' + bl_label = "Execute File Operation" + bl_options = {'HIDE_HEADER'} + + @classmethod + def poll(cls, context): + return context.space_data.active_operator + + def draw(self, context): + import sys + + layout = self.layout + space = context.space_data + params = space.params + + layout.scale_x = 1.3 + layout.scale_y = 1.3 + + row = layout.row() + sub = row.row() + sub.prop(params, "filename", text="") + sub = row.row() + sub.ui_units_x = 5 + + # subsub = sub.row(align=True) + # subsub.operator("file.filenum", text="", icon='ADD').increment = 1 + # subsub.operator("file.filenum", text="", icon='REMOVE').increment = -1 + + # organize buttons according to the OS standard + if sys.platform != "win": + sub.operator("FILE_OT_cancel", text="Cancel") + subsub = sub.row() + subsub.active_default = True + subsub.operator("FILE_OT_execute", text=params.title) + if sys.platform == "win": + sub.operator("FILE_OT_cancel", text="Cancel") + + class FILEBROWSER_MT_view(Menu): bl_label = "View" @@ -250,7 +462,7 @@ class FILEBROWSER_MT_view(Menu): st = context.space_data params = st.params - layout.prop(st, "show_region_toolbar") + layout.prop(st, "show_region_toolbar", text="Source List") layout.prop(st, "show_region_ui", text="File Path") layout.separator() @@ -263,8 +475,46 @@ class FILEBROWSER_MT_view(Menu): layout.menu("INFO_MT_area") +class FILEBROWSER_MT_context_menu(Menu): + bl_label = "Files Context Menu" + + def draw(self, context): + layout = self.layout + st = context.space_data + params = st.params + + layout.operator("file.previous", text="Back") + layout.operator("file.next", text="Forward") + layout.operator("file.parent", text="Go to Parent") + layout.operator("file.refresh", text="Refresh") + + layout.separator() + + layout.operator("file.filenum", text="Increase Number", + icon='ADD').increment = 1 + layout.operator("file.filenum", text="Decrease Number", + icon='REMOVE').increment = -1 + + layout.separator() + + layout.operator("file.rename", text="Rename") + # layout.operator("file.delete") + layout.operator("file.directory_new", text="New Folder") + layout.operator("file.bookmark_add", text="Add Bookmark") + + layout.separator() + + layout.prop_menu_enum(params, "display_type") + if params.display_type == 'THUMBNAIL': + layout.prop_menu_enum(params, "display_size") + layout.prop_menu_enum(params, "recursion_level", text="Recursions") + layout.prop_menu_enum(params, "sort_method") + + classes = ( FILEBROWSER_HT_header, + FILEBROWSER_PT_display, + FILEBROWSER_PT_filter, FILEBROWSER_UL_dir, FILEBROWSER_PT_bookmarks_volumes, FILEBROWSER_PT_bookmarks_system, @@ -272,7 +522,11 @@ classes = ( FILEBROWSER_PT_bookmarks_favorites, FILEBROWSER_PT_bookmarks_recents, FILEBROWSER_PT_advanced_filter, + FILEBROWSER_PT_directory_path, + FILEBROWSER_PT_file_operation, + FILEBROWSER_PT_options_toggle, FILEBROWSER_MT_view, + FILEBROWSER_MT_context_menu, ) if __name__ == "__main__": # only for live edit. |
