summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-14 16:23:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-15 11:20:49 +0100
commitfcf0d983801603250aa7ce4539951c6b049ad079 (patch)
treee1c7ec93cd507af0eac563d71d4772e977d577e3 /sd
parent093eb46aea59c2359d122bc8d2c2a7411e9b8a23 (diff)
add a rule to enforce always-show-image of True if an image is used
If not set, then gtk3 will show the image if there is no text, but only the text if there's an image. For simplicity sake just enforce it as true if an image is referenced. Change-Id: Id4bb9140ba83e7e07e0d8ec5e3c29aece49b9087 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125200 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/uiconfig/simpress/ui/customanimationeffecttab.ui1
-rw-r--r--sd/uiconfig/simpress/ui/dockinganimation.ui9
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_groups.ui14
3 files changed, 24 insertions, 0 deletions
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index 1eb012b3022f..75b428c33945 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -272,6 +272,7 @@
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="image">image1</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="sound_preview-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="customanimationeffecttab|extended_tip|sound_preview">Plays the selected sound file.</property>
diff --git a/sd/uiconfig/simpress/ui/dockinganimation.ui b/sd/uiconfig/simpress/ui/dockinganimation.ui
index a1ed27a2ee7c..cd082b93378b 100644
--- a/sd/uiconfig/simpress/ui/dockinganimation.ui
+++ b/sd/uiconfig/simpress/ui/dockinganimation.ui
@@ -179,6 +179,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|first|tooltip_text">First Image</property>
<property name="image">image5</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="first-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|first">Jumps to the first image in the animation sequence.</property>
@@ -197,6 +198,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|prev|tooltip_text">Backwards</property>
<property name="image">image6</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="prev-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|prev">Plays the animation backwards.</property>
@@ -215,6 +217,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|stop|tooltip_text">Stop</property>
<property name="image">image7</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="stop-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|stop">Stops playing the animation.</property>
@@ -233,6 +236,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|next|tooltip_text">Play</property>
<property name="image">image8</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="next-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|next">Plays the animation.</property>
@@ -251,6 +255,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|last|tooltip_text">Last Image</property>
<property name="image">image9</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="last-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|last">Jumps to the last image in the animation sequence.</property>
@@ -443,6 +448,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|getone|tooltip_text">Apply Object</property>
<property name="image">image1</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="getone-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|getone">Adds selected object(s) as a single image.</property>
@@ -461,6 +467,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|getall|tooltip_text">Apply Objects Individually</property>
<property name="image">image2</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="getall-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|getall">Adds an image for each selected object.</property>
@@ -531,6 +538,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|delone|tooltip_text">Delete Current Image</property>
<property name="image">image3</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="delone-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|delone">Deletes current image from the animation sequence.</property>
@@ -549,6 +557,7 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="dockinganimation|delall|tooltip_text">Delete All Images</property>
<property name="image">image4</property>
+ <property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="delall-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="dockinganimation|extended_tip|delall">Deletes all of the images in the animation.</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index a428382a9aa4..1c9dd7182333 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -704,6 +704,7 @@
<property name="image">paragraphstylei</property>
<property name="relief">none</property>
<property name="image_position">top</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -899,6 +900,7 @@
<property name="image">lefti</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -917,6 +919,7 @@
<property name="image">centeri</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -935,6 +938,7 @@
<property name="image">righti</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -966,6 +970,7 @@
<property name="image">boldi</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -984,6 +989,7 @@
<property name="image">italicsi</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1122,6 +1128,7 @@
<property name="image">bulletsi</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1141,6 +1148,7 @@
<property name="image">numberingi</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1240,6 +1248,7 @@
<property name="image">startshowi</property>
<property name="relief">none</property>
<property name="image_position">top</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1264,6 +1273,7 @@
<property name="image">masteri</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1283,6 +1293,7 @@
<property name="image">layouti</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1466,6 +1477,7 @@
<property name="image">linksi</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1514,6 +1526,7 @@
<property name="image">charti</property>
<property name="relief">none</property>
<property name="xalign">0</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1614,6 +1627,7 @@
<property name="image">paragraphstylei</property>
<property name="relief">none</property>
<property name="image_position">top</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>