summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-11-28 10:48:55 +0100
committerSzymon Kłos <eszkadev@gmail.com>2020-05-13 19:52:46 +0200
commit0e5edc6ace090ff37cf85c15cd31d5aa00cc8f59 (patch)
tree22f75d8e515dea63755f214d3176880b42f04e9d /svx
parent6de7e0e4d834305706a042ca3c0a21588bb189ca (diff)
jsdialog: rename duplicated ui object settransparency
We had two elements with the same name (one in the area, one in a graphic context) - that caused bottom panel in online not work correctly. Change-Id: I41b9604522157e2c31e68e40c49e42ff2ccdb280 Reviewed-on: https://gerrit.libreoffice.org/83974 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx2
-rw-r--r--svx/uiconfig/ui/sidebargraphic.ui10
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 7e8bc1070ef1..00b5758e65fc 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -56,7 +56,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
get(mpMtrContrast, "setcontrast");
get(mpLBColorMode, "setcolormode");
mpLBColorMode->set_width_request(mpLBColorMode->get_preferred_size().Width());
- get(mpMtrTrans, "settransparency");
+ get(mpMtrTrans, "setgraphtransparency");
get(mpMtrRed, "setred");
get(mpMtrGreen, "setgreen");
get(mpMtrBlue, "setblue");
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
index c409b8021cb8..6adf1aad5d74 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -147,7 +147,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="sidebargraphic|transparencylabel">_Transparency:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">settransparency:%</property>
+ <property name="mnemonic_widget">setgraphtransparency:%</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -156,18 +156,18 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="settransparency:%">
+ <object class="GtkSpinButton" id="setgraphtransparency:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="sidebargraphic|settransparency|tooltip_text">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="tooltip_text" translatable="yes" context="sidebargraphic|setgraphtransparency|tooltip_text">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
<property name="adjustment">0to100adjustment</property>
<accessibility>
<relation type="labelled-by" target="transparencylabel"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="settransparency:%-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|settransparency-atkobject">Transparency</property>
+ <object class="AtkObject" id="setgraphtransparency:%-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setgraphtransparency-atkobject">Transparency</property>
</object>
</child>
</object>