diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2024-10-25 15:48:58 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-12-17 11:05:23 +0100 |
| commit | e82eb7f2aa998ebd841f3533884c2f6f642c73e4 (patch) | |
| tree | 8216473bb83c4b3b8590c2a3506aa7a50ca2f24b | |
| parent | f4df86eda7ef82a3ffaf7fdd76a4775d0f66e438 (diff) | |
jsdialog: enable style sidebar
- disable not supported previews field, action menu for now
Change-Id: Ife94ee96dd15bd92752ff6e9cc5e68243aac0851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175646
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/templatepanel.ui | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1a55cb24c7fa..b7647c215acb 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -34,6 +34,7 @@ #include <sal/log.hxx> #include <osl/diagnose.h> #include <comphelper/diagnose_ex.hxx> +#include <comphelper/lok.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> @@ -255,6 +256,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(SfxBindings* pB, weld { mxFilterLb->set_help_id(HID_TEMPLATE_FILTER); mxPreviewCheckbox->set_active(officecfg::Office::Common::StylesAndFormatting::Preview::get()); + if (comphelper::LibreOfficeKit::isActive()) + mxPreviewCheckbox->hide(); } void SfxTemplateDialog_Impl::EnableEdit(bool bEnable, StyleList* rStyleList) @@ -807,6 +810,10 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel m_xToolMenu->connect_activate(LINK(this, SfxTemplateDialog_Impl, ToolMenuSelectHdl)); m_xActionTbR->set_item_help_id("update", HID_TEMPLDLG_UPDATEBYEXAMPLE); + // Features not working in LOK yet + if (comphelper::LibreOfficeKit::isActive()) + m_xActionTbR->hide(); + Initialize(); } diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 29ddb809d167..9b8c6cc1229b 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -264,7 +264,7 @@ void ResourceManager::ReadDeckList() if (comphelper::LibreOfficeKit::isActive()) { // Hide these decks in LOK as they aren't fully functional. - if (aDeckName == "GalleryDeck" || aDeckName == "StyleListDeck") + if (aDeckName == "GalleryDeck") continue; } diff --git a/sfx2/uiconfig/ui/templatepanel.ui b/sfx2/uiconfig/ui/templatepanel.ui index db5fcfa1f47e..39c28653509e 100644 --- a/sfx2/uiconfig/ui/templatepanel.ui +++ b/sfx2/uiconfig/ui/templatepanel.ui @@ -302,7 +302,7 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="settings"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -336,9 +336,10 @@ </child> </object> <packing> + <property name="homogeneous">True</property> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -349,7 +350,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> </object> |