sw/uiconfig/swriter/ui/frmaddpage.ui | 324 +++++++++++++++--------------------
sw/uiconfig/swriter/ui/frmurlpage.ui | 10 -
2 files changed, 148 insertions(+), 186 deletions(-)
New commits:
commit d0922a4ce0ddf458fa10a504ee9b769f2c86b149
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed May 13 11:01:57 2020 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Sat May 16 22:19:25 2020 +0200
Update Image dialog property url and addpage alignment
Change-Id: I2601cc41ff8b7c678ac6d5d0ccce05d17f6be18b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94107
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui
b/sw/uiconfig/swriter/ui/frmaddpage.ui
index e01f39cfe327..1d4f18b507dd 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -9,20 +9,19 @@
</property>
</object>
- <object class="GtkBox" id="FrameAddPage">
+ <object class="GtkGrid" id="FrameAddPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">24</property>
<child>
<object class="GtkFrame" id="nameframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -38,6 +37,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -98,7 +98,7 @@
<object class="GtkComboBoxText" id="prev">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes"
context="frmaddpage|prev"><None></item>
</items>
@@ -112,7 +112,7 @@
<object class="GtkComboBoxText" id="next">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="hexpand">True</property>
<items>
<item translatable="yes"
context="frmaddpage|next"><None></item>
</items>
@@ -169,12 +169,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="description">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="wrap_mode">word</property>
<property name="buffer">textbuffer1</property>
</object>
@@ -201,180 +203,161 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkFrame" id="protect">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_homogeneous">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="contentalign">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkGrid" id="grid9">
<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="row_spacing">3</property>
<child>
- <object class="GtkGrid" id="grid8">
+ <object class="GtkCheckButton" id="protectcontent">
+ <property name="label" translatable="yes"
context="frmaddpage|protectcontent">_Contents</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmaddpage|label2">_Vertical alignment</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="vertalign">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes"
context="frmaddpage|liststore">Top</item>
- <item id="1" translatable="yes"
context="frmaddpage|liststore">Centered</item>
- <item id="2" translatable="yes"
context="frmaddpage|liststore">Bottom</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="protectframe">
+ <property name="label" translatable="yes"
context="frmaddpage|protectframe">P_osition</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="protectsize">
+ <property name="label" translatable="yes"
context="frmaddpage|protectsize">_Size</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmaddpage|label7">Content Alignment</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="frmaddpage|label8">Protect</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="contentalign">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="protect">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkGrid" id="grid9">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="protectcontent">
- <property name="label" translatable="yes"
context="frmaddpage|protectcontent">_Contents</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="protectframe">
- <property name="label" translatable="yes"
context="frmaddpage|protectframe">P_osition</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="protectsize">
- <property name="label" translatable="yes"
context="frmaddpage|protectsize">_Size</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"
context="frmaddpage|label2">_Vertical alignment</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="vertalign">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0" translatable="yes"
context="frmaddpage|liststore">Top</item>
+ <item id="1" translatable="yes"
context="frmaddpage|liststore">Centered</item>
+ <item id="2" translatable="yes"
context="frmaddpage|liststore">Bottom</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="frmaddpage|label8">Protect</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="frmaddpage|label7">Content Alignment</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="properties">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -391,7 +374,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="row_spacing">3</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="editinreadonly">
@@ -406,6 +389,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -421,40 +405,28 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkComboBoxText" id="textflow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="textflow_label">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes"
context="frmaddpage|textflow_label">_Text direction:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">textflow</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="GtkComboBoxText" id="textflow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="textflow_label">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes"
context="frmaddpage|textflow_label">_Text direction:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">textflow</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -477,9 +449,9 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -490,15 +462,9 @@
<widget name="altname_label"/>
<widget name="prev_label"/>
<widget name="next_label"/>
+ <widget name="description_label"/>
+ <widget name="protect"/>
<widget name="textflow_label"/>
</widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <property name="ignore_hidden">True</property>
- <widgets>
- <widget name="prev"/>
- <widget name="next"/>
- <widget name="textflow"/>
- </widgets>
- </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/frmurlpage.ui
b/sw/uiconfig/swriter/ui/frmurlpage.ui
index 4aca7d26e197..758f4dd31e13 100644
--- a/sw/uiconfig/swriter/ui/frmurlpage.ui
+++ b/sw/uiconfig/swriter/ui/frmurlpage.ui
@@ -55,6 +55,7 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -103,6 +104,7 @@
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="search">
@@ -140,14 +142,9 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -174,7 +171,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
