aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/alpha_warning.pngbin0 -> 17965 bytes
-rw-r--r--data/alpha_warning.svg193
-rw-r--r--data/demo.sc15
-rw-r--r--meson.build3
4 files changed, 209 insertions, 2 deletions
diff --git a/data/alpha_warning.png b/data/alpha_warning.png
new file mode 100644
index 0000000..48078f1
--- /dev/null
+++ b/data/alpha_warning.png
Binary files differ
diff --git a/data/alpha_warning.svg b/data/alpha_warning.svg
new file mode 100644
index 0000000..008ab2e
--- /dev/null
+++ b/data/alpha_warning.svg
@@ -0,0 +1,193 @@
+<?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"
+ version="1.1"
+ width="384.28552"
+ height="339.41339"
+ id="svg2816"
+ xml:space="preserve"
+ inkscape:version="0.92+devel unknown"
+ sodipodi:docname="UK_traffic_sign_562.svg"
+ viewBox="0 0 360.26767 318.20004"
+ inkscape:export-filename="/home/taw/UK_traffic_sign_562.svg.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"><metadata
+ id="metadata81"><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><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1361"
+ inkscape:window-height="665"
+ id="namedview79"
+ showgrid="false"
+ fit-margin-top="0.1"
+ fit-margin-left="0.1"
+ fit-margin-right="0.1"
+ fit-margin-bottom="0.1"
+ inkscape:zoom="1"
+ inkscape:cx="-24.66288"
+ inkscape:cy="126.41705"
+ inkscape:window-x="236"
+ inkscape:window-y="13"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2816"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:document-rotation="0" /><defs
+ id="defs2820"><clipPath
+ id="clipPath2832"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path2834"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath2840"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path2842"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath2858"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path2860"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath2864"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path2866"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3306"><path
+ d="m 199.238,472.977 v -29.74 h 29.744 v 29.74"
+ id="path3308"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3322"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path3324"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3330"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path3332"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3344"><path
+ d="m 88.233,387.221 v -28.335 h 32.08 v 28.335"
+ id="path3346"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3462"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path3464"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3470"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path3472"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3490"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path3492"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3496"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path3498"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3520"><path
+ d="m 254.788,326.215 v -28.309 h 28.326 v 28.309"
+ id="path3522"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3544"><path
+ d="m 145.049,326.142 v -28.333 h 28.342 v 28.333"
+ id="path3546"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3682"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path3684"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3690"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path3692"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3980"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path3982"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath3988"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path3990"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4010"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path4012"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4016"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path4018"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4062"><path
+ d="m 200.163,177.773 v -28.284 h 28.283 v 28.284"
+ id="path4064"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4090"><path
+ d="m 34.886,177.515 v -51.632 h 30.367 v 51.632"
+ id="path4092"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4106"><path
+ d="m 34.886,177.515 v -51.632 h 30.367 v 51.632"
+ id="path4108"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4272"><path
+ d="m 34.886,177.515 v -51.632 h 30.367 v 51.632"
+ id="path4274"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4304"><path
+ d="m 254.653,176.442 v -48.167 h 28.317 v 48.167"
+ id="path4306"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4310"><path
+ d="m 253.565,177.983 h 31.181 V 128.8 h -31.181 z"
+ id="path4312"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4316"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path4318"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4322"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path4324"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4456"><path
+ d="M -0.24,595.138 H 317.24 V -0.138 H -0.24 Z"
+ id="path4458"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath4464"><path
+ d="M 0.03,595.32 H 317.49 V 0 H 0.03 Z"
+ id="path4466"
+ inkscape:connector-curvature="0" /></clipPath></defs><path
+ style="fill:#ec1d24;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="m 336.29006,318.10004 c 8.5855,0 16.45648,-4.5216 20.6875,-11.90625 4.25346,-7.37342 4.25346,-16.47912 0,-23.875 L 200.82135,11.975043 C 196.54539,4.6016433 188.72329,0.10005333 180.22758,0.10005333 c -0.0312,0 -0.0625,-1.2e-4 -0.0937,0 -0.0312,-1.2e-4 -0.0625,0 -0.0937,0 -8.49573,0 -16.31785,4.50157997 -20.59376,11.87498967 L 3.2901025,282.31879 c -4.25347,7.39588 -4.25347,16.50158 0,23.875 4.23102,7.38465 12.1019905,11.90625 20.6875005,11.90625 z"
+ id="path3101"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="scccscscccss" /><path
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ id="path3121"
+ d="M 322.51265,286.28315 H 37.754823 L 180.13381,39.806515 Z"
+ sodipodi:nodetypes="cccc" /><text
+ xml:space="preserve"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:180px;font-family:BrettFont;-inkscape-font-specification:'BrettFont Italic';fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.93749994"
+ x="115.30536"
+ y="257.26254"
+ id="text72"><tspan
+ sodipodi:role="line"
+ id="tspan70"
+ x="115.30536"
+ y="257.26254"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:180px;font-family:Utopia;-inkscape-font-specification:'Utopia Italic';stroke-width:0.93749994">α</tspan></text>
+</svg> \ No newline at end of file
diff --git a/data/demo.sc b/data/demo.sc
index df6e9be..1ecb3a2 100644
--- a/data/demo.sc
+++ b/data/demo.sc
@@ -6,7 +6,7 @@
\ss[prestitle]{\f[1fx140u+0+0]\pad[20,20,20,20]\fontsize[64]\fgcol[#eeeeee]\contents}
\ss[slidetitle]{\f[1fx90u+0+0]\pad[20,20,20,20]\fontsize[36]\fgcol[#eeeeee]\contents}
- \ss[footer]{\f[600ux30u+500+740]{\editable{\fontsize[11]\bold{T. A. White} | \editable{A demonstration talk | 25th September 2013} | \bold{Slide} \slidenumber}}}
+ \ss[footer]{\f[600ux30u+500+740]{\editable{\fontsize[11]\bold{T. A. White} | \editable{A demonstration talk | 1 March 2018} | \bold{Slide} \slidenumber}}}
\ss[credit]{\f[600ux30u+700+700]{\fontsize[11]\contents}}
\ss[bp]{➤ }
@@ -38,4 +38,17 @@ What is the narrative window for? Well, it's up to you! Here are some suggesti
If you have two screens connected to your computer at the moment, you could try a mock presentation now.
Besides this, Colloquium has some features which will help you when you come to give your presentation. In the "Tools" menu, you'll find the presentation clock and the test card.
Use the test card to make sure your computer is talking to the projector correctly. It shows you the resolution of the screen, where it thinks the edges are, and some colours. This helps you spot and fix all-too-common display problems early.
+Now, a short warning:
+\slide{\slidetitle{Alpha test software}\footer\f[389.2ux345.2u+98.1+198.1]{\image[1fx1f+0+0,filename="alpha_warning.png"]{}}\f[415.5ux432.1u+564.7+185.0]{Colloquium is "alpha test" software.
+
+It will probably crash on you and eat your work.
+
+Save and back up your work as frequently as possible.
+
+That said, it has never crashed on me in front of a live audience. You will find most bugs in the editing features, not playback.
+
+Nevertheless, creating a backup slide deck in PDF format (File->Export slides as PDF) is wise.
+
+Please report all bugs here:
+https://www.bitwiz.me.uk/tracker}}
That's enough to get you started. I hope you enjoy using Colloquium!
diff --git a/meson.build b/meson.build
index a37374b..3aff3f1 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,8 @@ executable('colloquium',
install : true)
# Data files, icon, desktop file etc
-install_data(['data/demo.sc', 'data/sky.png', 'data/canvas.png'],
+install_data(['data/demo.sc', 'data/sky.png', 'data/canvas.png',
+ 'data/alpha_warning.png'],
install_dir : datadir)
install_data(['data/colloquium.desktop'],