[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kpdf_annotations: kdegraphics/kpdf
From: Enrico Ros <rosenric () dei ! unipd ! it>
Date: 2005-04-13 18:21:19
Message-ID: 20050413182119.2AC13492 () office ! kde ! org
[Download RAW message or body]
CVS commit by eros:
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 - :-))
A ui/data/checkmark.png 1.1.2.1
A ui/data/circle.png 1.1.2.1
A ui/data/comment.png 1.1.2.1
A ui/data/cross.png 1.1.2.1
A ui/data/help.png 1.1.2.1
A ui/data/insert.png 1.1.2.1
A ui/data/key.png 1.1.2.1
A ui/data/newparagraph.png 1.1.2.1
A ui/data/note.png 1.1.2.1
A ui/data/paragraph.png 1.1.2.1
A ui/data/rightarrow.png 1.1.2.1
A ui/data/rightpointer.png 1.1.2.1
A ui/data/star.png 1.1.2.1
A ui/data/tool_eraser.png 1.1.2.1
A ui/data/tool_hl_orange.png 1.1.2.1
A ui/data/tool_hl_pink.png 1.1.2.1
A ui/data/tool_hl_yellow.png 1.1.2.1
A ui/data/tool_ink_green.png 1.1.2.1
A ui/data/tool_note.png 1.1.2.1
A ui/data/uparrow.png 1.1.2.1
A ui/data/upleftarrow.png 1.1.2.1
A ui/data/sources/checkmark.svgz 1.1.2.1
A ui/data/sources/circle.svgz 1.1.2.1
A ui/data/sources/comment.svgz 1.1.2.1
A ui/data/sources/cross.svgz 1.1.2.1
A ui/data/sources/help.svgz 1.1.2.1
A ui/data/sources/insert.svgz 1.1.2.1
A ui/data/sources/key.svgz 1.1.2.1
A ui/data/sources/newparagraph.svgz 1.1.2.1
A ui/data/sources/note.svgz 1.1.2.1
A ui/data/sources/paragraph.svgz 1.1.2.1
A ui/data/sources/rightarrow.svgz 1.1.2.1
A ui/data/sources/rightpointer.svgz 1.1.2.1
A ui/data/sources/star.svgz 1.1.2.1
A ui/data/sources/uparrow.svgz 1.1.2.1
A ui/data/sources/upleftarrow.svgz 1.1.2.1
M +5 -0 core/generator_pdf/generator_pdf.cpp 1.20.2.11
M +13 -4 ui/data/Makefile.am 1.1.2.2
M +7 -14 ui/data/tools.xml 1.1.2.5
R ui/data/coprex-white.png 1.1.2.1
R ui/data/highlight_green.png 1.1.2.1
R ui/data/highlight_orange.png 1.1.2.1
R ui/data/highlight_pink.png 1.1.2.1
R ui/data/highlight_yellow.png 1.1.2.1
R ui/data/pencil.png 1.1.2.1
R ui/data/pinnote.png 1.1.2.1
--- kdegraphics/kpdf/core/generator_pdf/generator_pdf.cpp #1.20.2.10:1.20.2.11
@@ -894,4 +894,9 @@ void PDFGenerator::addAnnotations( Page
// -> 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;
--- kdegraphics/kpdf/ui/data/Makefile.am #1.1.2.1:1.1.2.2
@@ -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
--- kdegraphics/kpdf/ui/data/tools.xml #1.1.2.4:1.1.2.5
@@ -18,5 +18,5 @@
-->
<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">
@@ -25,5 +25,5 @@
<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">
@@ -32,18 +32,11 @@
<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">
@@ -52,5 +45,5 @@
<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" />
@@ -58,5 +51,5 @@
<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" />
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic