cui/uiconfig/ui/zoomdialog.ui | 165 ++++++++++++++++++++----------------------
vcl/qt5/QtInstanceBuilder.cxx | 5 +
2 files changed, 86 insertions(+), 84 deletions(-)
New commits:
commit 09233f452236f99e0999d939d616f0c5f53fc7b5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Feb 15 23:14:18 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Feb 16 11:13:46 2025 +0100
cui: Resave zoomdialog.ui with glade 3.40
Dialog can be triggered in Writer using
"View" -> "Zoom" -> "Zoom".
Change-Id: I8df1d7c6b04eac7d776ea6b16871fb70f1226903
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181733
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index 475344d9d31f..9f1ed72a45d0 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">999</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="GtkAdjustment" id="adjustment2">
<property name="upper">100</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="ZoomDialog">
- <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="zoomdialog|ZoomDialog">Zoom & View Layout</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>
@@ -51,8 +51,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>
@@ -65,8 +65,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>
@@ -80,38 +80,38 @@
<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="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<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>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="optimal">
<property name="label" translatable="yes"
context="zoomdialog|optimal">Optimal</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="optimal-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="zoomdialog|extended_tip|optimal">Resizes the
display to fit the width of the text in the document at the moment the command
is started.</property>
@@ -128,10 +128,10 @@
<object class="GtkRadioButton" id="fitwandh">
<property name="label" translatable="yes"
context="zoomdialog|fitwandh">Fit width and height</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">optimal</property>
<child internal-child="accessible">
<object class="AtkObject" id="fitwandh-atkobject">
@@ -149,10 +149,10 @@
<object class="GtkRadioButton" id="fitw">
<property name="label" translatable="yes"
context="zoomdialog|fitw">Fit width</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">optimal</property>
<child internal-child="accessible">
<object class="AtkObject" id="fitw-atkobject">
@@ -170,10 +170,10 @@
<object class="GtkRadioButton" id="100pc">
<property name="label" translatable="yes"
context="zoomdialog|100pc">100%</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">optimal</property>
<child internal-child="accessible">
<object class="AtkObject" id="100pc-atkobject">
@@ -190,16 +190,16 @@
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="variable">
<property name="label" translatable="yes"
context="zoomdialog|variable">Custom:</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">optimal</property>
<accessibility>
<relation type="label-for" target="zoomsb"/>
@@ -219,13 +219,13 @@
<child>
<object class="GtkSpinButton" id="zoomsb">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<accessibility>
<relation type="labelled-by" target="variable"/>
</accessibility>
- <property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="zoomsb-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="zoomdialog|zoomsb-atkobject">Custom</property>
@@ -251,7 +251,7 @@
<child type="label">
<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="zoomdialog|label2">Zoom Factor</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -268,26 +268,26 @@
<child>
<object class="GtkFrame" id="viewframe">
<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>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="automatic">
<property name="label" translatable="yes"
context="zoomdialog|automatic">Automatic</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="automatic-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="zoomdialog|extended_tip|automatic">The automatic
view layout displays pages side by side, as many as the zoom factor
allows.</property>
@@ -304,10 +304,10 @@
<object class="GtkRadioButton" id="singlepage">
<property name="label" translatable="yes"
context="zoomdialog|singlepage">Single page</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">automatic</property>
<child internal-child="accessible">
<object class="AtkObject" id="singlepage-atkobject">
@@ -324,16 +324,16 @@
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="columns">
<property name="label" translatable="yes"
context="zoomdialog|columns">Columns:</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">automatic</property>
<accessibility>
<relation type="label-for" target="columnssb"/>
@@ -354,13 +354,13 @@
<child>
<object class="GtkSpinButton" id="columnssb">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<accessibility>
<relation type="labelled-by" target="columns"/>
</accessibility>
- <property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="columnssb-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="zoomdialog|columnssb-atkobject">Columns</property>
@@ -385,11 +385,11 @@
<object class="GtkCheckButton" id="bookmode">
<property name="label" translatable="yes"
context="zoomdialog|bookmode">Book mode</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<accessibility>
<relation type="labelled-by" target="columns"/>
</accessibility>
@@ -410,7 +410,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="zoomdialog|label1">View Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -438,9 +438,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="ZoomDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="zoomdialog|extended_tip|ZoomDialog">Reduces or enlarges the screen
display.</property>
commit 645a8296712f88d768c4243e9013191d281e5c53
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Feb 15 22:46:15 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Feb 16 11:13:39 2025 +0100
tdf#130857 qt weld: Support "Printer Options" dialog
Declare support for the "Printer Options" dialog that
can be triggered as follows:
* "File" -> "Printer Settings"
* in the "Printer Setup" dialog that shows up, click the "Options"
button
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.
For some modules, there are extra controls whose .ui files
are added in this commit as well.
Change-Id: I5f8fcb5207b5db8cd4c71a6698c215ae09d97dbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181732
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 9d13e48777ab..ecbed2a0f2d6 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -79,18 +79,21 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
u"modules/scalc/ui/insertcells.ui"_ustr,
u"modules/scalc/ui/movecopysheet.ui"_ustr,
+ u"modules/scalc/ui/optdlg.ui"_ustr,
u"modules/scalc/ui/selectsource.ui"_ustr,
u"modules/scalc/ui/showsheetdialog.ui"_ustr,
u"modules/schart/ui/insertaxisdlg.ui"_ustr,
u"modules/smath/ui/alignmentdialog.ui"_ustr,
u"modules/smath/ui/fontsizedialog.ui"_ustr,
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/endnotepage.ui"_ustr,
u"modules/swriter/ui/footendnotedialog.ui"_ustr,
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/printoptionspage.ui"_ustr,
u"modules/swriter/ui/renameobjectdialog.ui"_ustr,
u"modules/swriter/ui/splittable.ui"_ustr,
u"modules/swriter/ui/wordcount.ui"_ustr,
@@ -98,6 +101,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"sfx/ui/inputdialog.ui"_ustr,
u"sfx/ui/licensedialog.ui"_ustr,
u"sfx/ui/password.ui"_ustr,
+ u"sfx/ui/printeroptionsdialog.ui"_ustr,
u"sfx/ui/querysavedialog.ui"_ustr,
u"sfx/ui/safemodequerydialog.ui"_ustr,
u"svt/ui/printersetupdialog.ui"_ustr,
commit d455d8118f2f08083fd237273ddb2087d7d98ad8
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Feb 15 21:01:50 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Feb 16 11:13:32 2025 +0100
tdf#130857 qt weld: Support Math "Save defaults?" dialog
Declare support for the dialog that can be triggered as follows:
* start Math
* "Format" -> "Font Size"
* click the "Default" button in the 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.
This dialog makes use of the GtkMessageDialog:buttons property
for which support was added in
Change-Id: I69c9e736b5080a4a824ffeb5f364492402e406c8
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Sat Feb 15 20:56:58 2025 +0100
tdf#130857 qt weld: Add standard message dialog buttons defined in
.ui
Change-Id: I8078bb88f45e9d7820a546c1866b79cb316ccaca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181727
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 007d6605de73..9d13e48777ab 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -84,6 +84,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/schart/ui/insertaxisdlg.ui"_ustr,
u"modules/smath/ui/alignmentdialog.ui"_ustr,
u"modules/smath/ui/fontsizedialog.ui"_ustr,
+ u"modules/smath/ui/savedefaultsdialog.ui"_ustr,
u"modules/swriter/ui/authenticationsettingsdialog.ui"_ustr,
u"modules/swriter/ui/endnotepage.ui"_ustr,
u"modules/swriter/ui/footendnotedialog.ui"_ustr,
