[Libreoffice-commits] core.git: cui/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Feb 27 15:03:36 UTC 2019
cui/uiconfig/ui/borderpage.ui | 203 ++++++++++++++++++++++++++++--------------
1 file changed, 138 insertions(+), 65 deletions(-)
New commits:
commit c2448e2bcedf0167bd099124e89fe88cbce321fc
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 27 10:05:04 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 27 16:03:11 2019 +0100
Related: tdf#123711 make border page potentially narrower
use size groups to align things rather than forcing homogenous cols
Change-Id: I4a1496f15663c4dcbcd6aaf3ea7901c9c7b170d2
Reviewed-on: https://gerrit.libreoffice.org/68427
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index e7e05a5aa9fb..1a268d3bf22f 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -38,6 +38,7 @@
<object class="GtkGrid" id="BorderPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<property name="column_spacing">6</property>
@@ -47,7 +48,6 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
@@ -66,7 +66,6 @@
<object class="GtkGrid" id="grid9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="frameselwin">
@@ -325,6 +324,8 @@
<object class="GtkFrame" id="spacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -500,23 +501,63 @@
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid10">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
<child>
- <object class="GtkLabel" id="label22">
+ <object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="borderpage|label22">_Position:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">shadows</property>
- <property name="xalign">0</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="shadowswin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea" id="shadows">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="borderpage|label22">_Position:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">shadows</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -524,13 +565,45 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="distanceft">
+ <object class="GtkAlignment" id="align12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="borderpage|distanceft">Distan_ce:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">distancemf</property>
- <property name="xalign">0</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="distanceft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="borderpage|distanceft">Distan_ce:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">distancemf</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="distancemf">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="value">0.5</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -538,72 +611,54 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="shadowcolorft">
+ <object class="GtkAlignment" id="align1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="borderpage|shadowcolorft">C_olor:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">shadowcolorlb</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="distancemf">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment3</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuButton" id="shadowcolorlb">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="shadowswin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="halign">start</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="hexpand">True</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkViewport">
+ <object class="GtkGrid" id="grid10">
<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="column_homogeneous">True</property>
<child>
- <object class="GtkDrawingArea" id="shadows">
+ <object class="GtkLabel" id="shadowcolorft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="borderpage|shadowcolorft">C_olor:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">shadowcolorlb</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuButton" id="shadowcolorlb">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -696,4 +751,22 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup">
+ <widgets>
+ <widget name="grid9"/>
+ <widget name="grid11"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup">
+ <widgets>
+ <widget name="frame3"/>
+ <widget name="align12"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup">
+ <widgets>
+ <widget name="spacing"/>
+ <widget name="align1"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list