Add Image tool icons

4 files changed, 145 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index ce87b7d..868caed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ colloquiumdir = $(datadir)/colloquium
 colloquium_DATA = data/colloquium.ui
 
 iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = data/colloquium-select.svg data/colloquium-text.svg
+icons_DATA = data/colloquium-select.svg data/colloquium-text.svg \
+             data/colloquium-image.svg
 
 EXTRA_DIST += $(colloquium_DATA)
diff --git a/data/colloquium-image.svg b/data/colloquium-image.svg
new file mode 100644
index 0000000..d196f9e
--- /dev/null
+++ b/data/colloquium-image.svg
@@ -0,0 +1,138 @@
+<?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.ui b/data/colloquium.ui
index 532056b..94e502f 100644
--- a/data/colloquium.ui
+++ b/data/colloquium.ui
@@ -53,9 +53,7 @@
 		<separator />
 		<toolitem name="select" action="ButtonToolSelectAction" />
 		<toolitem name="text" action="ButtonToolTextAction" />
-		<separator />
-		<toolitem name="select" action="ButtonToolSelectAction" />
-		<toolitem name="text" action="ButtonToolTextAction" />
+		<toolitem name="image" action="ButtonToolImageAction" />
 
 	</toolbar>
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index f671736..0148bbc 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -364,6 +364,7 @@ enum tool_id
 {
 	TOOL_SELECT,
 	TOOL_TEXT,
+	TOOL_IMAGE,
 };
 
 
@@ -379,6 +380,7 @@ static gint set_tool_sig(GtkWidget *widget, GtkRadioAction *action,
 	{
 		case TOOL_SELECT : p->cur_tool = p->select_tool; break;
 		case TOOL_TEXT : p->cur_tool = p->text_tool; break;
+		case TOOL_IMAGE : p->cur_tool = p->image_tool; break;
 	}
 
 	if ( p->editing_object != NULL ) {
@@ -495,6 +497,8 @@ static void add_menu_bar(struct presentation *p, GtkWidget *vbox)
 			NULL, NULL, TOOL_SELECT },
 		{ "ButtonToolTextAction", "colloquium-text", "Text",
 			NULL, NULL, TOOL_TEXT },
+		{ "ButtonToolImageAction", "colloquium-image", "Image",
+			NULL, NULL, TOOL_IMAGE },
 	};
 	guint n_tools = G_N_ELEMENTS(tools);