office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce the uses of mAnnotations.first(), less confusing

Browse source
This commit is contained in:
Albert Astals Cid 2012-01-17 23:06:06 +01:00
parent 948ea54026
commit 52d118fc4b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/annotationpopup.cpp
View file

@ -52,16 +52,17 @@ void AnnotationPopup::exec( const QPoint &point )
deleteNote = menu.addAction( KIcon( "list-remove" ), i18n( "&Delete" ) );
deleteNote->setEnabled( mDocument->isAllowed( Okular::AllowNotes ) );
if ( onlyOne && mAnnotations.first().annotation->flags() & Okular::Annotation::DenyDelete )
const AnnotPagePair &firstAnnotPagePair = mAnnotations.at(0);
if ( onlyOne && firstAnnotPagePair.annotation->flags() & Okular::Annotation::DenyDelete )
deleteNote->setEnabled( false );
showProperties = menu.addAction( KIcon( "configure" ), i18n( "&Properties" ) );
showProperties->setEnabled( onlyOne );
if ( onlyOne && mAnnotations.first().annotation->subType() == Okular::Annotation::AFileAttachment )
if ( onlyOne && firstAnnotPagePair.annotation->subType() == Okular::Annotation::AFileAttachment )
{
menu.addSeparator();
fileAttachAnnot = static_cast< Okular::FileAttachmentAnnotation * >( mAnnotations.first().annotation );
fileAttachAnnot = static_cast< Okular::FileAttachmentAnnotation * >( firstAnnotPagePair.annotation );
const QString saveText = i18nc( "%1 is the name of the file to save", "&Save '%1'...", fileAttachAnnot->embeddedFile()->name() );
saveAttachment = menu.addAction( KIcon( "document-save" ), saveText );
}
@ -71,7 +72,7 @@ void AnnotationPopup::exec( const QPoint &point )
// check if the user really selected an action
if ( choice ) {
if ( choice == popoutWindow ) {
emit setAnnotationWindow( mAnnotations.first().annotation );
emit setAnnotationWindow( firstAnnotPagePair.annotation );
} else if( choice == deleteNote ) {
Q_FOREACH ( const AnnotPagePair& pair, mAnnotations )
{
@ -81,8 +82,8 @@ void AnnotationPopup::exec( const QPoint &point )
emit removeAnnotationWindow( pair.annotation );
}
} else if( choice == showProperties ) {
if ( mAnnotations.first().pageNumber != -1 ) {
AnnotsPropertiesDialog propdialog( mParent, mDocument, mAnnotations.first().pageNumber, mAnnotations.first().annotation );
if ( firstAnnotPagePair.pageNumber != -1 ) {
AnnotsPropertiesDialog propdialog( mParent, mDocument, firstAnnotPagePair.pageNumber, firstAnnotPagePair.annotation );
propdialog.exec();
}
} else if( choice == saveAttachment ) {