[Libreoffice-commits] core.git: sw/uiconfig
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 2 17:54:58 UTC 2020
sw/uiconfig/swriter/ui/pagefooterpanel.ui | 17 +++++++++--------
sw/uiconfig/swriter/ui/pageformatpanel.ui | 2 ++
sw/uiconfig/swriter/ui/pageheaderpanel.ui | 19 +++++++++----------
sw/uiconfig/swriter/ui/pagestylespanel.ui | 25 +++++++++++++++----------
4 files changed, 35 insertions(+), 28 deletions(-)
New commits:
commit 9c7c5001f257ea9b5771d839cf7d0b039cfae79c
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 1 20:36:08 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 2 18:54:25 2020 +0100
use same margins etc on writer sidebar panels
Change-Id: I03a490abd6d35967ec5f873a8345c11466e30dc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86119
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
index 2df5d8d831fd..7ef21bb84030 100644
--- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui
+++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkGrid" id="PageFooterPanel">
@@ -19,6 +19,7 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="footertoggle">
@@ -44,10 +45,9 @@
<object class="GtkLabel" id="margins">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="pagefooterpanel|margins">Margins:</property>
<property name="mnemonic_widget">footermarginpreset</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -64,6 +64,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes" context="pagefooterpanel|customlabel">Custom</property>
</object>
<packing>
@@ -75,9 +76,9 @@
<object class="GtkLabel" id="spacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="pagefooterpanel|spacing">Spacing:</property>
<property name="mnemonic_widget">spacingpreset</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -88,9 +89,9 @@
<object class="GtkLabel" id="samecontent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="pagefooterpanel|samecontent">Same Content:</property>
<property name="mnemonic_widget">samecontentLB</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -101,7 +102,7 @@
<object class="GtkComboBoxText" id="footermarginpreset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -112,7 +113,7 @@
<object class="GtkComboBoxText" id="spacingpreset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -123,7 +124,7 @@
<object class="GtkComboBoxText" id="samecontentLB">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/pageformatpanel.ui b/sw/uiconfig/swriter/ui/pageformatpanel.ui
index deacf8cc7354..9a55247e4655 100644
--- a/sw/uiconfig/swriter/ui/pageformatpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageformatpanel.ui
@@ -138,6 +138,7 @@
<object class="GtkComboBoxText" id="marginLB">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -147,6 +148,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes" context="pageformatpanel|customlabel">Custom</property>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
index 8e45f56b030b..1f935d4bf65d 100644
--- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkGrid" id="PageHeaderPanel">
@@ -19,6 +19,7 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="headertoggle">
@@ -44,10 +45,9 @@
<object class="GtkLabel" id="margins">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="pageheaderpanel|margins">Margins:</property>
<property name="mnemonic_widget">headermarginpreset</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -64,6 +64,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes" context="pageheaderpanel|customlabel">Custom</property>
</object>
<packing>
@@ -75,9 +76,9 @@
<object class="GtkLabel" id="spacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="pageheaderpanel|spacing">Spacing:</property>
<property name="mnemonic_widget">spacingpreset</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -88,9 +89,9 @@
<object class="GtkLabel" id="samecontent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="pageheaderpanel|samecontent">Same Content:</property>
<property name="mnemonic_widget">samecontentLB</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -101,7 +102,7 @@
<object class="GtkComboBoxText" id="headermarginpreset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -112,7 +113,7 @@
<object class="GtkComboBoxText" id="spacingpreset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -123,7 +124,7 @@
<object class="GtkComboBoxText" id="samecontentLB">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -137,8 +138,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index f8acc399e109..6b3a71400a92 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -34,7 +34,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
- <property name="margin_right">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
@@ -71,7 +70,8 @@
<child>
<object class="GtkComboBoxText" id="numberbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -95,7 +95,7 @@
<child>
<object class="GtkComboBoxText" id="layoutbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<items>
<item translatable="yes" context="pagestylespanel|liststorePageLayout">Right and left</item>
@@ -126,7 +126,8 @@
<child>
<object class="GtkComboBoxText" id="columnbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes" context="pagestylespanel|columnbox">1 Column</item>
<item translatable="yes" context="pagestylespanel|columnbox">2 Columns</item>
@@ -144,6 +145,7 @@
<object class="GtkComboBox" id="lbhatching">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">liststore4</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
@@ -169,6 +171,7 @@
<object class="GtkComboBox" id="lbbitmap">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">liststore5</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
@@ -192,14 +195,14 @@
</child>
<child>
<object class="GtkMenuButton" id="lbcolor">
+ <property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="halign">start</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
- <property name="width_request">150</property>
<child>
<placeholder/>
</child>
@@ -210,15 +213,15 @@
</packing>
</child>
<child>
- <object class="GtkMenuButton" id="lbgradient">
+ <object class="GtkMenuButton" id="lbgradient">
+ <property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="halign">start</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="draw_indicator">True</property>
<property name="label" translatable="no"></property>
- <property name="width_request">150</property>
<child>
<placeholder/>
</child>
@@ -231,7 +234,8 @@
<child>
<object class="GtkComboBoxText" id="bgselect">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -241,6 +245,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="label" translatable="yes" context="pagestylespanel|customlabel">Custom</property>
</object>
<packing>
More information about the Libreoffice-commits
mailing list