sw/uiconfig/swriter/ui/optformataidspage.ui | 109 ++++++++++++++++++----------
1 file changed, 71 insertions(+), 38 deletions(-)
New commits:
commit 0e83efbccc180c957f77291fc0fdc6dd74eae0f4
Author: heiko tietze <tietze.he...@gmail.com>
Date: Tue Jun 19 13:53:52 2018 +0200
tdf#117745 - Split Options/Formatting Aids/"Display of"
Field options moved into another frame
Change-Id: I42a1422617183e5059e66b4f280cbf9cc6daa79d
Reviewed-on: https://gerrit.libreoffice.org/56090
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui
b/sw/uiconfig/swriter/ui/optformataidspage.ui
index 51378a9373db..24718bf9702e 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="OptFormatAidsPage">
@@ -131,7 +131,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddentext">
- <property name="label" translatable="yes"
context="optformataidspage|hiddentext">Hidden text</property>
+ <property name="label" translatable="yes"
context="optformataidspage|hiddentext">Hidden characters</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -145,36 +145,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="hiddentextfield">
- <property name="label" translatable="yes"
context="optformataidspage|hiddentextfield">Fields: Hidden te_xt</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">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="hiddenparafield">
- <property name="label" translatable="yes"
context="optformataidspage|hiddenparafield">Fields: Hidden
p_aragraphs</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">8</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -235,21 +205,84 @@
<child>
<placeholder/>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="displayfl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|displayfl">Display formatting</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <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="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkCheckButton" id="hiddentextfield">
+ <property name="label" translatable="yes"
context="optformataidspage|hiddentextfield">Hidden te_xt</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>
- <placeholder/>
+ <object class="GtkCheckButton" id="hiddenparafield">
+ <property name="label" translatable="yes"
context="optformataidspage|hiddenparafield">Hidden p_aragraphs</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>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="displayfl">
+ <object class="GtkLabel" id="displayfl1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optformataidspage|displayfl">Display of</property>
+ <property name="label" translatable="yes"
context="optformataidspage|displayfl">Display fields</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -259,7 +292,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -312,7 +345,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
