[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Fri Feb 28 21:21:14 PST 2014
cui/uiconfig/ui/connpooloptions.ui | 92 ++++---
sw/uiconfig/swriter/ui/optredlinepage.ui | 392 +++++++++++++++----------------
2 files changed, 255 insertions(+), 229 deletions(-)
New commits:
commit 90aad4ad6aa814710ce7553cb196392da949e9a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 28 13:31:35 2014 +0000
Resolves: fdo#73851 promote labels to headings
Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b
(cherry picked from commit c923b15cd99672e5b93d1ab6314c66caa417c738)
Related: fdo#73851 select driver list widget to shrink/expand
Change-Id: I3f2013ab8e0b188e74da99d2f1ff8bc842f60f50
(cherry picked from commit c8cd1c61ee3f491e170086f740ffde65a8a63f83)
Reviewed-on: https://gerrit.libreoffice.org/8397
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui
index 811e49d..8571a5b 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Jan 9 14:52:53 2014 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">30</property>
- <property name="upper">600</property>
- <property name="value">60</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkGrid" id="ConnPoolPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<child>
@@ -20,6 +15,7 @@
<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>
@@ -28,14 +24,16 @@
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="connectionpooling">
<property name="label" translatable="yes">Connection pooling enabled</property>
@@ -48,41 +46,48 @@
<property name="draw_indicator">True</property>
</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">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="driverslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Drivers known in %PRODUCTNAME</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">driverlist</property>
+ <property name="ellipsize">start</property>
</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">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="cuilo-DriverListControl" id="driverlist">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="vexpand">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -118,9 +123,10 @@
</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">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -134,9 +140,10 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -165,7 +172,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <property name="text" translatable="yes">60</property>
<property name="adjustment">adjustment1</property>
+ <property name="value">60</property>
</object>
<packing>
<property name="expand">False</property>
@@ -175,16 +184,18 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -210,4 +221,11 @@
</packing>
</child>
</object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">30</property>
+ <property name="upper">600</property>
+ <property name="value">60</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui
index 3cd59bf..c54bc5e 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
- <object class="GtkBox" id="OptRedLinePage">
+ <object class="GtkGrid" id="OptRedLinePage">
<property name="visible">True</property>
<property name="can_focus">False</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>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -24,74 +26,79 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="insert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Insertions</property>
+ <property name="label" translatable="yes">_Attributes:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">insert</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">3</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="svtlo-ColorListBox" id="insertcolor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="svtlo-ColorListBox" id="deletedcolor">
+ <object class="GtkLabel" id="insertcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_lor:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">insertcolor</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="changed">
+ <object class="GtkComboBoxText" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <items>
+ <item translatable="yes">[None]</item>
+ <item translatable="yes">Bold</item>
+ <item translatable="yes">Italic</item>
+ <item translatable="yes">Underlined</item>
+ <item translatable="yes">Underlined: double</item>
+ <item translatable="yes">Strikethrough</item>
+ <item translatable="yes">Uppercase</item>
+ <item translatable="yes">Lowercase</item>
+ <item translatable="yes">Small caps</item>
+ <item translatable="yes">Title font</item>
+ <item translatable="yes">Background color</item>
+ </items>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="svtlo-ColorListBox" id="changedcolor">
+ <object class="svtlo-ColorListBox" id="insertcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -101,229 +108,227 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Insert</property>
+ <property name="text">Insert</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
- <child>
- <object class="svxlo-SvxFontPrevWindow" id="deletedpreview:border">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="text" translatable="yes">Delete</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">2</property>
- </packing>
- </child>
- <child>
- <object class="svxlo-SvxFontPrevWindow" id="changedpreview:border">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="text" translatable="yes">Attributes</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Insertions</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <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>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <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>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <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>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkLabel" id="deleted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="insert_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Attributes:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">insert</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Attri_butes:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">deleted</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkLabel" id="deletedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="insertcolor_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_lor:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">insertcolor</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Col_or:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">deletedcolor</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkComboBox" id="deleted">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="deleted_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Attri_butes:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">deleted</property>
- </object>
- </child>
+ <property name="valign">center</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment7">
+ <object class="svtlo-ColorListBox" id="deletedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="deletedcolor_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Col_or:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">deletedcolor</property>
- </object>
- </child>
+ <property name="valign">center</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment8">
+ <object class="svxlo-SvxFontPrevWindow" id="deletedpreview:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="changed_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Attrib_utes:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">changed</property>
- </object>
- </child>
+ <property name="hexpand">True</property>
+ <property name="text">Delete</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
- <property name="height">1</property>
+ <property name="height">2</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Deletions</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <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>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <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>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment9">
+ <object class="GtkLabel" id="changed_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="changedcolor_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Colo_r:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">changedcolor</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Attrib_utes:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">changed</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="changedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Changed attributes</property>
+ <property name="label" translatable="yes">Colo_r:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">changedcolor</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkComboBox" id="changed">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Deletions</property>
+ <property name="valign">center</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">3</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="insert">
+ <object class="svtlo-ColorListBox" id="changedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">[None]</item>
- <item translatable="yes">Bold</item>
- <item translatable="yes">Italic</item>
- <item translatable="yes">Underlined</item>
- <item translatable="yes">Underlined: double</item>
- <item translatable="yes">Strikethrough</item>
- <item translatable="yes">Uppercase</item>
- <item translatable="yes">Lowercase</item>
- <item translatable="yes">Small caps</item>
- <item translatable="yes">Title font</item>
- <item translatable="yes">Background color</item>
- </items>
</object>
<packing>
<property name="left_attach">1</property>
@@ -333,16 +338,17 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="deleted">
+ <object class="svxlo-SvxFontPrevWindow" id="changedpreview:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="text">Attributes</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
- <property name="height">1</property>
+ <property name="height">2</property>
</packing>
</child>
</object>
@@ -350,10 +356,11 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text display</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Changed attributes</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -361,9 +368,10 @@
</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">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -451,8 +459,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">[None]</item>
<item translatable="yes">Left margin</item>
@@ -484,9 +490,10 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -497,32 +504,33 @@
<property name="use_underline">True</property>
</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">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
- <widget name="alignment3"/>
- <widget name="alignment4"/>
- <widget name="alignment5"/>
- <widget name="alignment7"/>
- <widget name="alignment8"/>
- <widget name="alignment9"/>
+ <widget name="insert_label"/>
+ <widget name="insertcolor_label"/>
+ <widget name="deleted_label"/>
+ <widget name="deletedcolor_label"/>
+ <widget name="changed_label"/>
+ <widget name="changedcolor_label"/>
<widget name="markpos_label"/>
<widget name="markcolor_label"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
<widgets>
+ <widget name="insert"/>
<widget name="insertcolor"/>
+ <widget name="deleted"/>
<widget name="deletedcolor"/>
<widget name="changed"/>
<widget name="changedcolor"/>
- <widget name="insert"/>
- <widget name="deleted"/>
<widget name="markcolor"/>
<widget name="markpos"/>
</widgets>
More information about the Libreoffice-commits
mailing list