Differential D21238 Diff 58276 conf/editannottooldialog.cpp

Changeset View

Standalone View

View Options

conf/editannottooldialog.cpp

Show First 20 Lines • Show All 183 Lines • ▼ Show 20 Line(s)178 {
184 annotationElement.setAttribute( QStringLiteral("type"), QStringLiteral("Line") ); 184​ annotationElement.setAttribute( QStringLiteral("type"), QStringLiteral("Line") );
185 annotationElement.setAttribute( QStringLiteral("color"), color ); 185​ annotationElement.setAttribute( QStringLiteral("color"), color );
186 annotationElement.setAttribute( QStringLiteral("width"), width ); 186​ annotationElement.setAttribute( QStringLiteral("width"), width );
187 if ( la->lineLeadingForwardPoint() != 0 || la->lineLeadingBackwardPoint() != 0 ) 187​ if ( la->lineLeadingForwardPoint() != 0 || la->lineLeadingBackwardPoint() != 0 )
188 { 188​ {
189 annotationElement.setAttribute( QStringLiteral("leadFwd"), QString::number( la->lineLeadingForwardPoint() ) ); 189​ annotationElement.setAttribute( QStringLiteral("leadFwd"), QString::number( la->lineLeadingForwardPoint() ) );
190 annotationElement.setAttribute( QStringLiteral("leadBack"), QString::number( la->lineLeadingBackwardPoint() ) ); 190​ annotationElement.setAttribute( QStringLiteral("leadBack"), QString::number( la->lineLeadingBackwardPoint() ) );
191 } 191​ }
192​ annotationElement.setAttribute( QStringLiteral("startStyle"), QString::number( la->lineStartStyle() ) );
192 annotationElement.setAttribute( QStringLiteral("endStyle"), QString::number( la->lineEndStyle() )); 193​ annotationElement.setAttribute( QStringLiteral("endStyle"), QString::number( la->lineEndStyle() ) );
193 } 194​ }
194 else if ( toolType == ToolPolygon ) 195​ else if ( toolType == ToolPolygon )
195 { 196​ {
196 Okular::LineAnnotation * la = static_cast<Okular::LineAnnotation*>( m_stubann ); 197​ Okular::LineAnnotation * la = static_cast<Okular::LineAnnotation*>( m_stubann );
197 toolElement.setAttribute( QStringLiteral("type"), QStringLiteral("polygon") ); 198​ toolElement.setAttribute( QStringLiteral("type"), QStringLiteral("polygon") );
198 engineElement.setAttribute( QStringLiteral("type"), QStringLiteral("PolyLine") ); 199​ engineElement.setAttribute( QStringLiteral("type"), QStringLiteral("PolyLine") );
199 engineElement.setAttribute( QStringLiteral("color"), color ); 200​ engineElement.setAttribute( QStringLiteral("color"), color );
200 engineElement.setAttribute( QStringLiteral("points"), QStringLiteral("-1") ); 201​ engineElement.setAttribute( QStringLiteral("points"), QStringLiteral("-1") );
▲ Show 20 Lines • Show All 279 Lines • ▼ Show 20 Line(s)412{
480 else if ( annotType == QLatin1String("straight-line") ) 481​ else if ( annotType == QLatin1String("straight-line") )
481 { 482​ {
482 setToolType( ToolStraightLine ); 483​ setToolType( ToolStraightLine );
483 Okular::LineAnnotation * la = static_cast<Okular::LineAnnotation*>( m_stubann ); 484​ Okular::LineAnnotation * la = static_cast<Okular::LineAnnotation*>( m_stubann );
484 if ( annotationElement.hasAttribute( QStringLiteral("leadFwd") ) ) 485​ if ( annotationElement.hasAttribute( QStringLiteral("leadFwd") ) )
485 la->setLineLeadingForwardPoint( annotationElement.attribute( QStringLiteral("leadFwd") ).toDouble() ); 486​ la->setLineLeadingForwardPoint( annotationElement.attribute( QStringLiteral("leadFwd") ).toDouble() );
486 if ( annotationElement.hasAttribute( QStringLiteral("leadBack") ) ) 487​ if ( annotationElement.hasAttribute( QStringLiteral("leadBack") ) )
487 la->setLineLeadingBackwardPoint( annotationElement.attribute( QStringLiteral("leadBack") ).toDouble() ); 488​ la->setLineLeadingBackwardPoint( annotationElement.attribute( QStringLiteral("leadBack") ).toDouble() );
489​ if ( annotationElement.hasAttribute( QStringLiteral("startStyle") ) )
490​ la->setLineStartStyle( (Okular::LineAnnotation::TermStyle)annotationElement.attribute( QStringLiteral("startStyle") ).toInt() );
488 if ( annotationElement.hasAttribute( QStringLiteral("endStyle") ) ) 491​ if ( annotationElement.hasAttribute( QStringLiteral("endStyle") ) )
489 la->setLineEndStyle( (Okular::LineAnnotation::TermStyle)annotationElement.attribute( QStringLiteral("endStyle") ).toInt() ); 492​ la->setLineEndStyle( (Okular::LineAnnotation::TermStyle)annotationElement.attribute( QStringLiteral("endStyle") ).toInt() );
490 } 493​ }
491 else if ( annotType == QLatin1String("strikeout") ) 494​ else if ( annotType == QLatin1String("strikeout") )
492 { 495​ {
493 setToolType( ToolTextMarkup ); 496​ setToolType( ToolTextMarkup );
494 Okular::HighlightAnnotation * ha = static_cast<Okular::HighlightAnnotation*>( m_stubann ); 497​ Okular::HighlightAnnotation * ha = static_cast<Okular::HighlightAnnotation*>( m_stubann );
495 ha->setHighlightType( Okular::HighlightAnnotation::StrikeOut ); 498​ ha->setHighlightType( Okular::HighlightAnnotation::StrikeOut );
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines