diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-01-24 17:41:54 +0530 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2017-01-27 16:13:04 +0000 |
| commit | 3616f875b014b7d58f81cd871ff7bbf9fd6c78d5 (patch) | |
| tree | 203ae40f033419688a93569cadd7b3cd19d8a02d /libreofficekit/source | |
| parent | 99a2a1f975da68c33ec213fab0f9cf75c31b49c8 (diff) | |
lokdocview: Separate gobject property for turning off comments
Pass --enable-tiled-annotations to gtktiledviewer on command line
to turn comments on again, by default they are turned off now.
Change-Id: I40e93ab683ec9538e088ae9aa83cda2eaaf9939e
Reviewed-on: https://gerrit.libreoffice.org/33622
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'libreofficekit/source')
| -rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 1cd2c05c2567..80d40f50f72c 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -299,6 +299,7 @@ enum PROP_CAN_ZOOM_OUT, PROP_DOC_PASSWORD, PROP_DOC_PASSWORD_TO_MODIFY, + PROP_TILED_ANNOTATIONS, PROP_LAST }; @@ -2465,6 +2466,7 @@ static void lok_doc_view_set_property (GObject* object, guint propId, const GVal LOKDocViewPrivate& priv = getPrivate(pDocView); gboolean bDocPasswordEnabled = priv->m_nLOKFeatures & LOK_FEATURE_DOCUMENT_PASSWORD; gboolean bDocPasswordToModifyEnabled = priv->m_nLOKFeatures & LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY; + gboolean bTiledAnnotationsEnabled = !(priv->m_nLOKFeatures & LOK_FEATURE_NO_TILED_ANNOTATIONS); switch (propId) { @@ -2510,6 +2512,13 @@ static void lok_doc_view_set_property (GObject* object, guint propId, const GVal priv->m_pOffice->pClass->setOptionalFeatures(priv->m_pOffice, priv->m_nLOKFeatures); } break; + case PROP_TILED_ANNOTATIONS: + if ( g_value_get_boolean (value) != bTiledAnnotationsEnabled) + { + priv->m_nLOKFeatures = priv->m_nLOKFeatures ^ LOK_FEATURE_NO_TILED_ANNOTATIONS; + priv->m_pOffice->pClass->setOptionalFeatures(priv->m_pOffice, priv->m_nLOKFeatures); + } + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propId, pspec); } @@ -2567,6 +2576,9 @@ static void lok_doc_view_get_property (GObject* object, guint propId, GValue *va case PROP_DOC_PASSWORD_TO_MODIFY: g_value_set_boolean (value, priv->m_nLOKFeatures & LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY); break; + case PROP_TILED_ANNOTATIONS: + g_value_set_boolean (value, !(priv->m_nLOKFeatures & LOK_FEATURE_NO_TILED_ANNOTATIONS)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propId, pspec); } @@ -2632,7 +2644,6 @@ static gboolean lok_doc_view_initable_init (GInitable *initable, GCancellable* / return FALSE; } priv->m_nLOKFeatures |= LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK; - priv->m_nLOKFeatures |= LOK_FEATURE_NO_TILED_ANNOTATIONS; priv->m_pOffice->pClass->setOptionalFeatures(priv->m_pOffice, priv->m_nLOKFeatures); return TRUE; @@ -2863,6 +2874,20 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass) static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * LOKDocView:tiled-annotations-rendering: + * + * Set it to false if client does not want LO to render comments in tiles and + * instead interested in using comments API to access comments + */ + properties[PROP_TILED_ANNOTATIONS] = + g_param_spec_boolean("tiled-annotations", + "Render comments in tiles", + "Whether the client wants in tile comment rendering", + TRUE, + static_cast<GParamFlags>(G_PARAM_READWRITE + | G_PARAM_STATIC_STRINGS)); + g_object_class_install_properties(pGObjectClass, PROP_LAST, properties); /** |