Added icons for Text annotations (ake the 'page sybols'). Changed naming to

existing ones, updated 'tools.xml' with new names and made generator_pdf
parse pdf icon names as lowercase. Added SVG sources too for the icons.

- note that I suck as icon maker, so plz make good looking icons and don't
complain about these - :-))

svn path=/branches/kpdf_annotations/kdegraphics/kpdf/; revision=405395

core/generator_pdf/generator_pdf.cpp

@@ -893,6 +893,11 @@ void PDFGenerator::addAnnotations( Page * pdfPage, KPDFPage * page )
                 t->textType = TextAnnotation::Linked;
                 // -> textIcon
                 XPDFReader::lookupName( annotDict, "Name", t->textIcon );
+                if ( !t->textIcon.isEmpty() )
+                {
+                    t->textIcon = t->textIcon.lower();
+                    t->textIcon.remove( ' ' );
+                }
                 // request for postprocessing window geometry
                 PostProcessText request;
                 request.textAnnotation = t;

ui/data/Makefile.am

@@ -1,6 +1,15 @@
-pics_DATA = highlight_green.png highlight_orange.png highlight_pink.png \
-            highlight_yellow.png pencil.png pinnote.png coprex-white.png
-picsdir = $(kde_datadir)/kpdf/pics
+# install annotation tool images
+toolpicsdir = $(kde_datadir)/kpdf/pics
+toolpics_DATA = tool_eraser.png tool_hl_orange.png tool_hl_pink.png \
+                tool_hl_yellow.png tool_ink_green.png tool_note.png
 
-xml_DATA = tools.xml
+# install annotation page images
+annpicsdir = $(kde_datadir)/kpdf/pics
+annpics_DATA = checkmark.png circle.png comment.png cross.png help.png \
+               insert.png key.png newparagraph.png note.png paragraph.png \
+               rightarrow.png rightpointer.png star.png uparrow.png \
+               upleftarrow.png
+
+# install annotator xml tools description
 xmldir = $(kde_datadir)/kpdf
+xml_DATA = tools.xml

ui/data/tools.xml

@@ -17,47 +17,40 @@ Engine/Annotation Types [specific attributes]:
     Geom
 -->
 <annotatingTools>
-  <tool id="1" name="Yellow Highlighter" pixmap="highlight_yellow">
+  <tool id="1" name="Yellow Highlighter" pixmap="tool_hl_yellow">
     <tooltip>this ..</tooltip>
     <engine type="SmoothLine" color="#FFFF00">
       <annotation type="Highlight" color="#FFFF00" />
     </engine>
     <shortcut>1</shortcut>
   </tool>
-  <tool id="2" name="Pink Highlighter" pixmap="highlight_pink">
+  <tool id="2" name="Pink Highlighter" pixmap="tool_hl_pink">
     <tooltip>.. is ..</tooltip>
     <engine type="SmoothLine" color="#FF0080">
       <annotation type="Ink" color="#FF0080" />
     </engine>
     <shortcut>2</shortcut>
   </tool>
-  <tool id="3" name="Yellow Highlighter" pixmap="highlight_yellow">
-    <tooltip>.. a ..</tooltip>
-    <engine type="TwoPoints" color="#F8FF00" block="true">
-      <annotation type="Highlight" color="#F8FF00" />
-    </engine>
-    <shortcut>3</shortcut>
-  </tool>
-  <tool id="4" name="note" pixmap="pinnote">
+  <tool id="3" name="note" pixmap="pinnote">
     <tooltip>.. tooltip ..</tooltip>
-    <engine type="PickPoint" color="#FF00FF" hoverIcon="pinnote">
+    <engine type="PickPoint" color="#FF00FF" hoverIcon="too_note">
       <annotation type="Text" color="#FF00FF" />
     </engine>
   </tool>
-  <tool id="5" name="Straight Yellow Line" pixmap="color_line">
+  <tool id="4" name="Straight Yellow Line" pixmap="tool_ink_green">
     <tooltip>.. test</tooltip>
     <engine type="TwoPoints" color="#FFE000">
       <annotation type="Line" width="4" color="#FFE000" />
     </engine>
     <shortcut>5</shortcut>
   </tool>
-  <tool id="6" name="Arrowed Black Line" pixmap="color_line">
+  <tool id="5" name="Arrowed Black Line" pixmap="color_line">
     <engine type="TwoPoints">
       <annotation type="Line" />
     </engine>
     <shortcut>6</shortcut>
   </tool>
-  <tool id="7" name="Warning Stamp" pixmap="messagebox_warning">
+  <tool id="6" name="Warning Stamp" pixmap="messagebox_warning">
     <engine type="PickPoint" hoverIcon="messagebox_warning">
       <annotation type="Stamp" icon="messagebox_warning" />
     </engine>