From ebdaf52f216ea63172a23716943d3a32dace5ea5 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Fri, 13 Sep 2013 22:15:45 +0200
Subject: Add desktop file and delete old SVGs

---
 Makefile.am                |   9 ++-
 colloquium.desktop         |   9 +++
 data/colloquium-image.svg  | 138 ---------------------------------------------
 data/colloquium-select.svg | 102 ---------------------------------
 data/colloquium-text.svg   |  80 --------------------------
 data/colloquium.svg        |  99 ++++++++++++++++++++++++++++++++
 6 files changed, 114 insertions(+), 323 deletions(-)
 create mode 100644 colloquium.desktop
 delete mode 100644 data/colloquium-image.svg
 delete mode 100644 data/colloquium-select.svg
 delete mode 100644 data/colloquium-text.svg
 create mode 100644 data/colloquium.svg

diff --git a/Makefile.am b/Makefile.am
index 154d20a..a627142 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,12 +27,15 @@ src/default_stylesheet.o: src/default_stylesheet.sty
 
 colloquiumdir = $(datadir)/colloquium
 colloquium_DATA = data/colloquium.ui
+EXTRA_DIST += $(colloquium_DATA)
 
 iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = data/colloquium-select.svg data/colloquium-text.svg \
-             data/colloquium-image.svg
+icons_DATA = data/colloquium.svg
+EXTRA_DIST += $(icons_DATA)
 
-EXTRA_DIST += $(colloquium_DATA)
+desktopdir = $(datadir)/applications
+desktop_DATA = colloquium.desktop
+EXTRA_DIST += $(desktop_DATA)
 
 noinst_PROGRAMS = tests/storycode_test tests/render_test tests/render_test_sc1
 TESTS = tests/storycode_test tests/render_test tests/render_test_sc1
diff --git a/colloquium.desktop b/colloquium.desktop
new file mode 100644
index 0000000..5e81f0c
--- /dev/null
+++ b/colloquium.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+GenericName=Presentation
+Name=Colloquium
+Comment=Presentation tool
+Exec=colloquium
+Icon=colloquium
+Terminal=false
+Type=Application
+Categories=GTK;Office;Presentation
diff --git a/data/colloquium-image.svg b/data/colloquium-image.svg
deleted file mode 100644
index d196f9e..0000000
--- a/data/colloquium-image.svg
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="31.5"
-   height="31.5"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="colloquium-image.svg">
-  <defs
-     id="defs4">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3809">
-      <rect
-         rx="3"
-         ry="3"
-         y="489.80862"
-         x="252.53571"
-         height="30"
-         width="30"
-         id="rect3811"
-         style="color:#000000;fill:none;stroke:#ff00dc;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="15.504462"
-     inkscape:cy="8.6517726"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="713"
-     inkscape:window-height="577"
-     inkscape:window-x="926"
-     inkscape:window-y="175"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-251.94197,-489.10324)">
-    <g
-       id="g3802"
-       clip-path="url(#clipPath3809)">
-      <rect
-         transform="translate(249.28572,486.29074)"
-         y="-7.8571129"
-         x="-3.5"
-         height="48"
-         width="45.25"
-         id="rect3800"
-         style="color:#000000;fill:#4b82fa;fill-opacity:1;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         clip-path="none"
-         id="g3791">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:#00a72b;fill-opacity:1;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3755"
-           sodipodi:cx="35.357143"
-           sodipodi:cy="35.714317"
-           sodipodi:rx="23.392857"
-           sodipodi:ry="20.535715"
-           d="m 58.75,35.714317 c 0,11.341563 -10.473339,20.535715 -23.392857,20.535715 -12.919518,0 -23.392856,-9.194152 -23.392856,-20.535715 0,-11.341562 10.473338,-20.535715 23.392856,-20.535715 12.919518,0 23.392857,9.194153 23.392857,20.535715 z"
-           transform="translate(249.28572,486.29074)" />
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:#0c912e;fill-opacity:1;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3757"
-           sodipodi:cx="5.8928571"
-           sodipodi:cy="42.142887"
-           sodipodi:rx="20"
-           sodipodi:ry="20.714285"
-           d="m 25.892857,42.142887 c 0,11.440184 -8.954305,20.714285 -19.9999999,20.714285 -11.045695,0 -20.0000001,-9.274101 -20.0000001,-20.714285 0,-11.440184 8.9543051,-20.714285 20.0000001,-20.714285 11.0456949,0 19.9999999,9.274101 19.9999999,20.714285 z"
-           transform="translate(249.28572,486.29074)" />
-      </g>
-      <path
-         transform="translate(246.66072,483.91574)"
-         d="m 18.392857,15.357173 c 0,2.268312 -1.83883,4.107143 -4.107143,4.107143 -2.268312,0 -4.107143,-1.838831 -4.107143,-4.107143 0,-2.268312 1.838831,-4.107143 4.107143,-4.107143 2.268313,0 4.107143,1.838831 4.107143,4.107143 z"
-         sodipodi:ry="4.1071429"
-         sodipodi:rx="4.1071429"
-         sodipodi:cy="15.357173"
-         sodipodi:cx="14.285714"
-         id="path3759"
-         style="color:#000000;fill:#fff600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985"
-       width="30"
-       height="30"
-       x="3.3928571"
-       y="3.5714586"
-       transform="translate(249.28572,486.29074)"
-       ry="3"
-       rx="3" />
-  </g>
-</svg>
diff --git a/data/colloquium-select.svg b/data/colloquium-select.svg
deleted file mode 100644
index 2b2671d..0000000
--- a/data/colloquium-select.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="35.163731"
-   height="35.067051"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="colloquium-select.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="14.435985"
-     inkscape:cy="4.4353291"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="919"
-     inkscape:window-height="635"
-     inkscape:window-x="119"
-     inkscape:window-y="236"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-297.12188,-552.40606)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 55,10.067051 20,20"
-       id="path3919"
-       inkscape:connector-curvature="0"
-       transform="translate(249.74688,549.8748)" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 75,10.067051 -20,20"
-       id="path3921"
-       inkscape:connector-curvature="0"
-       transform="translate(249.74688,549.8748)" />
-    <path
-       style="fill:none;stroke:#1300d4;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 314.74688,554.94185 0,30"
-       id="path3909"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#1300d4;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 299.74688,569.94185 30,0"
-       id="path3911"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:2.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 50,20.067051 30,0"
-       id="path3925"
-       inkscape:connector-curvature="0"
-       transform="translate(249.74688,549.8748)" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:2.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 65,5.0670509 65,35.067051"
-       id="path3927"
-       inkscape:connector-curvature="0"
-       transform="translate(249.74688,549.8748)" />
-  </g>
-</svg>
diff --git a/data/colloquium-text.svg b/data/colloquium-text.svg
deleted file mode 100644
index 57b6791..0000000
--- a/data/colloquium-text.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40.357143"
-   height="37.142887"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="colloquium-text.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-15.714288"
-     inkscape:cy="9.642874"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="919"
-     inkscape:window-height="635"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-249.28572,-486.29074)">
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="268.57144"
-       y="518.79077"
-       id="text2991"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2993"
-         x="268.57144"
-         y="518.79077"
-         style="font-size:36px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif Bold Italic">T</tspan></text>
-  </g>
-</svg>
diff --git a/data/colloquium.svg b/data/colloquium.svg
new file mode 100644
index 0000000..2eb7a0e
--- /dev/null
+++ b/data/colloquium.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="130.16031"
+   height="143.73679"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="64.499893"
+     inkscape:cy="53.749991"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="916"
+     inkscape:window-height="855"
+     inkscape:window-x="546"
+     inkscape:window-y="163"
+     inkscape:window-maximized="0"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-325.14297,-446.66111)">
+    <rect
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2987"
+       width="30.357143"
+       height="37.5"
+       x="364.10715"
+       y="541.64789" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffff97;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2985"
+       sodipodi:cx="379.28571"
+       sodipodi:cy="514.14789"
+       sodipodi:rx="33.214287"
+       sodipodi:ry="33.214287"
+       d="m 412.49999,514.14789 c 0,18.34374 -14.87054,33.21428 -33.21428,33.21428 -18.34375,0 -33.21429,-14.87054 -33.21429,-33.21428 0,-18.34375 14.87054,-33.21429 33.21429,-33.21429 18.34374,0 33.21428,14.87054 33.21428,33.21429 z" />
+    <g
+       id="g3784"
+       transform="matrix(0.96170227,0.27409625,-0.27409625,0.96170227,156.72282,-87.963287)">
+      <rect
+         y="474.50504"
+         x="346.96429"
+         height="30.714273"
+         width="64.285698"
+         id="rect3776"
+         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="474.50504"
+         x="323.21429"
+         height="7.5"
+         width="111.78572"
+         id="rect3778"
+         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3782"
+         d="m 427.5,480.21932 c 0,0 11.42857,13.92858 8.21429,28.92858 -3.21429,15 -5.71429,18.21428 -4.28572,27.5"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
-- 
cgit v1.2.3