summaryrefslogtreecommitdiff
path: root/data/ui
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-12-17 19:58:57 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-12-17 19:58:57 +0100
commit270fbc11b9744b76bcc52a3cf58fe896d7352724 (patch)
treefb359e210d2d9c30f5ad36a447ea29b62ae9bb56 /data/ui
parent841f952294b349b2b8e2afb5305ce34a3b59bb4b (diff)
parent4cb46f4de4b881e5b1f65af017dca6f3917e55e5 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'data/ui')
-rw-r--r--data/ui/multitextentrydialog.ui2
-rw-r--r--data/ui/photo.ui2
-rw-r--r--data/ui/slideshow_settings.ui16
3 files changed, 17 insertions, 3 deletions
diff --git a/data/ui/multitextentrydialog.ui b/data/ui/multitextentrydialog.ui
index 6477129..21a05be 100644
--- a/data/ui/multitextentrydialog.ui
+++ b/data/ui/multitextentrydialog.ui
@@ -64,7 +64,7 @@
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTextView" id="entry">
+ <object class="DismissableTextView" id="entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/data/ui/photo.ui b/data/ui/photo.ui
index 78a2fb5..3b93546 100644
--- a/data/ui/photo.ui
+++ b/data/ui/photo.ui
@@ -191,11 +191,9 @@
<item>
<attribute name="label" translatable="yes">_Previous Photo</attribute>
<attribute name="action">win.PrevPhoto</attribute>
- <attribute name="accel">Left</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Next Photo</attribute>
- <attribute name="accel">Right</attribute>
<attribute name="action">win.NextPhoto</attribute>
</item>
</section>
diff --git a/data/ui/slideshow_settings.ui b/data/ui/slideshow_settings.ui
index 1abfa39..cfdbd70 100644
--- a/data/ui/slideshow_settings.ui
+++ b/data/ui/slideshow_settings.ui
@@ -150,6 +150,22 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="shuffle_button">
+ <property name="label" translatable="yes">Shuffle</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkComboBoxText" id="transition_effect_selector">
<property name="visible">True</property>
<property name="can_focus">False</property>