mirror of
https://invent.kde.org/graphics/okular
synced 2024-07-17 02:37:04 +00:00
0957abc39a
Usage: If you left-click an annotation, it gets selected. Resize handles appear on the selection rectangle. When cursor is moved over one of the 8 resize handles on the corners/edges, the cursor shape changes to indicate resize mode. Everywhere else on the annotation means "move", just as it was before resize feature was added. Pressing ESC or clicking an area outside the annotation cancels a selection. Pressing Del deletes a selected annotation. Feature is only applicable for annotation types AText, AStamp and AGeom. Implementation: It works by eventually changing AnnotationPrivate::m_boundary and notifying generator (i.e. poppler) about that change. Annotation state handling is shifted out of PageView into a new class MouseAnnotation (ui/pageviewmouseannotation.cpp). Some functionality not related to resizing but to annotation interaction in general is also shifted to class MouseAnnotation, to build a single place of responsiblity. Other changes: Add method Document::adjustPageAnnotation, backed by a QUndoCommand. class Okular::AdjustAnnotationCommand. Add Annotation::adjust and Annotation::canBeResized methods. Draw resize handles in PagePainter::paintCroppedPageOnPainter. Resize and move work -for types AText, AStamp and AGeom -on all pages of document -when viewport position changes -when zoom level changes -for all page rotations (0°, 90°, 180°, 270°) Selection is canceled -when currently selected annotation is deleted -on mouse click outside of currently selected annotation -ESC is pressed Viewport is shifted when mouse cursor during move/resize comes close to viewport border. Resize to negative is prevented. Tiny annotations are still selectable. If mouse is moved over an annotation type that we can focus, and the annotation is not yet focused, mouse cursor shape changes to arrow. If mouse cursor rests over an annotation A, while annotation B is focused, a tooltip for annotation A is shown. Selected Annotation is deleted when Del is pressed. Test for regressions: -Annotation interaction (focus, move, resize, start playback, ...) are only done in mode EnumMouseMode::Browse. -If mouse is moved over an annotation type where we can start an action, mouse cursor shape changes to pointing hand. -If mouse is moved over an annotation type that we can't interact with, mouse cursor shape stays a open hand. -If mouse cursor rests over an annotation of any type, a tooltip for that annotation is shown. -Grab/move scroll area (on left click + mouse move) is prevented, if mouse is over focused annotation, or over AMovie/AScreen/AFileAttachment annotation. -A double click on a annotation starts the "annotator". REVIEW: 127366 BUG: 177778 BUG: 314843 BUG: 358060
81 lines
2.5 KiB
C++
81 lines
2.5 KiB
C++
/***************************************************************************
|
|
* Copyright (C) 2007 by Pino Toscano <pino@kde.org> *
|
|
* *
|
|
* This program is free software; you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation; either version 2 of the License, or *
|
|
* (at your option) any later version. *
|
|
***************************************************************************/
|
|
|
|
#ifndef OKULAR_ANNOTATIONS_P_H
|
|
#define OKULAR_ANNOTATIONS_P_H
|
|
|
|
#include "area.h"
|
|
#include "annotations.h"
|
|
|
|
// qt/kde includes
|
|
#include <QtCore/QDateTime>
|
|
#include <QtCore/QString>
|
|
#include <QtCore/QVariant>
|
|
#include <QtGui/QColor>
|
|
|
|
class QTransform;
|
|
|
|
namespace Okular {
|
|
|
|
class PagePrivate;
|
|
|
|
class AnnotationPrivate
|
|
{
|
|
public:
|
|
AnnotationPrivate();
|
|
|
|
virtual ~AnnotationPrivate();
|
|
|
|
/**
|
|
* Transforms the annotation coordinates with the transformation
|
|
* defined by @p matrix.
|
|
*/
|
|
void annotationTransform( const QTransform &matrix );
|
|
|
|
virtual void transform( const QTransform &matrix );
|
|
virtual void baseTransform( const QTransform &matrix );
|
|
virtual void resetTransformation();
|
|
virtual void translate( const NormalizedPoint &coord );
|
|
virtual void adjust( const NormalizedPoint & deltaCoord1, const NormalizedPoint & deltaCoord2 );
|
|
virtual bool openDialogAfterCreation() const;
|
|
virtual void setAnnotationProperties( const QDomNode& node );
|
|
virtual bool canBeResized() const;
|
|
virtual AnnotationPrivate* getNewAnnotationPrivate() = 0;
|
|
|
|
/**
|
|
* Determines the distance of the closest point of the annotation to the
|
|
* given point @p x @p y @p xScale @p yScale
|
|
* @since 0.17
|
|
*/
|
|
virtual double distanceSqr( double x, double y, double xScale, double yScale );
|
|
|
|
PagePrivate * m_page;
|
|
|
|
QString m_author;
|
|
QString m_contents;
|
|
QString m_uniqueName;
|
|
QDateTime m_modifyDate;
|
|
QDateTime m_creationDate;
|
|
|
|
int m_flags;
|
|
NormalizedRect m_boundary;
|
|
NormalizedRect m_transformedBoundary;
|
|
|
|
Okular::Annotation::Style m_style;
|
|
Okular::Annotation::Window m_window;
|
|
QLinkedList< Okular::Annotation::Revision > m_revisions;
|
|
|
|
Annotation::DisposeDataFunction m_disposeFunc;
|
|
QVariant m_nativeId;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|