diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-12-15 14:31:12 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-12-15 17:36:47 +0100 |
| commit | 5397aa0a268c747c204517c6fc59fba9b45bf388 (patch) | |
| tree | 901cf01ee9cb38c5d46197a14875527c5dda2fd9 /cui | |
| parent | dec2ee4f9d1e01757c76362f2f94600fe6c25066 (diff) | |
Fix placement for --enable-online-update-mar UI
* Resave with glade 3.40, which did all the
changes to the .ui file
* to be safe, explicitly hide the UI in the C++
code when building without `--enable-online-update-mar`
(UI wasn't shown in a quick test with qt6 even
without that, but better be safe)
Addresses this issue mentioned in [1]:
> - Online Update". (For non-GTK VCL backends, there's still a bug that
> the "Automatic Update" section on that options page is mixed into the
> traditional --enable-online-update options at the top of the page,
> instead of down at the bottom; fixing of
> cui/uiconfig/ui/optonlineupdatepage.ui welcome...)
[1] https://lists.freedesktop.org/archives/libreoffice/2023-December/091309.html
Change-Id: I2fadbb3b93206834b8c2c17cb540fb0b0687742b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160830
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 42637c62c314aaed7587fb1ece2841f644bb7149)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160851
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optupdt.cxx | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optonlineupdatepage.ui | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 8ce74bb1fa52..e8f4ee21c214 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -124,6 +124,8 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(weld::Container* pPage, weld::Dia #if HAVE_FEATURE_UPDATE_MAR m_xMar->show(); m_xEnableMar->set_sensitive(!officecfg::Office::Update::Update::Enabled::isReadOnly()); +#else + m_xMar->hide(); #endif } diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui index 74a76e8a7510..e49181627560 100644 --- a/cui/uiconfig/ui/optonlineupdatepage.ui +++ b/cui/uiconfig/ui/optonlineupdatepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkFrame" id="OptOnlineUpdatePage"> @@ -520,7 +520,6 @@ </child> <child> <object class="GtkFrame" id="frameMar"> - <property name="visible">False</property> <property name="can-focus">False</property> <property name="label-xalign">0</property> <property name="shadow-type">none</property> @@ -551,6 +550,11 @@ </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> |