diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-15 17:17:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-15 17:25:59 +0200 |
| commit | f899e508c35b6170bc11fc2eb4a74ec58d895625 (patch) | |
| tree | 3060ffd8c7e60e1a48db4155a11d18fe28488b74 | |
| parent | 177ad6e5441d637cfca1241151bc0755d2a3a6a4 (diff) | |
fdo#81302: Revert "sw: adapt object/picturedialog.ui to FillAttributes"
This reverts commit 270fabec85f37b513d29e74cb66b38d5eae7cf80.
Required by commit dc17dad5fd7509f191718df8690e5847ab87669a, which
reverted the FillAttributes.
Change-Id: I525636d1e99b9fd639ad52aa69380a9896c7752b
| -rw-r--r-- | sw/uiconfig/swriter/ui/objectdialog.ui | 20 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/picturedialog.ui | 20 |
2 files changed, 6 insertions, 34 deletions
diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui index cd5689671d65..dc48bdf5f9f5 100644 --- a/sw/uiconfig/swriter/ui/objectdialog.ui +++ b/sw/uiconfig/swriter/ui/objectdialog.ui @@ -160,10 +160,10 @@ <placeholder/> </child> <child type="tab"> - <object class="GtkLabel" id="area"> + <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Area</property> + <property name="label" translatable="yes">Background</property> </object> <packing> <property name="position">5</property> @@ -174,27 +174,13 @@ <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="macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Macro</property> </object> <packing> - <property name="position">7</property> + <property name="position">6</property> <property name="tab_fill">False</property> </packing> </child> diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui index 556207646928..71e31400d30d 100644 --- a/sw/uiconfig/swriter/ui/picturedialog.ui +++ b/sw/uiconfig/swriter/ui/picturedialog.ui @@ -188,10 +188,10 @@ <placeholder/> </child> <child type="tab"> - <object class="GtkLabel" id="area"> + <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Area</property> + <property name="label" translatable="yes">Background</property> </object> <packing> <property name="position">7</property> @@ -202,27 +202,13 @@ <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">8</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> <object class="GtkLabel" id="macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Macro</property> </object> <packing> - <property name="position">9</property> + <property name="position">8</property> <property name="tab_fill">False</property> </packing> </child> |