svx/uiconfig/ui/themecoloreditdialog.ui | 12 ------------ vcl/qt5/QtInstanceBuilder.cxx | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-)
New commits: commit b653f5d0dca7f008c16bf1fbc47725c6aedd05ac Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Fri Jul 25 23:12:46 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Jul 29 05:20:09 2025 +0200 tdf#130857 qt weld: Support "Theme Color Edit" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. To trigger the dialog from Writer: "Format" -> "Theme" -> "Add" Change-Id: I2305e3a189e46515b76d2d8e0a00fe5db27cc29a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188374 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 3658886c3939..00a4c89ac9f4 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -161,6 +161,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"svx/ui/deleteheaderdialog.ui"_ustr, u"svx/ui/gotopagedialog.ui"_ustr, u"svx/ui/safemodedialog.ui"_ustr, + u"svx/ui/themecoloreditdialog.ui"_ustr, u"uui/ui/password.ui"_ustr, u"vcl/ui/openlockedquerybox.ui"_ustr, u"vcl/ui/printerdevicepage.ui"_ustr, @@ -179,6 +180,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/rotationtabpage.ui"_ustr, u"cui/ui/slantcornertabpage.ui"_ustr, u"cui/ui/textattrtabpage.ui"_ustr, u"cui/ui/textanimtabpage.ui"_ustr, u"cui/ui/textcolumnstabpage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr, + u"svx/ui/colorwindow.ui"_ustr, }; if (aSupportedUIFiles.contains(rUIFile)) commit da93a927bcfd9ba95180ca9d3a3858b46da24393 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Fri Jul 25 22:59:42 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Jul 29 05:20:01 2025 +0200 svx: Drop deprecated GtkButton::xalign property in Theme Color Edit dlg This property was deprecated in GTK 3.14, see [1], so drop it. No relevant difference seen in a quick test of the dialog with the gtk3 and gen VCL plugins. To trigger the dialog from Writer: "Format" -> "Theme" -> "Add" [1] https://docs.gtk.org/gtk3/property.Button.xalign.html Change-Id: I6e256650c9d6d8b60540052719e854d1750631db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188373 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui b/svx/uiconfig/ui/themecoloreditdialog.ui index 9adfc8e00c50..cee3626d00f5 100644 --- a/svx/uiconfig/ui/themecoloreditdialog.ui +++ b/svx/uiconfig/ui/themecoloreditdialog.ui @@ -148,7 +148,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -168,7 +167,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -188,7 +186,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -276,7 +273,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -330,7 +326,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -350,7 +345,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -438,7 +432,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -458,7 +451,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -478,7 +470,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -498,7 +489,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -552,7 +542,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> @@ -572,7 +561,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="xalign">0</property> <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child>