diff options
| -rwxr-xr-x | .git-hooks/pre-commit | 4 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/picturepage.ui | 74 |
2 files changed, 38 insertions, 40 deletions
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit index 8470d4b2631b..75d217f3f453 100755 --- a/.git-hooks/pre-commit +++ b/.git-hooks/pre-commit @@ -109,6 +109,10 @@ sub check_whitespaces($) { bad_line("use margin-end instead of margin-right", $_, "ui"); } + if (/<object class="GtkAlignment"/) + { + bad_line("use margin-start (etc) on child instead of a GtkAlignment", $_, "ui"); + } if ((/translatable="yes"/) and not(/context=/)) { bad_line("translatable .ui file line without context", $_, "ui"); diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index 87eec3bac33d..a9f0d3593f45 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -396,52 +396,46 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="valign">start</property> + <property name="row_spacing">3</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">3</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="picturepage|label15">Type:</property> - <property name="single_line_mode">True</property> - <property name="xalign">0</property> - <accessibility> - <relation type="label-for" target="label-graphic-type"/> - </accessibility> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label-graphic-type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">???</property> - <property name="xalign">0</property> - <accessibility> - <relation type="labelled-by" target="label15"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="picturepage|label15">Type:</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="label-graphic-type"/> + </accessibility> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label-graphic-type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">???</property> + <property name="xalign">0</property> + <accessibility> + <relation type="labelled-by" target="label15"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> |