From ef4e1d7ab392caaaeea06d2f629642423d8d52ea Mon Sep 17 00:00:00 2001 From: Fabio D'Urso Date: Mon, 11 Jun 2012 22:09:49 +0200 Subject: [PATCH] Paint some annotation tool icons dynamically So that they are the same color as the annotations they create. This patch also adds some new icons. Affected annotation tools: - Ellipse - Polygon - Rectangle (NEW) - Squiggly (NEW) - Line - Strikeout (NEW) - Underline I'll edit the remaining icons in next patches. --- ui/data/CMakeLists.txt | 5 +- ui/data/sources/tool-base-okular.svgz | Bin 0 -> 10758 bytes ui/data/tool-base-okular.png | Bin 0 -> 870 bytes ui/pageviewannotator.cpp | 86 +++++++++++++++++++++++--- 4 files changed, 77 insertions(+), 14 deletions(-) create mode 100644 ui/data/sources/tool-base-okular.svgz create mode 100644 ui/data/tool-base-okular.png diff --git a/ui/data/CMakeLists.txt b/ui/data/CMakeLists.txt index 6501be51d..0734f1a0b 100644 --- a/ui/data/CMakeLists.txt +++ b/ui/data/CMakeLists.txt @@ -8,17 +8,14 @@ install(FILES # install annotation tool images install(FILES - tool-ellipse-okular.png + tool-base-okular.png tool-highlighter-okular.png tool-ink-okular.png - tool-line-okular.png tool-note.png tool-note-okular.png tool-note-inline.png tool-note-inline-okular.png - tool-polygon-okular.png tool-stamp-okular.png - tool-underline-okular.png DESTINATION ${DATA_INSTALL_DIR}/okular/pics) # install annotation page images install(FILES diff --git a/ui/data/sources/tool-base-okular.svgz b/ui/data/sources/tool-base-okular.svgz new file mode 100644 index 0000000000000000000000000000000000000000..c761eff1780815edb5c80a0c21d83f092210482b GIT binary patch literal 10758 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 E0G{x^8UO$Q literal 0 HcmV?d00001 diff --git a/ui/data/tool-base-okular.png b/ui/data/tool-base-okular.png new file mode 100644 index 0000000000000000000000000000000000000000..cf6eb01338bf5a2d8bef652eae588d926226106a GIT binary patch literal 870 zcmV-s1DX7ZP)ZMv(@Y_7R;hk?N{qZ{AVDX6OVsZ;fqAtHRH z4B)p9_Vj=g`El}~*82NLx@WW5ZwChlCZGUZCG>Jqa_`Z)}7`U#>#Kgq=0a~pVhGF3QK6iI_ zBoYYvFj) zT5C~Cy-pFO)Gy=zqP4ZPKY)OUAR<5CKp+qxolXzy#l=Mc48!=@E_3v6_Lm)FvDnBB z-URR&GCj`&pjxeReSOX5<|gOo=KzQZN-4C~!v(K*2cVQdCAq)6{%DT%d&7BhieaM<6#$G|B#!T zn>PbsS(a$6#kOrxN=c{F5fKrswK$F=T5Ayz>G%86@ApMS#C2U!N=duj77-EKw&m&R zNiHrf-W)^zZNaGZcYx1N!KVW#rP$foq0{N0lmehwEYfH+cz%BV-vNTvYL!N#K{A=7 zR4Ne)g*ZJuWqo}e%d&{YVrZ>tx7*mZO*Wh5?CgwSFi0+!dq2S8;UUx0)70yAJkKK< zjS`7Oh(@E_-`~^g_3%88TCK+F>MG@Od1U4QD5d1+=tx}Gl~SoBzVAz=QjvbYFDEA_ w!#LJzHMzaL72CGOb={Gr;46k-0G|% 0 ) + { + QDomElement engineEl = engineNodeList.item( 0 ).toElement(); + if ( !engineEl.isNull() && engineEl.hasAttribute( "color" ) ) + engineColor = QColor( engineEl.attribute( "color" ) ); + } + + QPainter p( &pixmap ); + + if ( annotType == "ellipse" ) + { + p.setRenderHint( QPainter::Antialiasing ); + p.setPen( QPen( engineColor, 2 ) ); + p.drawEllipse( 2, 7, 21, 14 ); + } + else if ( annotType == "polygon" ) + { + QPainterPath path; + path.moveTo( 0, 7 ); + path.lineTo( 19, 7 ); + path.lineTo( 19, 14 ); + path.lineTo( 23, 14 ); + path.lineTo( 23, 20 ); + path.lineTo( 0, 20 ); + p.setPen( QPen( engineColor, 1 ) ); + p.drawPath( path ); + } + else if ( annotType == "rectangle" ) + { + p.setRenderHint( QPainter::Antialiasing ); + p.setPen( QPen( engineColor, 2 ) ); + p.drawRect( 2, 7, 21, 14 ); + } + else if ( annotType == "squiggly" ) + { + p.setPen( QPen( engineColor, 1, Qt::DotLine ) ); + p.drawLine( 1, 13, 16, 13 ); + p.drawLine( 2, 14, 15, 14 ); + p.drawLine( 0, 20, 19, 20 ); + p.drawLine( 1, 21, 18, 21 ); + } + else if ( annotType == "straight-line" ) + { + QPainterPath path; + path.moveTo( 1, 8 ); + path.lineTo( 20, 8 ); + path.lineTo( 1, 27 ); + path.lineTo( 20, 27 ); + p.setRenderHint( QPainter::Antialiasing ); + p.setPen( QPen( engineColor, 1 ) ); + p.drawPath( path ); // TODO To be discussed: This is not a straight line! + } + else if ( annotType == "strikeout" ) + { + p.setPen( QPen( engineColor, 1 ) ); + p.drawLine( 1, 10, 16, 10 ); + p.drawLine( 0, 17, 19, 17 ); + } + else if ( annotType == "underline" ) + { + p.setPen( QPen( engineColor, 1 ) ); + p.drawLine( 1, 13, 16, 13 ); + p.drawLine( 0, 20, 19, 20 ); + } + else + { + /* Unrecognized annotation type -- It shouldn't happen */ + p.setPen( QPen( engineColor ) ); + p.drawText( QPoint(20, 31), "?" ); + } } if ( !iconName.isEmpty() )