[Libreoffice-commits] core.git: 2 commits - vcl/uiconfig vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jun 2 18:37:09 UTC 2021
vcl/uiconfig/ui/printdialog.ui | 144 ++++++++++++++++++++---------------------
vcl/unx/gtk3/gtkinst.cxx | 2
2 files changed, 75 insertions(+), 71 deletions(-)
New commits:
commit cf97d730d60eb3c26adc4e060050e4ba402417f6
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 2 16:25:56 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 2 20:36:33 2021 +0200
gtk4: adjust print dialog to position page navigation buttons as wanted
Change-Id: Ifbd69faa0e69831ad93a2393234e2d97bdd6f4e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116620
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 408fda4165ae..b173e22f0122 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -181,62 +181,85 @@
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkBox" id="box14">
+ <object class="GtkBox" id="box10">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="spacing">6</property>
+ <property name="halign">start</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkButton" id="btnLast">
+ <object class="GtkCheckButton" id="previewbox">
+ <property name="label" translatable="yes" context="printdialog|previewbox">Pre_view</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="tooltip-text" translatable="yes" context="printdialog|lastpage">Last page</property>
- <property name="image">imgLast</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="btnLast-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|btnLast">Shows preview of the last page.</property>
+ <object class="AtkObject" id="previewbox-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|previewbox">Turn on or off display of the print preview.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box14">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="forward">
+ <object class="GtkButton" id="btnFirst">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
- <property name="tooltip-text" translatable="yes" context="printdialog|forward">Next page</property>
- <property name="image">imgForward</property>
+ <property name="tooltip-text" translatable="yes" context="printdialog|firstpage">First page</property>
+ <property name="image">imgFirst</property>
<child internal-child="accessible">
- <object class="AtkObject" id="forward-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|forward">Shows preview of the next page.</property>
+ <object class="AtkObject" id="btnFirst-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|btnFirst">Shows preview of the first page.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack-type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="totalnumpages">
+ <object class="GtkButton" id="backward">
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes" context="printdialog|totalnumpages">/ %n</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes" context="printdialog|backward">Previous page</property>
+ <property name="image">imgBack</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="backward-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|backward">Shows preview of the previous page.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- <property name="position">2</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -254,98 +277,72 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- <property name="position">3</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="backward">
+ <object class="GtkLabel" id="totalnumpages">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="tooltip-text" translatable="yes" context="printdialog|backward">Previous page</property>
- <property name="image">imgBack</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="backward-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|backward">Shows preview of the previous page.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes" context="printdialog|totalnumpages">/ %n</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack-type">end</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="btnFirst">
+ <object class="GtkButton" id="forward">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
- <property name="tooltip-text" translatable="yes" context="printdialog|firstpage">First page</property>
- <property name="image">imgFirst</property>
+ <property name="tooltip-text" translatable="yes" context="printdialog|forward">Next page</property>
+ <property name="image">imgForward</property>
<child internal-child="accessible">
- <object class="AtkObject" id="btnFirst-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|btnFirst">Shows preview of the first page.</property>
+ <object class="AtkObject" id="forward-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|forward">Shows preview of the next page.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack-type">end</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box10">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
<child>
- <object class="GtkCheckButton" id="previewbox">
- <property name="label" translatable="yes" context="printdialog|previewbox">Pre_view</property>
+ <object class="GtkButton" id="btnLast">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="halign">center</property>
- <property name="use-underline">True</property>
- <property name="active">True</property>
- <property name="draw-indicator">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes" context="printdialog|lastpage">Last page</property>
+ <property name="image">imgLast</property>
<child internal-child="accessible">
- <object class="AtkObject" id="previewbox-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|previewbox">Turn on or off display of the print preview.</property>
+ <object class="AtkObject" id="btnLast-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|btnLast">Shows preview of the last page.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="pack-type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f2f4824e7128..20598dcc9abe 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22557,11 +22557,13 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
rUIFile != "modules/swriter/ui/inserttable.ui" &&
rUIFile != "modules/swriter/ui/linenumbering.ui" &&
rUIFile != "modules/swriter/ui/newuserindexdialog.ui" &&
+ rUIFile != "modules/swriter/ui/printeroptions.ui" &&
rUIFile != "modules/swriter/ui/printoptionspage.ui" &&
rUIFile != "modules/swriter/ui/renameobjectdialog.ui" &&
rUIFile != "modules/swriter/ui/statisticsinfopage.ui" &&
rUIFile != "modules/swriter/ui/titlepage.ui" &&
rUIFile != "modules/swriter/ui/wordcount.ui" &&
+ rUIFile != "vcl/ui/printdialog.ui" &&
rUIFile != "vcl/ui/printerdevicepage.ui" &&
rUIFile != "vcl/ui/printerpaperpage.ui" &&
rUIFile != "vcl/ui/printerpropertiesdialog.ui")
commit efdce9e2ac63503ed448565827f499c46a1b2082
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 2 16:02:50 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 2 20:34:17 2021 +0200
add explicit expands
Change-Id: Ic62c05487bd77831b1a15e8601c6ba5bb1c7e001
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116619
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 9ed06ded4dac..408fda4165ae 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -139,12 +139,15 @@
<property name="can-focus">False</property>
<property name="margin-end">6</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box13">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkDrawingArea" id="preview">
@@ -153,6 +156,8 @@
<property name="events">GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property>
<property name="tooltip-text" translatable="yes" context="printdialog|printpreview">Print preview</property>
<property name="margin-end">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="preview-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|preview">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</property>
More information about the Libreoffice-commits
mailing list