diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2023-05-15 13:46:58 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2023-05-16 09:20:49 +0200 |
| commit | 90a8073fa5a6a724de498130476895dfaf4429b5 (patch) | |
| tree | 19dff02d282788a8e0c5b818c7fe775fff1478cf | |
| parent | 64f4bc610ed3ba18f282f1a2b43bf59c87c1df68 (diff) | |
Related tdf#155070 - Tooltips moved from container to controls
* Save log button disabled if Skia is off to prevent error message
Change-Id: Iccd757fb15b347cf9d048115d4b048543814bd99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151764
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 1 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 369e48ae265a..249d7b0318b6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -667,6 +667,7 @@ void OfaViewTabPage::UpdateSkiaStatus() // FIXME: should really add code to show a 'lock' icon here. m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly()); m_xForceSkiaRaster->set_sensitive(m_xUseSkia->get_active() && !officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly()); + m_xSkiaLog->set_sensitive(bEnabled); // Technically the 'use hardware acceleration' option could be used to mean !forceSkiaRaster, but the implementation // of the option is so tied to the implementation of the canvas module that it's simpler to ignore it. diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index d24f7ef7285a..5a9a7579e85b 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -416,7 +416,6 @@ <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes" context="optviewpage|grid3|tooltip_text">Requires restart</property> <property name="margin-start">12</property> <property name="margin-top">6</property> <property name="row-spacing">3</property> @@ -426,6 +425,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes" context="optviewpage|useaccel|tooltip_text">Requires restart</property> <property name="halign">start</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> @@ -446,6 +446,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes" context="optviewpage|useaa|tooltip_text">Requires restart</property> <property name="halign">start</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> @@ -466,6 +467,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes" context="optviewpage|useskia|tooltip_text">Requires restart</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> </object> |