diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20b5837bc..86d2aee14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,472 +1,471 @@
cmake_minimum_required(VERSION 3.0)
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "18")
set (KDE_APPLICATIONS_VERSION_MINOR "07")
set (KDE_APPLICATIONS_VERSION_MICRO "70")
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
project(okular VERSION 1.4.${KDE_APPLICATIONS_VERSION_MICRO})
set(QT_REQUIRED_VERSION "5.8.0")
set(KF5_REQUIRED_VERSION "5.33.0")
find_package(ECM 5.33.0 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(ECMInstallIcons)
include(ECMSetupVersion)
include(ECMOptionalAddSubdirectory)
include(GenerateExportHeader)
include(FeatureSummary)
include(ECMAddAppIcon)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(ECMAddTests)
include(ECMAddAppIcon)
include(CMakePackageConfigHelpers)
ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX OKULAR
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick)
find_package(Qt5 ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS TextToSpeech)
if (NOT Qt5TextToSpeech_FOUND)
message(STATUS "Qt5TextToSpeech not found, speech features will be disabled")
else()
add_definitions(-DHAVE_SPEECH)
endif()
if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
# CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
# 3.10+ lets us provide more macro names that require automoc.
list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "OKULAR_EXPORT_PLUGIN")
endif()
set(optionalComponents)
if (ANDROID)
# we want to make sure that generally all components are found
set(optionalComponents "OPTIONAL_COMPONENTS")
endif()
find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
Archive
Bookmarks
Completion
Config
ConfigWidgets
CoreAddons
Crash
IconThemes
KIO
Parts
ThreadWeaver
WindowSystem
${optionalComponents}
DocTools
JS
Wallet
)
if(KF5Wallet_FOUND)
add_definitions(-DWITH_KWALLET=1)
endif()
if(KF5JS_FOUND)
add_definitions(-DWITH_KJS=1)
endif()
if(NOT WIN32 AND NOT ANDROID)
find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
Activities
)
set_package_properties("KF5Activities" PROPERTIES
DESCRIPTION "Activities interface library"
URL "https://api.kde.org/frameworks/kactivities/html/"
TYPE RECOMMENDED
PURPOSE "Required for Activities integration.")
endif()
find_package(KF5Kirigami2)
set_package_properties(KF5Kirigami2 PROPERTIES
DESCRIPTION "A QtQuick based components set"
PURPOSE "Required at runtime by the mobile app"
TYPE RUNTIME
)
find_package(Phonon4Qt5 CONFIG REQUIRED)
find_package(KDEExperimentalPurpose)
set_package_properties(KDEExperimentalPurpose PROPERTIES
DESCRIPTION "A framework for services and actions integration"
PURPOSE "Required for enabling the share menu in Okular"
TYPE OPTIONAL
)
if (KDEExperimentalPurpose_FOUND)
set(PURPOSE_FOUND 1)
else()
set(PURPOSE_FOUND 0)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
find_package(ZLIB REQUIRED)
# This is here instead of in generators since we use if(Poppler_Qt5_FOUND) in autotests/
find_package(Poppler "0.12.1" COMPONENTS Qt5)
set_package_properties("Poppler" PROPERTIES
TYPE RECOMMENDED
PURPOSE "Support for PDF files in okular.")
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core)
option(BUILD_OKULARKIRIGAMI "Builds the touch-friendly frontend" ON)
if (BUILD_OKULARKIRIGAMI)
add_subdirectory( mobile )
endif()
option(BUILD_COVERAGE "Build the project with gcov support" OFF)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
endif()
endif()
if(BUILD_COVERAGE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
endif()
add_subdirectory( ui )
add_subdirectory( shell )
add_subdirectory( generators )
add_subdirectory( autotests )
add_subdirectory( conf/autotests )
if(KF5DocTools_FOUND)
add_subdirectory(doc)
endif()
include(OkularConfigureChecks.cmake)
if(NOT WIN32)
set(MATH_LIB m)
else(NOT WIN32)
set(MATH_LIB)
endif(NOT WIN32)
# okularcore
set(okularcore_SRCS
core/action.cpp
core/annotations.cpp
core/area.cpp
core/audioplayer.cpp
core/bookmarkmanager.cpp
core/chooseenginedialog.cpp
core/document.cpp
core/documentcommands.cpp
core/fontinfo.cpp
core/form.cpp
core/generator.cpp
core/generator_p.cpp
core/misc.cpp
core/movie.cpp
core/observer.cpp
core/debug.cpp
core/page.cpp
core/pagecontroller.cpp
core/pagesize.cpp
core/pagetransition.cpp
core/rotationjob.cpp
core/scripter.cpp
core/sound.cpp
core/sourcereference.cpp
core/textdocumentgenerator.cpp
core/textdocumentsettings.cpp
core/textpage.cpp
core/tilesmanager.cpp
core/utils.cpp
core/view.cpp
core/fileprinter.cpp
core/signatureutils.cpp
core/script/event.cpp
core/synctex/synctex_parser.c
core/synctex/synctex_parser_utils.c
)
qt5_add_resources(okularcore_SRCS
core/script/builtin.qrc
)
ki18n_wrap_ui(okularcore_SRCS
conf/textdocumentsettings.ui
)
install( FILES
core/action.h
core/annotations.h
core/area.h
core/document.h
core/fontinfo.h
core/form.h
core/generator.h
core/global.h
core/page.h
core/pagesize.h
core/pagetransition.h
core/signatureutils.h
core/sound.h
core/sourcereference.h
core/textdocumentgenerator.h
core/textdocumentsettings.h
core/textpage.h
core/tile.h
core/utils.h
core/fileprinter.h
core/observer.h
${CMAKE_CURRENT_BINARY_DIR}/core/version.h
${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h
${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel)
install( FILES
interfaces/configinterface.h
interfaces/guiinterface.h
interfaces/printinterface.h
interfaces/saveinterface.h
interfaces/viewerinterface.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/interfaces COMPONENT Devel)
ki18n_wrap_ui(okularcore_SRCS
core/chooseenginewidget.ui
)
kconfig_add_kcfg_files(okularcore_SRCS conf/settings_core.kcfgc)
add_library(okularcore SHARED ${okularcore_SRCS})
generate_export_header(okularcore BASE_NAME okularcore EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h")
if (ANDROID)
set(fileName ${CMAKE_BINARY_DIR}/Okular5Core-android-dependencies.xml)
file(WRITE "${fileName}" "\n"
"\n"
"\n")
install(FILES ${fileName} DESTINATION ${KDE_INSTALL_LIBDIR})
endif()
# Special handling for linking okularcore on OSX/Apple
IF(APPLE)
SET(OKULAR_IOKIT "-framework IOKit" CACHE STRING "Apple IOKit framework")
ENDIF(APPLE)
# Extra library needed by imported synctex code on Windows
if(WIN32)
set(SHLWAPI shlwapi)
endif(WIN32)
target_link_libraries(okularcore
PRIVATE
${OKULAR_IOKIT}
${SHLWAPI}
KF5::Archive
KF5::KIOCore
KF5::KIOWidgets
KF5::I18n
KF5::ThreadWeaver
KF5::Bookmarks
Phonon::phonon4qt5
${MATH_LIB}
${ZLIB_LIBRARIES}
PUBLIC # these are included from the installed headers
KF5::CoreAddons
KF5::XmlGui
KF5::ConfigGui
Qt5::PrintSupport
Qt5::Widgets
)
if (KF5Wallet_FOUND)
target_link_libraries(okularcore PRIVATE KF5::Wallet)
endif()
if (KF5JS_FOUND)
target_sources(okularcore PRIVATE
core/script/executor_kjs.cpp
core/script/kjs_app.cpp
core/script/kjs_console.cpp
core/script/kjs_data.cpp
core/script/kjs_document.cpp
core/script/kjs_field.cpp
core/script/kjs_fullscreen.cpp
core/script/kjs_field.cpp
core/script/kjs_spell.cpp
core/script/kjs_util.cpp
core/script/kjs_event.cpp
)
target_link_libraries(okularcore PRIVATE KF5::JS KF5::JSApi)
endif()
set_target_properties(okularcore PROPERTIES VERSION 9.0.0 SOVERSION 9 OUTPUT_NAME Okular5Core EXPORT_NAME Core)
install(TARGETS okularcore EXPORT Okular5Targets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES conf/okular.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES core/okularGenerator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
# okularpart
set(okularpart_conf_SRCS
conf/preferencesdialog.cpp
conf/dlgaccessibility.cpp
conf/dlgdebug.cpp
conf/dlgeditor.cpp
conf/dlggeneral.cpp
conf/dlgannotations.cpp
conf/dlgperformance.cpp
conf/dlgpresentation.cpp
conf/editannottooldialog.cpp
conf/editdrawingtooldialog.cpp
conf/widgetannottools.cpp
conf/widgetconfigurationtoolsbase.cpp
conf/widgetdrawingtools.cpp
)
set(okularpart_SRCS
${okularpart_conf_SRCS}
part.cpp
extensions.cpp
ui/embeddedfilesdialog.cpp
ui/annotwindow.cpp
ui/annotationmodel.cpp
ui/annotationpopup.cpp
ui/annotationpropertiesdialog.cpp
ui/annotationproxymodels.cpp
ui/annotationtools.cpp
ui/annotationwidgets.cpp
ui/bookmarklist.cpp
ui/debug_ui.cpp
ui/drawingtoolactions.cpp
ui/fileprinterpreview.cpp
ui/findbar.cpp
ui/formwidgets.cpp
ui/guiutils.cpp
ui/ktreeviewsearchline.cpp
ui/latexrenderer.cpp
ui/minibar.cpp
ui/okmenutitle.cpp
ui/pageitemdelegate.cpp
ui/pagepainter.cpp
ui/pagesizelabel.cpp
ui/pageviewannotator.cpp
ui/pageviewmouseannotation.cpp
ui/pageview.cpp
ui/magnifierview.cpp
ui/pageviewutils.cpp
ui/presentationsearchbar.cpp
ui/presentationwidget.cpp
ui/propertiesdialog.cpp
ui/searchlineedit.cpp
ui/searchwidget.cpp
ui/sidebar.cpp
ui/side_reviews.cpp
ui/snapshottaker.cpp
ui/thumbnaillist.cpp
ui/toc.cpp
ui/tocmodel.cpp
ui/toolaction.cpp
ui/videowidget.cpp
ui/layers.cpp
- ui/signaturemodel.cpp
ui/signaturewidgets.cpp
)
if (Qt5TextToSpeech_FOUND)
set(okularpart_SRCS ${okularpart_SRCS}
ui/tts.cpp)
endif()
ki18n_wrap_ui(okularpart_SRCS
conf/dlgaccessibilitybase.ui
conf/dlgeditorbase.ui
conf/dlggeneralbase.ui
conf/dlgannotationsbase.ui
conf/dlgperformancebase.ui
conf/dlgpresentationbase.ui
)
kconfig_add_kcfg_files(okularpart_SRCS conf/settings.kcfgc)
add_library(okularpart SHARED ${okularpart_SRCS})
generate_export_header(okularpart BASE_NAME okularpart)
target_link_libraries(okularpart okularcore
${MATH_LIB}
Qt5::Svg
Phonon::phonon4qt5
KF5::Archive
KF5::Bookmarks
KF5::I18n
KF5::IconThemes
KF5::ItemViews
KF5::KIOCore
KF5::KIOFileWidgets
KF5::KIOWidgets
KF5::Parts
KF5::Solid
KF5::WindowSystem
)
if(KF5Wallet_FOUND)
target_link_libraries(okularpart KF5::Wallet)
endif()
if (KDEExperimentalPurpose_FOUND)
target_link_libraries(okularpart KDEExperimental::PurposeWidgets)
endif()
set_target_properties(okularpart PROPERTIES PREFIX "")
if (Qt5TextToSpeech_FOUND)
target_link_libraries(okularpart Qt5::TextToSpeech)
endif()
install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
install(FILES okular.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update)
install( FILES okular_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES part.rc part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
install( FILES okular.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
########### cmake files #################
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular5")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/Okular5Config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
PATH_VARS INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(EXPORT Okular5Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okular5Targets.cmake NAMESPACE Okular::)
########### summary #################
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/ui/signaturemodel.cpp b/ui/signaturemodel.cpp
deleted file mode 100644
index 36e4b23e9..000000000
--- a/ui/signaturemodel.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2018 by Chinmoy Ranjan Pradhan
-#include
-#include
-#include
-
-#include "core/annotations.h"
-#include "core/document.h"
-#include "core/observer.h"
-#include "core/page.h"
-#include "core/form.h"
-#include "core/signatureutils.h"
-#include "guiutils.h"
-
-static QVector getSignatureFormFields( Okular::Page* page )
-{
- QVector signatureFormFields;
- foreach ( Okular::FormField *f, page->formFields() )
- {
- if ( f->type() == Okular::FormField::FormSignature )
- {
- signatureFormFields.append( static_cast( f ) );
- }
- }
- return signatureFormFields;
-}
-
-struct SignatureItem
-{
- enum ItemData
- {
- RevisionInfo,
- SignatureValidity,
- SigningTime,
- Reason,
- FieldInfo,
- Other
- };
-
- SignatureItem();
- SignatureItem( SignatureItem *parent, Okular::FormFieldSignature *form, ItemData data, int page , int _pos );
- //SignatureItem( SignatureItem *parent, int page, int pos );
- ~SignatureItem();
-
- SignatureItem *parent;
- QVector children;
- Okular::FormFieldSignature *signatureForm;
- QString displayString;
- ItemData itemData;
- int page;
- int pos;
-};
-
-SignatureItem::SignatureItem()
- : parent( nullptr ), signatureForm( nullptr ), itemData( Other ), page( -1 ), pos( -1 )
-{
-}
-
-SignatureItem::SignatureItem(SignatureItem *_parent, Okular::FormFieldSignature *form, ItemData data , int _page, int _pos )
- : parent( _parent ), signatureForm( form ), itemData( data ), page( _page ), pos( _pos )
-{
- Q_ASSERT( parent );
- parent->children.append( this );
-
- Okular::SignatureInfo *info = form->validate();
- switch ( itemData )
- {
- case RevisionInfo:
- displayString = i18n("Rev. %1: Signed By %2", pos, info->subjectName() );
- break;
- case SignatureValidity:
- displayString = GuiUtils::getReadableSigState( info->signatureStatus() );
- break;
- case SigningTime:
- displayString = i18n("Signing Time: %1", info->signingTime().toString( QStringLiteral("MMM dd yyyy hh:mm:ss") ) );
- break;
- case Reason: {
- const QString reason = info->reason();
- displayString = i18n("Reason: %1", !reason.isEmpty() ? reason : i18n("Not Available") );
- break;
- }
- case FieldInfo:
- displayString = i18n("Field: %1 on page %2", form->name(), page+1 );
- break;
- case Other: break;
- }
-}
-
-/*SignatureItem::SignatureItem( SignatureItem *_parent, int _page, int _pos )
- : parent( _parent ), signatureForm( nullptr ), page( _page ), pos( _pos )
-{
- Q_ASSERT( !parent->parent );
- parent->children.append( this );
- displayString = "pradhan";
-}*/
-
-SignatureItem::~SignatureItem()
-{
- qDeleteAll( children );
-}
-
-class SignatureModelPrivate : public Okular::DocumentObserver
-{
-public:
- SignatureModelPrivate( SignatureModel *qq );
- ~SignatureModelPrivate() override;
-
- void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags ) override;
-
- QModelIndex indexForItem( SignatureItem *item ) const;
- void rebuildTree( const QVector< Okular::Page * > &pages );
- SignatureItem* findItem( int page, int *index ) const;
-
- SignatureModel *q;
- SignatureItem *root;
- QPointer document;
-};
-
-SignatureModelPrivate::SignatureModelPrivate( SignatureModel *qq )
- : q( qq ), root( new SignatureItem )
-{
-}
-
-SignatureModelPrivate::~SignatureModelPrivate()
-{
- delete root;
-}
-
-static void updateFormFieldSignaturePointer( SignatureItem *item, const QVector &pages )
-{
- if ( item->signatureForm )
- {
- foreach ( Okular::FormField *f, pages[item->page]->formFields() )
- {
- if ( item->signatureForm->id() == f->id() )
- {
- item->signatureForm = static_cast( f );
- break;
- }
- }
- if ( !item->signatureForm )
- qWarning() << "Lost signature form field, something went wrong";
- }
-
- foreach ( SignatureItem *child, item->children )
- updateFormFieldSignaturePointer( child, pages );
-}
-
-void SignatureModelPrivate::notifySetup( const QVector &pages, int setupFlags )
-{
- if ( !( setupFlags & Okular::DocumentObserver::DocumentChanged ) )
- {
- if ( setupFlags & Okular::DocumentObserver::UrlChanged )
- {
- updateFormFieldSignaturePointer( root, pages );
- }
- return;
- }
-
- q->beginResetModel();
- qDeleteAll( root->children );
- root->children.clear();
- rebuildTree( pages );
- q->endResetModel();
-}
-
-QModelIndex SignatureModelPrivate::indexForItem( SignatureItem *item ) const
-{
- if ( item->parent )
- {
- int index = item->parent->children.indexOf( item );
- if ( index >= 0 && index < item->parent->children.count() )
- return q->createIndex( index, 0, item );
- }
- return QModelIndex();
-}
-
-void SignatureModelPrivate::rebuildTree( const QVector< Okular::Page*> &pages )
-{
- if ( pages.isEmpty() )
- return;
-
- emit q->layoutAboutToBeChanged();
- for ( int i = 0; i < pages.count(); i++ )
- {
- QVector signatureFormFields = getSignatureFormFields( pages.at( i ) );
- if ( signatureFormFields.isEmpty() )
- continue;
-
- int pos = 1;
- foreach ( auto sf, signatureFormFields )
- {
- SignatureItem *sigItem = new SignatureItem( root, sf, SignatureItem::RevisionInfo, i, pos );
- new SignatureItem( sigItem, sf, SignatureItem::SignatureValidity, i, pos );
- new SignatureItem( sigItem, sf, SignatureItem::SigningTime, i, pos );
- new SignatureItem( sigItem, sf, SignatureItem::Reason, i, pos );
- new SignatureItem( sigItem, sf, SignatureItem::FieldInfo, i, pos );
- pos++;
- }
- }
- emit q->layoutChanged();
-}
-
-SignatureItem *SignatureModelPrivate::findItem( int page, int *index ) const
-{
- for ( int i = 0; i < root->children.count(); i++ )
- {
- SignatureItem *tmp = root->children.at( i );
- if ( tmp->page == page )
- {
- if ( index )
- *index = i;
- return tmp;
- }
- }
- if ( index )
- *index = -1;
- return nullptr;
-}
-
-
-SignatureModel::SignatureModel( Okular::Document *doc, QObject *parent )
- : QAbstractItemModel( parent ), d_ptr( new SignatureModelPrivate( this ) )
-{
- Q_D( SignatureModel );
- d->document = doc;
- d->document->addObserver( d );
-}
-
-SignatureModel::~SignatureModel()
-{
- Q_D( SignatureModel );
- if ( d->document )
- d->document->removeObserver( d );
-}
-
-int SignatureModel::columnCount( const QModelIndex & ) const
-{
- return 1;
-}
-
-QVariant SignatureModel::data( const QModelIndex &index, int role ) const
-{
- if ( !index.isValid() )
- return QVariant();
-
- SignatureItem *item = static_cast( index.internalPointer() );
- if ( item->signatureForm )
- {
- switch ( role )
- {
- case Qt::DisplayRole:
- case Qt::ToolTipRole:
- return item->displayString;
- case Qt::DecorationRole:
- if ( item->itemData == SignatureItem::RevisionInfo )
- return QIcon::fromTheme( QStringLiteral("application-pkcs7-signature") );
- break;
- }
- }
-
- return QVariant();
-}
-
-bool SignatureModel::hasChildren( const QModelIndex &parent ) const
-{
- if ( !parent.isValid() )
- return true;
-
- SignatureItem *item = static_cast( parent.internalPointer() );
- return !item->children.isEmpty();
-}
-
-QVariant SignatureModel::headerData( int section, Qt::Orientation orientation, int role ) const
-{
- if ( orientation != Qt::Horizontal )
- return QVariant();
-
- if ( section == 0 && role == Qt::DisplayRole )
- return QString::fromLocal8Bit("Signatures");
-
- return QVariant();
-}
-
-QModelIndex SignatureModel::index( int row, int column, const QModelIndex &parent ) const
-{
- Q_D( const SignatureModel );
-
- if ( row < 0 || column != 0 )
- return QModelIndex();
-
- SignatureItem *item = parent.isValid() ? static_cast( parent.internalPointer() ) : d->root;
- if ( row < item->children.count() )
- return createIndex( row, column, item->children.at( row ) );
-
- return QModelIndex();
-}
-
-QModelIndex SignatureModel::parent( const QModelIndex &index ) const
-{
- Q_D( const SignatureModel );
-
- if ( !index.isValid() )
- return QModelIndex();
-
- SignatureItem *item = static_cast( index.internalPointer() );
- return d->indexForItem( item->parent );
-}
-
-int SignatureModel::rowCount( const QModelIndex &parent ) const
-{
- Q_D( const SignatureModel );
-
- SignatureItem *item = parent.isValid() ? static_cast( parent.internalPointer() ) : d->root;
- return item->children.count();
-}
-
-#include "moc_signaturemodel.cpp"
diff --git a/ui/signaturemodel.h b/ui/signaturemodel.h
deleted file mode 100644
index f60ba0c60..000000000
--- a/ui/signaturemodel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2018 by Chinmoy Ranjan Pradhan
-
-namespace Okular {
-class Document;
-class FormFieldSignature;
-class SignatureInfo;
-}
-
-class SignatureModelPrivate;
-
-class SignatureModel : public QAbstractItemModel
-{
- Q_OBJECT
-
- public:
- enum {
- RevisionRole = Qt::UserRole + 1000
- };
-
- explicit SignatureModel( Okular::Document *doc, QObject *parent = nullptr );
- virtual ~SignatureModel();
-
- int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
- QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
- bool hasChildren( const QModelIndex &parent = QModelIndex() ) const override;
- QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
- QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
- QModelIndex parent( const QModelIndex &index ) const override;
- int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
-
- private:
- Q_DECLARE_PRIVATE( SignatureModel )
- QScopedPointer d_ptr;
-};
-
-
-
-#endif