[Libreoffice-commits] core.git: sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 8 12:53:25 UTC 2020
sw/uiconfig/swriter/ui/optcompatpage.ui | 126 ++++++++++++++++----------------
1 file changed, 63 insertions(+), 63 deletions(-)
New commits:
commit d68f5c3c684ef440d537372ccf3edc30d2fa3668
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Jan 8 11:06:54 2020 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Wed Jan 8 13:52:51 2020 +0100
Options Dialog Compatibility options update first global than file
Change-Id: Ibd906476eb9a798b1ef290a35545e0b22c10b892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86407
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 29a5c6eaee75..4f7897212b39 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -39,54 +39,54 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="compatframe">
+ <object class="GtkFrame" id="globalcompatframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="vexpand">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="vexpand">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">5</property>
<child>
- <object class="GtkScrolledWindow" id="optionsscroll">
+ <object class="GtkScrolledWindow" id="globaloptioncheckboxscroll">
<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="GtkTreeView" id="options">
+ <object class="GtkTreeView" id="globaloptioncheckbox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore1</property>
+ <property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+ <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="alignment">0.5</property>
<child>
- <object class="GtkCellRendererToggle" id="cellrenderer5"/>
+ <object class="GtkCellRendererToggle" id="cellrenderer7"/>
<attributes>
<attribute name="visible">3</attribute>
<attribute name="active">0</attribute>
@@ -95,11 +95,11 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn8">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderer4"/>
+ <object class="GtkCellRendererText" id="cellrenderer9"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
@@ -115,26 +115,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="format">
+ <object class="GtkComboBoxText" id="globaloptions">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<items>
- <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
- <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item>
- <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item>
- <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
- <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item>
- <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item>
- <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item>
- <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item>
- <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item>
- <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item>
- <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item>
- <item translatable="yes" context="optcompatpage|format">Protect form (no longer protects whole document. Insert write protected section instead)</item>
- <item translatable="yes" context="optcompatpage|format">Word-compatible trailing blanks</item>
- <item translatable="yes" context="optcompatpage|format">Tolerate white lines of PDF page backgrounds for compatibility with old documents</item>
- <item translatable="yes" context="optcompatpage|format">Hide paragraphs of database fields (e.g., mail merge) with an empty value</item>
- <item translatable="yes" context="optcompatpage|format"><User settings></item>
+ <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu to have it MS compatible</item>
</items>
</object>
<packing>
@@ -142,29 +127,15 @@
<property name="top_attach">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="default">
- <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">end</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optcompatpage|label11">Compatibility options for “%DOCNAME”</property>
+ <property name="label" translatable="yes" context="optcompatpage|label2">Global compatibility options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -178,54 +149,54 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="globalcompatframe">
+ <object class="GtkFrame" id="compatframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">False</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">False</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">5</property>
<child>
- <object class="GtkScrolledWindow" id="globaloptioncheckboxscroll">
+ <object class="GtkScrolledWindow" id="optionsscroll">
<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="GtkTreeView" id="globaloptioncheckbox">
+ <object class="GtkTreeView" id="options">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore2</property>
+ <property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
+ <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn6">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="alignment">0.5</property>
<child>
- <object class="GtkCellRendererToggle" id="cellrenderer7"/>
+ <object class="GtkCellRendererToggle" id="cellrenderer5"/>
<attributes>
<attribute name="visible">3</attribute>
<attribute name="active">0</attribute>
@@ -234,11 +205,11 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn8">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn5">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderer9"/>
+ <object class="GtkCellRendererText" id="cellrenderer4"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
@@ -254,11 +225,26 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="globaloptions">
+ <object class="GtkComboBoxText" id="format">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<items>
- <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu to have it MS compatible</item>
+ <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
+ <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item>
+ <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
+ <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item>
+ <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item>
+ <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item>
+ <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item>
+ <item translatable="yes" context="optcompatpage|format">Protect form (no longer protects whole document. Insert write protected section instead)</item>
+ <item translatable="yes" context="optcompatpage|format">Word-compatible trailing blanks</item>
+ <item translatable="yes" context="optcompatpage|format">Tolerate white lines of PDF page backgrounds for compatibility with old documents</item>
+ <item translatable="yes" context="optcompatpage|format">Hide paragraphs of database fields (e.g., mail merge) with an empty value</item>
+ <item translatable="yes" context="optcompatpage|format"><User settings></item>
</items>
</object>
<packing>
@@ -266,15 +252,29 @@
<property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="default">
+ <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optcompatpage|label2">Global compatibility options</property>
+ <property name="label" translatable="yes" context="optcompatpage|label11">Compatibility options for “%DOCNAME”</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
More information about the Libreoffice-commits
mailing list