office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
okular/core/documentcommands.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

678 lines
24 KiB
C++
Raw Normal View History

Convert license headers to SPDX
2021-05-24 07:25:56 +00:00
/*
SPDX-FileCopyrightText: 2013 Jon Mease <jon.mease@gmail.com>
Make meaning of sponsoring note more clear
2021-06-03 18:33:18 +00:00
Work sponsored by the LiMux project of the city of Munich:
Move sponsoring note outside of SPDX-FileCopyrightText statement
2021-05-24 11:41:08 +00:00
SPDX-FileCopyrightText: 2017 Klarälvdalens Datakonsult AB a KDAB Group company <info@kdab.com>
Convert license headers to SPDX
2021-05-24 07:25:56 +00:00
SPDX-License-Identifier: GPL-2.0-or-later
*/
More the commands to a different file
2013-04-05 22:39:35 +00:00
#include "documentcommands_p.h"
#include "annotations.h"
#include "debug_p.h"
#include "document_p.h"
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
#include "form.h"
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
#include "page.h"
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
#include "page_p.h"
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
#include "utils_p.h"
More the commands to a different file
2013-04-05 22:39:35 +00:00
#include <KLocalizedString>
namespace Okular
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
{
void moveViewportIfBoundingRectNotFullyVisible(Okular::NormalizedRect boundingRect, DocumentPrivate *docPriv, int pageNumber)
Run clang-format find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format -i {} \; If you reached this file doing a git blame, please see README.clang-format (added 2 commits in the future of this one)
2020-07-10 22:15:05 +00:00
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
const Rotation pageRotation = docPriv->m_parent->page(pageNumber)->rotation();
const QTransform rotationMatrix = Okular::buildRotationMatrix(pageRotation);
boundingRect.transform(rotationMatrix);
if (!docPriv->isNormalizedRectangleFullyVisible(boundingRect, pageNumber)) {
DocumentViewport searchViewport(pageNumber);
searchViewport.rePos.enabled = true;
searchViewport.rePos.normalizedX = (boundingRect.left + boundingRect.right) / 2.0;
searchViewport.rePos.normalizedY = (boundingRect.top + boundingRect.bottom) / 2.0;
clang-tidy: modernize-use-nullptr run Semi-ACK'd by Albert :)
2017-09-05 21:27:18 +00:00
docPriv->m_parent->setViewport(searchViewport, nullptr, true);
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
}
}
Okular::NormalizedRect buildBoundingRectangleForButtons(const QList<Okular::FormFieldButton *> &formButtons)
{
// Initialize coordinates of the bounding rect
double left = 1.0;
double top = 1.0;
double right = 0.0;
double bottom = 0.0;
[core/*] replace foreach, deprecated, with range-for The code compiles and okular seems to load and work as before, all unit tests pass except (parttest and epubgeneratortest, but they fail on master too).
2019-12-09 13:16:55 +00:00
for (const FormFieldButton *formButton : formButtons) {
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
left = qMin<double>(left, formButton->rect().left);
top = qMin<double>(top, formButton->rect().top);
right = qMax<double>(right, formButton->rect().right);
bottom = qMax<double>(bottom, formButton->rect().bottom);
}
Okular::NormalizedRect boundingRect(left, top, right, bottom);
return boundingRect;
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
AddAnnotationCommand::AddAnnotationCommand(Okular::DocumentPrivate *docPriv, Okular::Annotation *annotation, int pageNumber)
: m_docPriv(docPriv)
, m_annotation(annotation)
, m_pageNumber(pageNumber)
, m_done(false)
{
setText(i18nc("Add an annotation to the page", "add annotation"));
}
AddAnnotationCommand::~AddAnnotationCommand()
{
if (!m_done) {
delete m_annotation;
}
}
void AddAnnotationCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_docPriv->performRemovePageAnnotation(m_pageNumber, m_annotation);
m_done = false;
}
void AddAnnotationCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_docPriv->performAddPageAnnotation(m_pageNumber, m_annotation);
m_done = true;
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool AddAnnotationCommand::refreshInternalPageReferences(const QVector<Okular::Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
if (m_done) {
// We don't always update m_annotation because even if the annotation has been added to the document
// it can have been removed later so the annotation pointer is stored inside a following RemoveAnnotationCommand
// and thus doesn't need updating because it didn't change
// because of the document reload
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
RemoveAnnotationCommand::RemoveAnnotationCommand(Okular::DocumentPrivate *doc, Okular::Annotation *annotation, int pageNumber)
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
: m_docPriv(doc)
More the commands to a different file
2013-04-05 22:39:35 +00:00
, m_annotation(annotation)
, m_pageNumber(pageNumber)
, m_done(false)
{
setText(i18nc("Remove an annotation from the page", "remove annotation"));
}
RemoveAnnotationCommand::~RemoveAnnotationCommand()
{
if (m_done) {
delete m_annotation;
}
}
void RemoveAnnotationCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
m_docPriv->performAddPageAnnotation(m_pageNumber, m_annotation);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_done = false;
}
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
void RemoveAnnotationCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
m_docPriv->performRemovePageAnnotation(m_pageNumber, m_annotation);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_done = true;
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool RemoveAnnotationCommand::refreshInternalPageReferences(const QVector<Okular::Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
if (!m_done) {
// We don't always update m_annotation because it can happen that the annotation remove has been undo
Fix minor EBN issues
2018-08-17 18:05:01 +00:00
// and that annotation addition has also been undone so the annotation pointer is stored inside
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
// a previous AddAnnotationCommand and thus doesn't need updating because it didn't change
// because of the document reload
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
ModifyAnnotationPropertiesCommand::ModifyAnnotationPropertiesCommand(DocumentPrivate *docPriv, Annotation *annotation, int pageNumber, const QDomNode &oldProperties, const QDomNode &newProperties)
: m_docPriv(docPriv)
, m_annotation(annotation)
, m_pageNumber(pageNumber)
, m_prevProperties(oldProperties)
, m_newProperties(newProperties)
{
setText(i18nc("Modify an annotation's internal properties (Color, line-width, etc.)", "modify annotation properties"));
}
void ModifyAnnotationPropertiesCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_annotation->setAnnotationProperties(m_prevProperties);
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
void ModifyAnnotationPropertiesCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_annotation->setAnnotationProperties(m_newProperties);
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool ModifyAnnotationPropertiesCommand::refreshInternalPageReferences(const QVector<Okular::Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
// Same reason for not unconditionally updating m_annotation, the annotation pointer can be stored in an add/Remove command
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
TranslateAnnotationCommand::TranslateAnnotationCommand(DocumentPrivate *docPriv, Annotation *annotation, int pageNumber, const Okular::NormalizedPoint &delta, bool completeDrag)
: m_docPriv(docPriv)
, m_annotation(annotation)
, m_pageNumber(pageNumber)
, m_delta(delta)
, m_completeDrag(completeDrag)
{
setText(i18nc("Translate an annotation's position on the page", "translate annotation"));
}
void TranslateAnnotationCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(translateBoundingRectangle(minusDelta()), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_annotation->translate(minusDelta());
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
void TranslateAnnotationCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(translateBoundingRectangle(m_delta), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_annotation->translate(m_delta);
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
int TranslateAnnotationCommand::id() const
{
return 1;
}
bool TranslateAnnotationCommand::mergeWith(const QUndoCommand *uc)
{
TranslateAnnotationCommand *tuc = (TranslateAnnotationCommand *)uc;
if (tuc->m_annotation != m_annotation) {
return false;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
if (m_completeDrag) {
return false;
}
m_delta = Okular::NormalizedPoint(tuc->m_delta.x + m_delta.x, tuc->m_delta.y + m_delta.y);
m_completeDrag = tuc->m_completeDrag;
return true;
}
Okular::NormalizedPoint TranslateAnnotationCommand::minusDelta()
{
return Okular::NormalizedPoint(-m_delta.x, -m_delta.y);
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
Okular::NormalizedRect TranslateAnnotationCommand::translateBoundingRectangle(const Okular::NormalizedPoint &delta)
{
Okular::NormalizedRect annotBoundingRect = m_annotation->boundingRectangle();
Fix viewport transition when translating/resizing annotations Viewport isn't centered on annotations when translating/resizing. This is best seen if the page is zoomed in and annotation is translated so that several viewport transitions had happened. Using undo after translation will expose error. Function moveViewportIfBoundingRectNotFullyVisible centers viewport based on translated/resized annotation's bounding rectangle. For that reason functions translateBoundingRectangle/adjustBoundingRectangle need to return the same bounding rectangle as annotation's translate/adjust functions.
2022-09-09 16:03:34 +00:00
annotBoundingRect.left = annotBoundingRect.left + delta.x;
annotBoundingRect.right = annotBoundingRect.right + delta.x;
annotBoundingRect.top = annotBoundingRect.top + delta.y;
annotBoundingRect.bottom = annotBoundingRect.bottom + delta.y;
return annotBoundingRect;
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool TranslateAnnotationCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
// Same reason for not unconditionally updating m_annotation, the annotation pointer can be stored in an add/Remove command
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Add annotation resize functionality 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
2017-03-19 22:16:06 +00:00
AdjustAnnotationCommand::AdjustAnnotationCommand(Okular::DocumentPrivate *docPriv, Okular::Annotation *annotation, int pageNumber, const Okular::NormalizedPoint &delta1, const Okular::NormalizedPoint &delta2, bool completeDrag)
: m_docPriv(docPriv)
, m_annotation(annotation)
, m_pageNumber(pageNumber)
, m_delta1(delta1)
, m_delta2(delta2)
, m_completeDrag(completeDrag)
{
setText(i18nc("Change an annotation's size", "adjust annotation"));
}
void AdjustAnnotationCommand::undo()
{
const NormalizedPoint minusDelta1 = Okular::NormalizedPoint(-m_delta1.x, -m_delta1.y);
const NormalizedPoint minusDelta2 = Okular::NormalizedPoint(-m_delta2.x, -m_delta2.y);
moveViewportIfBoundingRectNotFullyVisible(adjustBoundingRectangle(minusDelta1, minusDelta2), m_docPriv, m_pageNumber);
m_annotation->adjust(minusDelta1, minusDelta2);
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
void AdjustAnnotationCommand::redo()
{
moveViewportIfBoundingRectNotFullyVisible(adjustBoundingRectangle(m_delta1, m_delta2), m_docPriv, m_pageNumber);
m_annotation->adjust(m_delta1, m_delta2);
m_docPriv->performModifyPageAnnotation(m_pageNumber, m_annotation, true);
}
int AdjustAnnotationCommand::id() const
{
return 5;
}
bool AdjustAnnotationCommand::mergeWith(const QUndoCommand *uc)
{
AdjustAnnotationCommand *tuc = (AdjustAnnotationCommand *)uc;
if (tuc->m_annotation != m_annotation) {
return false;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Add annotation resize functionality 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
2017-03-19 22:16:06 +00:00
if (m_completeDrag) {
return false;
}
m_delta1 = Okular::NormalizedPoint(tuc->m_delta1.x + m_delta1.x, tuc->m_delta1.y + m_delta1.y);
m_delta2 = Okular::NormalizedPoint(tuc->m_delta2.x + m_delta2.x, tuc->m_delta2.y + m_delta2.y);
m_completeDrag = tuc->m_completeDrag;
return true;
}
Okular::NormalizedRect AdjustAnnotationCommand::adjustBoundingRectangle(const Okular::NormalizedPoint &delta1, const Okular::NormalizedPoint &delta2)
{
Fix viewport transition when translating/resizing annotations Viewport isn't centered on annotations when translating/resizing. This is best seen if the page is zoomed in and annotation is translated so that several viewport transitions had happened. Using undo after translation will expose error. Function moveViewportIfBoundingRectNotFullyVisible centers viewport based on translated/resized annotation's bounding rectangle. For that reason functions translateBoundingRectangle/adjustBoundingRectangle need to return the same bounding rectangle as annotation's translate/adjust functions.
2022-09-09 16:03:34 +00:00
Okular::NormalizedRect annotBoundingRect = m_annotation->boundingRectangle();
annotBoundingRect.left = annotBoundingRect.left + delta1.x;
annotBoundingRect.right = annotBoundingRect.right + delta2.x;
annotBoundingRect.top = annotBoundingRect.top + delta1.y;
annotBoundingRect.bottom = annotBoundingRect.bottom + delta2.y;
return annotBoundingRect;
Add annotation resize functionality 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
2017-03-19 22:16:06 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool AdjustAnnotationCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
// Same reason for not unconditionally updating m_annotation, the annotation pointer can be stored in an add/Remove command
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
EditTextCommand::EditTextCommand(const QString &newContents, int newCursorPos, const QString &prevContents, int prevCursorPos, int prevAnchorPos)
: m_newContents(newContents)
, m_newCursorPos(newCursorPos)
, m_prevContents(prevContents)
, m_prevCursorPos(prevCursorPos)
, m_prevAnchorPos(prevAnchorPos)
{
setText(i18nc("Generic text edit command", "edit text"));
//// Determine edit type
// If There was a selection then edit was not a simple single character backspace, delete, or insert
if (m_prevCursorPos != m_prevAnchorPos) {
Use categorized logging
2014-09-11 17:36:01 +00:00
qCDebug(OkularCoreDebug) << "OtherEdit, selection";
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_editType = OtherEdit;
Get rid of QStringRef
2023-12-06 12:03:30 +00:00
} else if (newContentsRightOfCursor() == oldContentsRightOfCursor() && newContentsLeftOfCursor() == oldContentsLeftOfCursor().left(oldContentsLeftOfCursor().length() - 1) &&
QStringView {oldContentsLeftOfCursor()}.right(1) != QLatin1Char('\n')) {
Use categorized logging
2014-09-11 17:36:01 +00:00
qCDebug(OkularCoreDebug) << "CharBackspace";
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_editType = CharBackspace;
Add a few definitions that will come with ECM 5.85 Better enforce them now, so that the work to port doesn't increase over time Not a super fan of this for regular applications, but oh well the ship has sailed
2022-04-02 21:21:33 +00:00
} else if (newContentsLeftOfCursor() == oldContentsLeftOfCursor() && newContentsRightOfCursor() == oldContentsRightOfCursor().right(oldContentsRightOfCursor().length() - 1) &&
Get rid of QStringRef
2023-12-06 12:03:30 +00:00
QStringView {oldContentsRightOfCursor()}.left(1) != QLatin1Char('\n')) {
Use categorized logging
2014-09-11 17:36:01 +00:00
qCDebug(OkularCoreDebug) << "CharDelete";
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_editType = CharDelete;
Get rid of QStringRef
2023-12-06 12:03:30 +00:00
} else if (newContentsRightOfCursor() == oldContentsRightOfCursor() && newContentsLeftOfCursor().left(newContentsLeftOfCursor().length() - 1) == oldContentsLeftOfCursor() &&
QStringView {newContentsLeftOfCursor()}.right(1) != QLatin1Char('\n')) {
Use categorized logging
2014-09-11 17:36:01 +00:00
qCDebug(OkularCoreDebug) << "CharInsert";
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_editType = CharInsert;
} else {
Use categorized logging
2014-09-11 17:36:01 +00:00
qCDebug(OkularCoreDebug) << "OtherEdit";
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_editType = OtherEdit;
}
}
bool EditTextCommand::mergeWith(const QUndoCommand *uc)
{
EditTextCommand *euc = (EditTextCommand *)uc;
// Only attempt merge of euc into this if our new state matches euc's old state and
// the editTypes match and are not type OtherEdit
if (m_newContents == euc->m_prevContents && m_newCursorPos == euc->m_prevCursorPos && m_editType == euc->m_editType && m_editType != OtherEdit) {
m_newContents = euc->m_newContents;
m_newCursorPos = euc->m_newCursorPos;
return true;
}
return false;
}
QString EditTextCommand::oldContentsLeftOfCursor()
{
return m_prevContents.left(m_prevCursorPos);
}
QString EditTextCommand::oldContentsRightOfCursor()
{
return m_prevContents.right(m_prevContents.length() - m_prevCursorPos);
}
QString EditTextCommand::newContentsLeftOfCursor()
{
return m_newContents.left(m_newCursorPos);
}
QString EditTextCommand::newContentsRightOfCursor()
{
return m_newContents.right(m_newContents.length() - m_newCursorPos);
}
EditAnnotationContentsCommand::EditAnnotationContentsCommand(DocumentPrivate *docPriv, Annotation *annotation, int pageNumber, const QString &newContents, int newCursorPos, const QString &prevContents, int prevCursorPos, int prevAnchorPos)
: EditTextCommand(newContents, newCursorPos, prevContents, prevCursorPos, prevAnchorPos)
, m_docPriv(docPriv)
, m_annotation(annotation)
, m_pageNumber(pageNumber)
{
setText(i18nc("Edit an annotation's text contents", "edit annotation contents"));
}
void EditAnnotationContentsCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_docPriv->performSetAnnotationContents(m_prevContents, m_annotation, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->annotationContentsChangedByUndoRedo(m_annotation, m_prevContents, m_prevCursorPos, m_prevAnchorPos);
More the commands to a different file
2013-04-05 22:39:35 +00:00
}
void EditAnnotationContentsCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_annotation->boundingRectangle(), m_docPriv, m_pageNumber);
More the commands to a different file
2013-04-05 22:39:35 +00:00
m_docPriv->performSetAnnotationContents(m_newContents, m_annotation, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->annotationContentsChangedByUndoRedo(m_annotation, m_newContents, m_newCursorPos, m_newCursorPos);
More the commands to a different file
2013-04-05 22:39:35 +00:00
}
int EditAnnotationContentsCommand::id() const
{
return 2;
}
bool EditAnnotationContentsCommand::mergeWith(const QUndoCommand *uc)
{
EditAnnotationContentsCommand *euc = (EditAnnotationContentsCommand *)uc;
// Only attempt merge of euc into this if they modify the same annotation
if (m_annotation == euc->m_annotation) {
return EditTextCommand::mergeWith(uc);
} else {
return false;
}
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool EditAnnotationContentsCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
auto a = newPagesVector[m_pageNumber]->annotation(m_annotation->uniqueName());
if (a) {
m_annotation = a;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
EditFormTextCommand::EditFormTextCommand(Okular::DocumentPrivate *docPriv, Okular::FormFieldText *form, int pageNumber, const QString &newContents, int newCursorPos, const QString &prevContents, int prevCursorPos, int prevAnchorPos)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
: EditTextCommand(newContents, newCursorPos, prevContents, prevCursorPos, prevAnchorPos)
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
, m_docPriv(docPriv)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
, m_form(form)
, m_pageNumber(pageNumber)
{
setText(i18nc("Edit an form's text contents", "edit form contents"));
}
void EditFormTextCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_form->setText(m_prevContents);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formTextChangedByUndoRedo(m_pageNumber, m_form, m_prevContents, m_prevCursorPos, m_prevAnchorPos);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
void EditFormTextCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_form->setText(m_newContents);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formTextChangedByUndoRedo(m_pageNumber, m_form, m_newContents, m_newCursorPos, m_newCursorPos);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
int EditFormTextCommand::id() const
{
return 3;
}
bool EditFormTextCommand::mergeWith(const QUndoCommand *uc)
{
EditFormTextCommand *euc = (EditFormTextCommand *)uc;
// Only attempt merge of euc into this if they modify the same form
if (m_form == euc->m_form) {
return EditTextCommand::mergeWith(uc);
} else {
return false;
}
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool EditFormTextCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
m_form = dynamic_cast<FormFieldText *>(Okular::PagePrivate::findEquivalentForm(newPagesVector[m_pageNumber], m_form));
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return m_form;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
EditFormListCommand::EditFormListCommand(Okular::DocumentPrivate *docPriv, FormFieldChoice *form, int pageNumber, const QList<int> &newChoices, const QList<int> &prevChoices)
: m_docPriv(docPriv)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
, m_form(form)
, m_pageNumber(pageNumber)
, m_newChoices(newChoices)
, m_prevChoices(prevChoices)
{
setText(i18nc("Edit a list form's choices", "edit list form choices"));
}
void EditFormListCommand::undo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_form->setCurrentChoices(m_prevChoices);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formListChangedByUndoRedo(m_pageNumber, m_form, m_prevChoices);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
void EditFormListCommand::redo()
{
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_form->setCurrentChoices(m_newChoices);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formListChangedByUndoRedo(m_pageNumber, m_form, m_newChoices);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool EditFormListCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
m_form = dynamic_cast<FormFieldChoice *>(Okular::PagePrivate::findEquivalentForm(newPagesVector[m_pageNumber], m_form));
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return m_form;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
EditFormComboCommand::EditFormComboCommand(Okular::DocumentPrivate *docPriv, FormFieldChoice *form, int pageNumber, const QString &newContents, int newCursorPos, const QString &prevContents, int prevCursorPos, int prevAnchorPos)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
: EditTextCommand(newContents, newCursorPos, prevContents, prevCursorPos, prevAnchorPos)
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
, m_docPriv(docPriv)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
, m_form(form)
, m_pageNumber(pageNumber)
, m_newIndex(-1)
, m_prevIndex(-1)
{
setText(i18nc("Edit a combo form's selection", "edit combo form selection"));
// Determine new and previous choice indices (if any)
for (int i = 0; i < m_form->choices().size(); i++) {
CI: Enable clazy detaching-temporary
2020-02-19 16:13:21 +00:00
if (m_form->choices().at(i) == m_prevContents) {
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_prevIndex = i;
}
CI: Enable clazy detaching-temporary
2020-02-19 16:13:21 +00:00
if (m_form->choices().at(i) == m_newContents) {
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_newIndex = i;
}
}
}
void EditFormComboCommand::undo()
{
if (m_prevIndex != -1) {
m_form->setCurrentChoices(QList<int>() << m_prevIndex);
Run clang-format find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format -i {} \; If you reached this file doing a git blame, please see README.clang-format (added 2 commits in the future of this one)
2020-07-10 22:15:05 +00:00
} else {
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_form->setEditChoice(m_prevContents);
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formComboChangedByUndoRedo(m_pageNumber, m_form, m_prevContents, m_prevCursorPos, m_prevAnchorPos);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
void EditFormComboCommand::redo()
{
if (m_newIndex != -1) {
m_form->setCurrentChoices(QList<int>() << m_newIndex);
} else {
m_form->setEditChoice(m_newContents);
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
moveViewportIfBoundingRectNotFullyVisible(m_form->rect(), m_docPriv, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formComboChangedByUndoRedo(m_pageNumber, m_form, m_newContents, m_newCursorPos, m_newCursorPos);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
int EditFormComboCommand::id() const
{
return 4;
}
bool EditFormComboCommand::mergeWith(const QUndoCommand *uc)
{
EditFormComboCommand *euc = (EditFormComboCommand *)uc;
// Only attempt merge of euc into this if they modify the same form
if (m_form == euc->m_form) {
bool shouldMerge = EditTextCommand::mergeWith(uc);
if (shouldMerge) {
m_newIndex = euc->m_newIndex;
}
return shouldMerge;
} else {
return false;
}
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool EditFormComboCommand::refreshInternalPageReferences(const QVector<Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
m_form = dynamic_cast<FormFieldChoice *>(Okular::PagePrivate::findEquivalentForm(newPagesVector[m_pageNumber], m_form));
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return m_form;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
EditFormButtonsCommand::EditFormButtonsCommand(Okular::DocumentPrivate *docPriv, int pageNumber, const QList<FormFieldButton *> &formButtons, const QList<bool> &newButtonStates)
: m_docPriv(docPriv)
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
, m_pageNumber(pageNumber)
, m_formButtons(formButtons)
, m_newButtonStates(newButtonStates)
, m_prevButtonStates(QList<bool>())
{
setText(i18nc("Edit the state of a group of form buttons", "edit form button states"));
s/qAsConst/std::as_const/ We now definitely has std::as_const available and Qt has started nagging about converting to std::as_const. Implementation is the same for both functions, and qAsConst was a stop-gap measure until std::as_const was sufficiently available.
2023-12-19 08:58:22 +00:00
for (const FormFieldButton *formButton : std::as_const(m_formButtons)) {
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
m_prevButtonStates.append(formButton->state());
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
m_pageNumbers.append(formButton->page()->number());
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
}
void EditFormButtonsCommand::undo()
{
clearFormButtonStates();
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
QSet<int> extraPages;
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
for (int i = 0; i < m_formButtons.size(); i++) {
bool checked = m_prevButtonStates.at(i);
if (checked) {
m_formButtons.at(i)->setState(checked);
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
if (m_pageNumbers.at(i) != m_pageNumber) {
extraPages << m_pageNumbers.at(i);
}
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
Okular::NormalizedRect boundingRect = buildBoundingRectangleForButtons(m_formButtons);
moveViewportIfBoundingRectNotFullyVisible(boundingRect, m_docPriv, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formButtonsChangedByUndoRedo(m_pageNumber, m_formButtons);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
for (auto page : std::as_const(extraPages)) {
m_docPriv->notifyFormChanges(page);
}
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
void EditFormButtonsCommand::redo()
{
clearFormButtonStates();
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
QSet<int> extraPages;
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
for (int i = 0; i < m_formButtons.size(); i++) {
bool checked = m_newButtonStates.at(i);
if (checked) {
m_formButtons.at(i)->setState(checked);
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
if (m_pageNumbers.at(i) != m_pageNumber) {
extraPages << m_pageNumbers.at(i);
}
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
Viewport transition refinements for Find and Undo/Redo actions REVIEW: 114060 This patch introduces viewport transitions for undo/redo actions on annotations and forms. When an annotation/form action is undone/redone but the associated annotation/form is not currently visible, the viewport is updated to center on the undo/redo action. If the annotation/form is visible, the viewport is not updated. The viewport transitions for the Find action have also been updated to this same algorithm. Previously the viewport was moved to center on each matching search term even if the search term was already visible in the viewport. This lead to unnecessary viewport transitions if the search term matched several items in a single paragraph for example. These proposed changes to the viewport transition behavior are consistent with the find and undo behavior of many existing applications including Kate, Open Office, and Foxit PDF Reader.
2013-12-29 22:27:30 +00:00
Okular::NormalizedRect boundingRect = buildBoundingRectangleForButtons(m_formButtons);
moveViewportIfBoundingRectNotFullyVisible(boundingRect, m_docPriv, m_pageNumber);
emit -> Q_EMIT A future ECM is going to force that on us, so do it early
2022-03-18 21:35:45 +00:00
Q_EMIT m_docPriv->m_parent->formButtonsChangedByUndoRedo(m_pageNumber, m_formButtons);
Don't save form contents to docdata/ But existing saved form from previous Okular versions are preserved
2014-05-11 13:06:27 +00:00
m_docPriv->notifyFormChanges(m_pageNumber);
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
for (auto page : std::as_const(extraPages)) {
m_docPriv->notifyFormChanges(page);
}
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
bool EditFormButtonsCommand::refreshInternalPageReferences(const QVector<Okular::Page *> &newPagesVector)
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
{
const QList<FormFieldButton *> oldFormButtons = m_formButtons;
m_formButtons.clear();
Button groups can span multiple pages The code needs to be aware of that. BUG: 479942
2024-01-25 22:14:54 +00:00
for (int i = 0; i < oldFormButtons.size(); i++) {
FormFieldButton *button = dynamic_cast<FormFieldButton *>(Okular::PagePrivate::findEquivalentForm(newPagesVector[m_pageNumbers[i]], oldFormButtons[i]));
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
if (!button) {
return false;
Enable readability-braces-around-statements
2022-03-08 10:10:43 +00:00
}
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
m_formButtons << button;
}
Account for Okular::PagePrivate::findEquivalentForm failing It should never fail but it's better if we have the backup for not crashing at least if it does
2017-11-14 08:57:38 +00:00
return true;
Implement swapBackingFile for the PDF backend How does it work: * What it does is really closing and opening the file again through poppler * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated * For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break * Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents * For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that * The annotationmodel needs updating it's pointers * The widgets for the forms are reused and their form* updated * the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable) TODO: Make this work for .okular files TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user TODO: autotests
2017-10-26 07:47:18 +00:00
}
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
void EditFormButtonsCommand::clearFormButtonStates()
{
s/qAsConst/std::as_const/ We now definitely has std::as_const available and Qt has started nagging about converting to std::as_const. Implementation is the same for both functions, and qAsConst was a stop-gap measure until std::as_const was sufficiently available.
2023-12-19 08:58:22 +00:00
for (FormFieldButton *formButton : std::as_const(m_formButtons)) {
Undo support for PDF forms Together with the already commited support for undo in annotations fixes 177501 BUGS: 177501 REVIEW: 110589 FIXED-IN: 4.11.0
2013-06-03 20:46:41 +00:00
formButton->setState(false);
}
}
More the commands to a different file
2013-04-05 22:39:35 +00:00
}
Reference in a new issue Copy permalink