diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-28 16:47:48 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-28 16:56:41 +0100 |
| commit | 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc (patch) | |
| tree | 5b3f48c2b31018b4c1e057148b9bd4811d47359c /sw/uiconfig | |
| parent | 0c8c30a95e740de1bcc9b76ff4f0149bbcc1fcaa (diff) | |
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
Diffstat (limited to 'sw/uiconfig')
| -rw-r--r-- | sw/uiconfig/swriter/ui/framedialog.ui | 22 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/templatedialog4.ui | 24 |
2 files changed, 37 insertions, 9 deletions
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui index a010245889e7..49d980281298 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 5559c82da4a6..546d45b7a817 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> |