cui/uiconfig/ui/imagetabpage.ui | 358 ++++++++++++++++++++++------------------
1 file changed, 197 insertions(+), 161 deletions(-)
New commits:
commit b047ad78c9bbca07564b32d18eebdf476d29061f
Author: Parth Raiyani <parth.raiy...@collabora.com>
AuthorDate: Wed Jul 9 22:25:24 2025 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Jul 10 08:23:54 2025 +0200
Refactors ImageTabPage UI layout for improved structure and clarity
Reorganizes and simplifies the layout of image tab page UI elements by
adding `GtkFrame` container as parent of relevant GtkSpinButtons of size and
tiling options for better grouping.
Signed-off-by: Parth Raiyani <parth.raiy...@collabora.com>
Change-Id: Ib88cacba564d4a8958249305b2828ec60efdb0ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187592
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/cui/uiconfig/ui/imagetabpage.ui b/cui/uiconfig/ui/imagetabpage.ui
index f83ea9a5df74..16999a221477 100644
--- a/cui/uiconfig/ui/imagetabpage.ui
+++ b/cui/uiconfig/ui/imagetabpage.ui
@@ -165,109 +165,127 @@
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="label4">
+ <object class="GtkFrame" id="size-frame">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label4">Size:</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box6">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label5">
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label5">Width:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">width</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label4">Size:</property>
+ <property name="xalign">0</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkSpinButton" id="width">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box5">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkBox" id="size-content">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label6">Height:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">height</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="height">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label5">Width:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">width</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property
name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label6">Height:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">height</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="height">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property
name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="scaletsb">
+ <property name="label" translatable="yes"
context="imagetabpage|scaletsb">As percentage of the parent</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="scaletsb">
- <property name="label" translatable="yes"
context="imagetabpage|scaletsb">As percentage of the parent</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -334,94 +352,112 @@
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="label9">
+ <object class="GtkFrame" id="tiling-position-frame">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label9">Tiling Position:</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box9">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label10">
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child type="label">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label10">X-Offset:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">posoffx</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="posoffx">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="truncate-multiline">True</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label9">Tiling Position:</property>
+ <property name="xalign">0</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box7">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label11">
+ <object class="GtkBox" id="tiling-position-content">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="imagetabpage|label11">Y-Offset:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">posoffy</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="posoffy">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="truncate-multiline">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label10">X-Offset:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">posoffx</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="posoffx">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property
name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="imagetabpage|label11">Y-Offset:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">posoffy</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="posoffy">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property
name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
