cui/uiconfig/ui/tipofthedaydialog.ui | 38 ++++++++++++++++------------------- vcl/qt5/QtInstanceWidget.cxx | 3 +- 2 files changed, 20 insertions(+), 21 deletions(-)
New commits: commit e5570ce8e936ab07e5f5f676d7043d8f32bf7306 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 6 23:39:53 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 7 09:54:32 2024 +0100 tdf#130857 qt weld: Don't set negative min width/height While gtk_widget_set_size_request supports -1 for the width/height as a special value to unset the requested minimum width/height [1], Qt doesn't, and warns when this gets passed. Therefore, ensure not to use negative values. [1] https://docs.gtk.org/gtk3/method.Widget.set_size_request.html Change-Id: I4ad6a3fa149138bcfdfeede1f2dc1bdfc5425e2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176178 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx index 4f5a4e5f06d2..d556c1a4d7c8 100644 --- a/vcl/qt5/QtInstanceWidget.cxx +++ b/vcl/qt5/QtInstanceWidget.cxx @@ -187,7 +187,8 @@ void QtInstanceWidget::hide() void QtInstanceWidget::set_size_request(int nWidth, int nHeight) { SolarMutexGuard g; - GetQtInstance().RunInMainThread([&] { m_pWidget->setMinimumSize(nWidth, nHeight); }); + GetQtInstance().RunInMainThread( + [&] { m_pWidget->setMinimumSize(std::max(0, nWidth), std::max(0, nHeight)); }); } Size QtInstanceWidget::get_size_request() const commit 37c6c3bdcdeed22e99fd89dbd2cfa3d8fda75f09 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 6 23:09:27 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 7 09:54:25 2024 +0100 tdf#130857 tipofthedaydialog.ui: Move checkbox out of button box Move the checkbox in the "Help" > "Show Tip of the Day" dialog above the button box rather than having it inside of the button box. That is consistent with e.g. the "LibreOfficeDev Help not installed" dialog that gets shown when pressing F1 in a build not including the local help, and it makes this work with the native Qt version of the dialog (SAL_VCL_QT_USE_WELDED_WIDGETS=1) which doesn't support arbitrary widgets inside of the button box. Change-Id: I79541d986df31325b43a17dbec81466ec8bfdca4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176177 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui b/cui/uiconfig/ui/tipofthedaydialog.ui index bf5a18bf9055..40fe7c7d5fbe 100644 --- a/cui/uiconfig/ui/tipofthedaydialog.ui +++ b/cui/uiconfig/ui/tipofthedaydialog.ui @@ -19,24 +19,6 @@ <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="layout-style">end</property> - <child> - <object class="GtkCheckButton" id="cbShowTip"> - <property name="label" translatable="yes" context="TipOfTheDay|Checkbox">_Show tips on startup</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes" context="TipOfTheDay|Checkbox_Tooltip">Enable the dialog again at Tools - Options - %PRODUCTNAME - General, or Help - Show Tip of the Day</property> - <property name="use-underline">True</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - <property name="secondary">True</property> - </packing> - </child> <child> <object class="GtkButton" id="btnNext"> <property name="label" translatable="yes" context="TipOfTheDayDialog|Next_Button">_Next Tip</property> @@ -156,6 +138,23 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="cbShowTip"> + <property name="label" translatable="yes" context="TipOfTheDay|Checkbox">_Show tips on startup</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes" context="TipOfTheDay|Checkbox_Tooltip">Enable the dialog again at Tools - Options - %PRODUCTNAME - General, or Help - Show Tip of the Day</property> + <property name="use-underline">True</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> commit ce5f743b1f6333f15451bf1b9e8789bababcd303 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 6 23:03:07 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 7 09:54:18 2024 +0100 cui: Resave tipofthedaydialog.ui with glade 3.40 Change-Id: Icad97adfd0c4cb50a12ba8eda25d3802ed00dc55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176176 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui b/cui/uiconfig/ui/tipofthedaydialog.ui index dbb3e84945e6..bf5a18bf9055 100644 --- a/cui/uiconfig/ui/tipofthedaydialog.ui +++ b/cui/uiconfig/ui/tipofthedaydialog.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="GtkDialog" id="TipOfTheDayDialog"> @@ -7,7 +7,6 @@ <property name="border-width">6</property> <property name="title" translatable="yes" context="TipOfTheDayDialog|Name">Tip of the Day</property> <property name="resizable">False</property> - <property name="modal">False</property> <property name="window-position">center-on-parent</property> <property name="type-hint">dialog</property> <child internal-child="vbox">
