sw/uiconfig/swriter/ui/columnwidth.ui | 99 ++++++++++++++++------------------
vcl/qt5/QtInstanceBuilder.cxx | 2
2 files changed, 50 insertions(+), 51 deletions(-)
New commits:
commit 8b8ed9056511a5259da3097dfbb12f4d86741bba
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Feb 17 22:21:17 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 09:00:19 2025 +0100
tdf#130857 qt weld: Support Writer "Column Width" 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:
* start Writer
* insert table via "Table" -> "Insert
* move cursor into a table cell
* "Table" -> "Size" -> "Column Width"
Change-Id: Ia9719668fbd332f5fd61b440008ec6d30afbb332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181810
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index bee4722dc073..7562ce97a310 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -89,6 +89,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/smath/ui/savedefaultsdialog.ui"_ustr,
u"modules/smath/ui/smathsettings.ui"_ustr,
u"modules/swriter/ui/authenticationsettingsdialog.ui"_ustr,
+ u"modules/swriter/ui/columnwidth.ui"_ustr,
u"modules/swriter/ui/endnotepage.ui"_ustr,
u"modules/swriter/ui/footendnotedialog.ui"_ustr,
u"modules/swriter/ui/footnotepage.ui"_ustr,
commit b2c5d3720e37c6b9a2b9402424ad64bf1c344f99
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Feb 17 22:17:24 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 09:00:13 2025 +0100
sw: Resave columnwidth.ui with glade 3.40
To trigger the dialog:
* start Writer
* insert table via "Table" -> "Insert
* move cursor into a table cell
* "Table" -> "Size" -> "Column Width"
Change-Id: Idfda6b2878806cbde9fb0d700942aaef4d7e0fe5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181809
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui
b/sw/uiconfig/swriter/ui/columnwidth.ui
index 65f12a0bb2b3..fe3551ade076 100644
--- a/sw/uiconfig/swriter/ui/columnwidth.ui
+++ b/sw/uiconfig/swriter/ui/columnwidth.ui
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">99</property>
<property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkDialog" id="ColumnWidthDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="columnwidth|ColumnWidthDialog">Column Width</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default_width">0</property>
- <property name="default_height">0</property>
- <property name="type_hint">dialog</property>
+ <property name="default-width">0</property>
+ <property name="default-height">0</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -47,8 +47,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -61,8 +61,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -76,60 +76,60 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="columnwidth|label2">Column:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">column</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">column</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="columnwidth|label3">Width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">width</property>
<property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="column">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment1</property>
<child internal-child="accessible">
<object class="AtkObject" id="column-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="columnwidth|extended_tip|column">Enter the column
number of the column you want to change the width of.</property>
@@ -137,17 +137,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="width">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="digits">2</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
+ <property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="columnwidth|extended_tip|width">Enter the width
that you want for the selected column(s).</property>
@@ -155,8 +155,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
@@ -164,7 +164,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="columnwidth|label1">Width</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -185,9 +185,6 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="ColumnWidthDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="columnwidth|extended_tip|ColumnWidthDialog">Changes the width of the
selected column(s).</property>
commit 774f9d735b9cce2ab984b1fe53243468d8a7d369
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Feb 17 22:13:54 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 09:00:06 2025 +0100
tdf#130857 qt weld: Support Writer "Insert Table" 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.
The dialog can be triggered in Writer using "Table" -> "Insert Table".
Change-Id: Idcc4d94b3fa39ceef2278bcb4d8ab6ab79d31892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181808
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index cd6e36fcbc85..bee4722dc073 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -94,6 +94,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/swriter/ui/footnotepage.ui"_ustr,
u"modules/swriter/ui/inforeadonlydialog.ui"_ustr,
u"modules/swriter/ui/insertbreak.ui"_ustr,
+ u"modules/swriter/ui/inserttable.ui"_ustr,
u"modules/swriter/ui/printoptionspage.ui"_ustr,
u"modules/swriter/ui/renameobjectdialog.ui"_ustr,
u"modules/swriter/ui/rowheight.ui"_ustr,
