sw/uiconfig/swriter/ui/framedialog.ui | 22 ++++++++++++++++++----
sw/uiconfig/swriter/ui/templatedialog4.ui | 24 +++++++++++++++++++-----
2 files changed, 37 insertions(+), 9 deletions(-)
New commits:
commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Mar 28 16:47:48 2014 +0100
sw: adapt frame/templatedialog4.ui to FillAttributes
With this, editing frame properties of an existing TextFrame and editing
frame styles work again.
(regression from 6e61ecd09679a66060f932835622821d39e92f01)
Change-Id: Ib2bbd337d3d1f648f220d585d42d8310c3486111
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui
b/sw/uiconfig/swriter/ui/framedialog.ui
index a010245..49d9802 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -160,10 +160,10 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="background">
+ <object class="GtkLabel" id="area">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes">Area</property>
</object>
<packing>
<property name="position">5</property>
@@ -174,13 +174,27 @@
<placeholder/>
</child>
<child type="tab">
+ <object class="GtkLabel" id="transparence">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Transparency</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Columns</property>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -194,7 +208,7 @@
<property name="label" translatable="yes">Macro</property>
</object>
<packing>
- <property name="position">7</property>
+ <property name="position">8</property>
<property name="tab_fill">False</property>
</packing>
</child>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 5559c82d..546d45b 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -176,10 +176,10 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="background">
+ <object class="GtkLabel" id="area">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes">Area</property>
</object>
<packing>
<property name="position">4</property>
@@ -190,13 +190,27 @@
<placeholder/>
</child>
<child type="tab">
+ <object class="GtkLabel" id="transparence">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Transparency</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Borders</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -210,7 +224,7 @@
<property name="label" translatable="yes">Columns</property>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -224,7 +238,7 @@
<property name="label" translatable="yes">Macro</property>
</object>
<packing>
- <property name="position">7</property>
+ <property name="position">8</property>
<property name="tab_fill">False</property>
</packing>
</child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
