summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-11-28 10:48:55 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2019-11-29 11:17:58 +0100
commit0faf74a58847a4b87ae43092fe1ca2011bbd1f90 (patch)
treeb9effa5f184a2c562c04c8f74cdab23727af3030
parentbe2cb33ee3a25b488096927c343a81e7d4f2a913 (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/83976 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r--solenv/sanitizers/ui/svx.suppr4
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx2
-rw-r--r--svx/uiconfig/ui/sidebargraphic.ui10
3 files changed, 8 insertions, 8 deletions
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 623ec15448ac..5b323a5f23e8 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -79,8 +79,8 @@ svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setcontrast:%'] missing-l
svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setcontrast:%'] labelled-by-and-mnemonic
svx/uiconfig/ui/sidebargraphic.ui://GtkComboBoxText[@id='setcolormode'] missing-label-for
svx/uiconfig/ui/sidebargraphic.ui://GtkComboBoxText[@id='setcolormode'] labelled-by-and-mnemonic
-svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='settransparency:%'] missing-label-for
-svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='settransparency:%'] labelled-by-and-mnemonic
+svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setgraphtransparency:%'] missing-label-for
+svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setgraphtransparency:%'] labelled-by-and-mnemonic
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='widthlabel'] orphan-label
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='colorlabel'] orphan-label
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='translabel'] orphan-label
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>