qcanvas 0.0.3a0__tar.gz → 0.0.3.1a0__tar.gz

{qcanvas-0.0.3a0 → qcanvas-0.0.3.1a0}/.gitignore

@@ -5,4 +5,4 @@ dist
 build
 __main__.spec
 .venv
-.system_pyside
+.system_pyside

{qcanvas-0.0.3a0 → qcanvas-0.0.3.1a0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 0.0.3a0
+Version: 0.0.3.1a0
 Summary: A canvas client
 Author: QCanvas
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: ==3.11
+Requires-Python: <=3.12,>=3.11
 Requires-Dist: aiosqlite-custom~=0.19.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: bs4~=0.0.1

{qcanvas-0.0.3a0 → qcanvas-0.0.3.1a0}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name="qcanvas"
-version="0.0.3a"
+version="0.0.3.1a"
 authors= [ {name="QCanvas"} ]
 description="A canvas client"
-requires-python="==3.11"
+requires-python=">=3.11,<=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
@@ -18,7 +18,6 @@ dependencies=[
     "PySide6~=6.6.1",
     "pydantic~=2.6.0",
     "requests~=2.31.0",
-#    "setuptools~=69.0.3",
     "gql~=3.6.0b0",
     "tenacity~=8.2.3",
     "beautifulsoup4~=4.12.3",
@@ -27,4 +26,10 @@ dependencies=[
     "qasync~=0.27.1",
     "bs4~=0.0.1",
     "pyqtdarktheme~=2.1.0"
-]
+]
+
+[tool.hatch.build.targets.sdist]
+exclude=[
+    ".idea",
+    "canvas_introspection.json"
+]

{qcanvas-0.0.3a0 → qcanvas-0.0.3.1a0}/qcanvas/__main__.py

@@ -4,30 +4,30 @@ import sys
 from datetime import datetime
 
 import httpx
-from PySide6.QtCore import Signal, Slot, QObject
-from PySide6.QtWidgets import QProgressDialog, QMessageBox, QWidget, QMainWindow
-
-from qcanvas.QtVersionHelper.QtWidgets import QApplication
+import qdarktheme
 from httpx import URL
+from qasync import QEventLoop, asyncSlot
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.ext.asyncio.session import async_sessionmaker as AsyncSessionMaker
 
+import qcanvas.db as db
+from qcanvas.QtVersionHelper.QtGui import QPixmap
+from qcanvas.QtVersionHelper.QtCore import Signal
+from qcanvas.QtVersionHelper.QtWidgets import QApplication, QProgressDialog, QMainWindow
+from qcanvas.net.canvas.canvas_client import CanvasClient
 from qcanvas.ui.main_ui import AppMainWindow
 from qcanvas.ui.setup_dialog import SetupDialog
+from qcanvas.util import AppSettings
 from qcanvas.util.constants import app_name
-from qcanvas.util.linkscanner import CanvasFileScanner
 from qcanvas.util.course_indexer import DataManager
-from qcanvas.net.canvas.canvas_client import CanvasClient
-from qcanvas.util import AppSettings
-
+from qcanvas.util.linkscanner import CanvasFileScanner
 from qcanvas.util.linkscanner.canvas_media_object_scanner import CanvasMediaObjectScanner
 from qcanvas.util.linkscanner.dropbox_scanner import DropboxScanner
 
-from qasync import QEventLoop, asyncSlot
-import qcanvas.db as db
-import qdarktheme
+# noinspection PyUnresolvedReferences
+import qcanvas.icons
 
-engine = create_async_engine("sqlite+aiosqlite:///meme", echo=False)
+engine = create_async_engine("sqlite+aiosqlite:///canvas_db.😘", echo=False)
 
 logging.basicConfig()
 logging.getLogger("canvas_client").setLevel(logging.DEBUG)
@@ -45,10 +45,12 @@ class LoaderWindow(QMainWindow):
 
     def __init__(self):
         super().__init__()
+        self.main_icon = QPixmap(":/main_icon.svg")
         self.init.connect(self.on_init)
         self.setup.connect(self.on_setup)
         self.ready.connect(self.on_ready)
         self.setWindowTitle(app_name)
+        self.setWindowIcon(self.main_icon)
         self.setCentralWidget(QProgressDialog("Verifying config", None, 0, 0))
 
         self.init.emit()
@@ -67,6 +69,7 @@ class LoaderWindow(QMainWindow):
     @asyncSlot()
     async def on_setup(self):
         setup = SetupDialog(self)
+        setup.setWindowIcon(self.main_icon)
         setup.rejected.connect(lambda: sys.exit(0))
         setup.accepted.connect(self.on_ready)
         setup.show()
@@ -89,8 +92,9 @@ class LoaderWindow(QMainWindow):
     def open_main_app(self, data_manager: DataManager):
         self.main_window = AppMainWindow(data_manager)
         self.main_window.setWindowTitle(app_name)
-        # self.main_window.resize(1200, 600)
+        self.main_window.setWindowIcon(self.main_icon)
         self.main_window.show()
+        # Set the main window as the parent of this window so this window is destroyed when the main window is closed
         self.setParent(self.main_window)
 
 
@@ -98,8 +102,11 @@ if __name__ == '__main__':
     asyncio.run(begin())
 
     app = QApplication(sys.argv)
-
-    qdarktheme.setup_theme("light")
+    c = app.palette().base().color()
+    print(f"{c.red()} {c.green()} {c.blue()}")
+    qdarktheme.setup_theme("light",
+                           custom_colors={"primary": "FF804F"}
+    )
 
     event_loop = QEventLoop()
     asyncio.set_event_loop(event_loop)

{qcanvas-0.0.3a0 → qcanvas-0.0.3.1a0}/qcanvas/db/database.py

@@ -1,16 +1,14 @@
 import pathlib
 import platform
-from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
-from typing import List, Optional, Sequence, MutableSequence, Any
+from typing import List, Optional, MutableSequence
 
 from sqlalchemy import ForeignKey, Text
 from sqlalchemy.ext.asyncio import AsyncAttrs
 from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped, relationship, MappedAsDataclass
 
 import qcanvas.util.tree_util as tree
-from qcanvas.util.tree_util import HasColumnData
 
 
 class PageLike:
@@ -216,7 +214,7 @@ class Resource(MappedAsDataclass, Base, tree.HasText):
 
         # Colon is illegal in microsoft windows file names
         if platform.system() == "Windows":
-            file_id.replace(':', '$')
+            file_id = file_id.replace(':', '$')
 
         return pathlib.Path("download", f"{file_id}@{self.file_name}")
 

qcanvas-0.0.3.1a0/qcanvas/icons/__init__.py

@@ -0,0 +1 @@
+from qcanvas.icons import rc_icons

qcanvas-0.0.3.1a0/qcanvas/icons/icons.qrc

@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>main_icon.svg</file>
+</qresource>
+</RCC>

qcanvas-0.0.3.1a0/qcanvas/icons/main_icon.svg

@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   width="256"
+   height="256"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   sodipodi:docname="icon.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline;enable-background:new"
+   inkscape:export-filename="/home/sam/moka-next-template.png"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     stroke="#ef2929"
+     fill="#f57900"
+     id="base"
+     pagecolor="#777777"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="246.75"
+     inkscape:cy="112.75"
+     inkscape:current-layer="layer7"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     width="400px"
+     height="300px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     gridtolerance="10000"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"><inkscape:grid
+       spacingy="1px"
+       spacingx="1px"
+       id="grid5883"
+       type="xygrid"
+       enabled="true"
+       visible="false"
+       empspacing="4"
+       snapvisiblegridlinesonly="true"
+       dotted="false"
+       color="#000000"
+       opacity="0.12549"
+       empcolor="#203ef3"
+       empopacity="0.36470588"
+       originx="-16"
+       originy="-28"
+       units="px" /><inkscape:grid
+       type="xygrid"
+       id="grid11592"
+       empspacing="8"
+       visible="false"
+       enabled="false"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       color="#ff0000"
+       opacity="0.12549"
+       empcolor="#ff0000"
+       empopacity="0.25098039"
+       snapvisiblegridlinesonly="true"
+       dotted="true"
+       originx="-16"
+       originy="-28"
+       units="px" /></sodipodi:namedview><defs
+     id="defs3"><linearGradient
+       inkscape:collect="always"
+       xlink:href="#outerBackgroundGradient-2"
+       id="linearGradient4254"
+       x1="35"
+       y1="156"
+       x2="253"
+       y2="156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-90,144,156)" /><linearGradient
+       id="outerBackgroundGradient-2"><stop
+         style="stop-color:#e70a0a;stop-opacity:1;"
+         offset="0"
+         id="stop3864-8-6-00" /><stop
+         style="stop-color:#fe0000;stop-opacity:1;"
+         offset="1"
+         id="stop3866-9-1-1" /></linearGradient><style
+       id="style1">.cls-1{fill:#fff;}</style></defs><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:creator><cc:Agent><dc:title>Sam Hewitt</dc:title></cc:Agent></dc:creator><dc:source /><cc:license
+           rdf:resource="" /><dc:title /><dc:subject><rdf:Bag /></dc:subject><dc:date /><dc:rights><cc:Agent><dc:title /></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title /></cc:Agent></dc:publisher><dc:identifier /><dc:relation /><dc:language /><dc:coverage /><dc:description /><dc:contributor><cc:Agent><dc:title /></cc:Agent></dc:contributor></cc:Work><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Icon"
+     id="layer1"
+     transform="translate(-16,-28)"><g
+       style="display:none"
+       inkscape:label="Baseplate"
+       id="layer7"
+       inkscape:groupmode="layer"><text
+         y="19.745117"
+         xml:space="preserve"
+         x="15.006836"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
+         inkscape:label="context"
+         id="context"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans'"
+           y="19.745117"
+           x="15.006836"
+           sodipodi:role="line"
+           id="tspan3933">apps</tspan></text><text
+         y="19.745117"
+         xml:space="preserve"
+         x="122.48828"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
+         inkscape:label="icon-name"
+         id="icon-name"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"
+           y="19.745117"
+           x="122.48828"
+           sodipodi:role="line"
+           id="tspan3937">amd</tspan></text><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect16x16"
+         width="16"
+         height="16"
+         x="416"
+         y="140"
+         inkscape:label="16x16" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#d4d4d4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect24x24"
+         width="24"
+         height="24"
+         x="416"
+         y="100"
+         inkscape:label="24x24" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect32x32"
+         width="32"
+         height="32"
+         x="416"
+         y="52"
+         inkscape:label="32x32" /><rect
+         inkscape:label="22x22"
+         y="101"
+         x="417"
+         height="22"
+         width="22"
+         id="rect22x22"
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /><rect
+         inkscape:label="48x48"
+         y="220"
+         x="288"
+         height="48"
+         width="48"
+         id="rect48x48"
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect256x256"
+         width="256"
+         height="256"
+         x="16"
+         y="28"
+         inkscape:label="256x256" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect64x64"
+         width="64"
+         height="64"
+         x="288"
+         y="140"
+         inkscape:label="64x64" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect96x96"
+         width="96"
+         height="96"
+         x="288"
+         y="28"
+         inkscape:label="96x96" /><rect
+         style="display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect256x256-7"
+         width="256"
+         height="256"
+         x="16"
+         y="28"
+         inkscape:label="256x256" /></g><g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Shadow"
+       style="display:inline"
+       sodipodi:insensitive="true"><rect
+         ry="50"
+         y="47"
+         x="34"
+         height="220"
+         width="220"
+         id="rect4114"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate" /></g><g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Background"
+       style="display:inline"><path
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4254);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         d="M 84,46.5 C 56.568735,46.5 34.5,68.568732 34.5,96 v 120 c 0,27.43127 22.068735,49.5 49.5,49.5 h 120 c 27.43127,0 49.5,-22.06873 49.5,-49.5 V 96 C 253.5,68.568732 231.43127,46.5 204,46.5 Z"
+         id="path4200" /></g><g
+       inkscape:groupmode="layer"
+       id="layer6"
+       inkscape:label="Symbols"
+       style="display:inline"><g
+         id="Layer_1-2"
+         data-name="Layer 1"
+         transform="matrix(1.322302,0,0,1.322302,59.921425,71.894979)"><path
+           class="cls-1"
+           d="M 18.45,63.47 A 18.4,18.4 0 0 0 2.31,45.23 73.13,73.13 0 0 0 2.31,81.7 18.38,18.38 0 0 0 18.45,63.47"
+           id="path1" /><path
+           class="cls-1"
+           d="M 29.13,57.7 A 5.77,5.77 0 1 0 34.9,63.47 5.77,5.77 0 0 0 29.13,57.7"
+           id="path2" /><path
+           class="cls-1"
+           d="m 108.72,63.47 a 18.38,18.38 0 0 0 16.14,18.23 73.13,73.13 0 0 0 0,-36.47 18.4,18.4 0 0 0 -16.14,18.24"
+           id="path3" /><path
+           class="cls-1"
+           d="m 98,57.7 a 5.77,5.77 0 1 0 5.76,5.77 A 5.77,5.77 0 0 0 98,57.7"
+           id="path4" /><path
+           class="cls-1"
+           d="m 63.46,108.77 a 18.39,18.39 0 0 0 -18.23,16.13 73.13,73.13 0 0 0 36.47,0 18.38,18.38 0 0 0 -18.24,-16.13"
+           id="path5" /><path
+           class="cls-1"
+           d="m 63.47,92.31 a 5.77,5.77 0 1 0 5.76,5.77 5.77,5.77 0 0 0 -5.76,-5.77"
+           id="path6" /><path
+           class="cls-1"
+           d="M 63.47,18.44 A 18.37,18.37 0 0 0 81.7,2.31 a 73.13,73.13 0 0 0 -36.47,0 18.39,18.39 0 0 0 18.24,16.13"
+           id="path7" /><path
+           class="cls-1"
+           d="m 63.47,23.37 a 5.77,5.77 0 1 0 5.76,5.76 5.76,5.76 0 0 0 -5.76,-5.76"
+           id="path8" /><path
+           class="cls-1"
+           d="m 95.44,95.44 a 18.4,18.4 0 0 0 -1.5,24.29 73,73 0 0 0 25.78,-25.79 18.39,18.39 0 0 0 -24.28,1.5"
+           id="path9" /><path
+           class="cls-1"
+           d="m 83.8,83.8 a 5.77,5.77 0 1 0 8.16,0 5.78,5.78 0 0 0 -8.16,0"
+           id="path10" /><path
+           class="cls-1"
+           d="M 31.59,31.59 A 18.36,18.36 0 0 0 33.09,7.31 72.93,72.93 0 0 0 7.31,33.09 18.36,18.36 0 0 0 31.59,31.59"
+           id="path11" /><path
+           class="cls-1"
+           d="m 35.07,35.08 a 5.77,5.77 0 1 0 8.16,0 5.78,5.78 0 0 0 -8.16,0"
+           id="path12" /><path
+           class="cls-1"
+           d="M 95.4,31.53 A 18.39,18.39 0 0 0 119.69,33 72.88,72.88 0 0 0 93.9,7.25 18.39,18.39 0 0 0 95.4,31.53"
+           id="path13" /><path
+           class="cls-1"
+           d="m 91.92,43.17 a 5.76,5.76 0 1 0 -8.15,0 5.76,5.76 0 0 0 8.15,0"
+           id="path14" /><path
+           class="cls-1"
+           d="M 31.56,95.37 A 18.39,18.39 0 0 0 7.28,93.87 73,73 0 0 0 33.06,119.66 18.38,18.38 0 0 0 31.56,95.37"
+           id="path15" /><path
+           class="cls-1"
+           d="m 35,83.73 a 5.77,5.77 0 1 0 8.16,0 5.79,5.79 0 0 0 -8.16,0"
+           id="path16" /></g></g><g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Highlights"
+       style="display:inline"
+       sodipodi:insensitive="true"><path
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.13;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+         d="M 84,47 C 56.836703,47 35,68.836703 35,96 v 1 C 35,69.836703 56.836703,48 84,48 h 120 c 27.1633,0 49,21.836703 49,49 V 96 C 253,68.836703 231.1633,47 204,47 Z"
+         id="rect3894"
+         inkscape:connector-curvature="0" /><path
+         id="path4085"
+         d="m 204,266 c 27.1633,0 49,-21.8367 49,-49 v -1 c 0,27.1633 -21.8367,49 -49,49 H 84 C 56.8367,265 35,243.1633 35,216 v 1 c 0,27.1633 21.8367,49 49,49 z"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.41;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+         inkscape:connector-curvature="0" /><path
+         inkscape:connector-curvature="0"
+         id="path4280"
+         d="M 84,265 C 56.836703,265 35,243.1633 35,216 v -1 c 0,27.1633 21.836703,49 49,49 h 120 c 27.1633,0 49,-21.8367 49,-49 v 1 c 0,27.1633 -21.8367,49 -49,49 z"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+         inkscape:label="path4280" /></g><g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Border"
+       style="display:inline"
+       sodipodi:insensitive="true"><path
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.41;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;enable-background:accumulate"
+         d="M 84,46 C 56.3,46 34,68.3 34,96 v 120 c 0,27.7 22.3,50 50,50 h 120 c 27.7,0 50,-22.3 50,-50 V 96 C 254,68.3 231.7,46 204,46 Z m 0,1 h 120 c 27.1633,0 49,21.836703 49,49 v 120 c 0,27.1633 -21.8367,49 -49,49 H 84 C 56.836703,265 35,243.1633 35,216 V 96 C 35,68.836703 56.836703,47 84,47 Z"
+         id="rect4040"
+         inkscape:connector-curvature="0" /></g></g></svg>