Merge remote-tracking branch 'origin/Applications/15.08'

remotes/origin/Applications/15.12
Albert Astals Cid 11 years ago
commit 73677eaf0e
  1. 10
      ui/pageview.cpp

@ -2431,6 +2431,11 @@ void PageView::mouseReleaseEvent( QMouseEvent * e )
{
d->document->processAction( static_cast<Okular::ScreenAnnotation*>( ann )->action() );
}
else if ( ann->subType() == Okular::Annotation::AFileAttachment )
{
const Okular::FileAttachmentAnnotation * fileAttachAnnot = static_cast< Okular::FileAttachmentAnnotation * >( ann );
GuiUtils::saveEmbeddedFile( fileAttachAnnot->embeddedFile(), this );
}
}
#if 0
// a link can move us to another page or even to another document, there's no point in trying to
@ -3970,6 +3975,11 @@ void PageView::updateCursor( const QPoint &p )
setCursor( Qt::PointingHandCursor );
}
}
else if ( annotation->subType() == Okular::Annotation::AFileAttachment )
{
d->mouseOnRect = true;
setCursor( Qt::PointingHandCursor );
}
else
{
setCursor( Qt::OpenHandCursor );

Loading…
Cancel
Save