diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2023-12-17 19:58:25 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2023-12-17 19:58:25 +0100 |
commit | 4cb46f4de4b881e5b1f65af017dca6f3917e55e5 (patch) | |
tree | fb359e210d2d9c30f5ad36a447ea29b62ae9bb56 /data | |
parent | 841f952294b349b2b8e2afb5305ce34a3b59bb4b (diff) | |
parent | f5a0cee8ccecc7b6c6c2d8e9fb6f6eecd53531fe (diff) |
Update upstream source from tag 'upstream/0.32.4'
Update to upstream version '0.32.4'
with Debian dir 51798a6af1c9b7e48f979c020d72f3c5ddd964a6
Diffstat (limited to 'data')
-rw-r--r-- | data/gsettings/org.gnome.shotwell.gschema.xml | 6 | ||||
-rw-r--r-- | data/meson.build | 7 | ||||
-rw-r--r-- | data/misc/canary.avif | bin | 0 -> 293 bytes | |||
-rw-r--r-- | data/org.gnome.Shotwell-Profile-Browser.desktop.in | 14 | ||||
-rw-r--r-- | data/org.gnome.Shotwell-Viewer.desktop.in | 1 | ||||
-rw-r--r-- | data/org.gnome.Shotwell.appdata.xml.in | 10 | ||||
-rw-r--r-- | data/org.gnome.Shotwell.desktop.in | 6 | ||||
-rw-r--r-- | data/org.gnome.Shotwell.gresource.xml | 2 | ||||
-rw-r--r-- | data/ui/multitextentrydialog.ui | 2 | ||||
-rw-r--r-- | data/ui/photo.ui | 2 | ||||
-rw-r--r-- | data/ui/slideshow_settings.ui | 16 |
11 files changed, 40 insertions, 26 deletions
diff --git a/data/gsettings/org.gnome.shotwell.gschema.xml b/data/gsettings/org.gnome.shotwell.gschema.xml index 1823e03..68204d0 100644 --- a/data/gsettings/org.gnome.shotwell.gschema.xml +++ b/data/gsettings/org.gnome.shotwell.gschema.xml @@ -210,6 +210,12 @@ <summary>Show title</summary> <description>Whether to show the title of a photo during the slideshow</description> </key> + + <key name="shuffle" type="b"> + <default>false</default> + <summary>Shuffle</summary> + <description>Whether to shuffle the order of photos during the slideshow</description> + </key> </schema> <schema id="org.gnome.shotwell.preferences.window"> diff --git a/data/meson.build b/data/meson.build index 798ea38..9c17f0f 100644 --- a/data/meson.build +++ b/data/meson.build @@ -28,12 +28,5 @@ i18n.merge_file(input : 'org.gnome.Shotwell-Viewer.desktop.in', install : true, install_dir : join_paths(get_option('datadir'), 'applications')) -i18n.merge_file(input : 'org.gnome.Shotwell-Profile-Browser.desktop.in', - output: 'org.gnome.Shotwell-Profile-Browser.desktop', - po_dir : podir, - type : 'desktop', - install : true, - install_dir : join_paths(get_option('datadir'), 'applications')) - shotwell_resources = gnome.compile_resources('shotwell-resources', 'org.gnome.Shotwell.gresource.xml') diff --git a/data/misc/canary.avif b/data/misc/canary.avif Binary files differnew file mode 100644 index 0000000..6df2762 --- /dev/null +++ b/data/misc/canary.avif diff --git a/data/org.gnome.Shotwell-Profile-Browser.desktop.in b/data/org.gnome.Shotwell-Profile-Browser.desktop.in deleted file mode 100644 index 073f045..0000000 --- a/data/org.gnome.Shotwell-Profile-Browser.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Shotwell Profile Browser -GenericName=Photo Manager -Comment=Manage Different Profiles In Shotwell -Exec=shotwell -b -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=org.gnome.Shotwell -Terminal=false -Type=Application -Categories=Graphics;Photography;GNOME;GTK; -X-GIO-NoFuse=true -X-GNOME-Gettext-Domain=shotwell -X-GNOME-FullName=Shotwell Profile Manager diff --git a/data/org.gnome.Shotwell-Viewer.desktop.in b/data/org.gnome.Shotwell-Viewer.desktop.in index 4258dcb..80294ad 100644 --- a/data/org.gnome.Shotwell-Viewer.desktop.in +++ b/data/org.gnome.Shotwell-Viewer.desktop.in @@ -3,7 +3,6 @@ Version=1.0 Name=Shotwell Viewer GenericName=Photo Viewer Exec=shotwell %f -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gnome.Shotwell Terminal=false NoDisplay=true diff --git a/data/org.gnome.Shotwell.appdata.xml.in b/data/org.gnome.Shotwell.appdata.xml.in index 2597abb..eca7846 100644 --- a/data/org.gnome.Shotwell.appdata.xml.in +++ b/data/org.gnome.Shotwell.appdata.xml.in @@ -54,6 +54,16 @@ <url type="bugtracker">https://gitlab.gnome.org/GNOME/shotwell/issues</url> <releases> + <release version="0.32.4" date="2023-12-02" urgency="medium" type="stable"> + <description> + <ul> + <li>Fixes various crashes and other oddities related to cropping</li> + <li>Fixes crashes if filenames are not UTF-8</li> + <li>Fixes metadata reading from videos</li> + <li>Adds an option to randomly shuffle the images in a slidesohw</li> + </ul> + </description> + </release> <release version="0.32.3" date="2023-11-16" urgency="medium" type="stable"> <description> <ul> diff --git a/data/org.gnome.Shotwell.desktop.in b/data/org.gnome.Shotwell.desktop.in index 61048f5..c7bb3af 100644 --- a/data/org.gnome.Shotwell.desktop.in +++ b/data/org.gnome.Shotwell.desktop.in @@ -6,7 +6,6 @@ Comment=Organize your photos # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;flickr;picasa;youtube;piwigo; Exec=shotwell %U -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gnome.Shotwell Terminal=false Type=Application @@ -15,3 +14,8 @@ Categories=Graphics;Photography;GNOME;GTK; X-GIO-NoFuse=true X-GNOME-Gettext-Domain=shotwell X-GNOME-FullName=Shotwell Photo Manager +Actions=profile-browser; + +[Desktop Action profile-browser] +Name=Manage Different Profiles In Shotwell +Exec=shotwell -b diff --git a/data/org.gnome.Shotwell.gresource.xml b/data/org.gnome.Shotwell.gresource.xml index d88279b..3fb48f1 100644 --- a/data/org.gnome.Shotwell.gresource.xml +++ b/data/org.gnome.Shotwell.gresource.xml @@ -76,5 +76,7 @@ <file>icons/slideshow-extension-point.png</file> <file>icons/hicolor/scalable/actions/straighten-symbolic.svg</file> <file>themes/org.gnome.Shotwell.css</file> + <!-- Misc stuff --> + <file>misc/canary.avif</file> </gresource> </gresources> 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> |