summaryrefslogtreecommitdiff
path: root/plugins/shotwell-transitions
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
commitbb80d3feebdc9acc52e3f4ad24084d8425f043a2 (patch)
tree2084a84c39f159c6aea254775dc0880d52579d45 /plugins/shotwell-transitions
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins/shotwell-transitions')
-rw-r--r--plugins/shotwell-transitions/BlindsEffect.vala6
-rw-r--r--plugins/shotwell-transitions/ChessEffect.vala6
-rw-r--r--plugins/shotwell-transitions/CircleEffect.vala6
-rw-r--r--plugins/shotwell-transitions/CirclesEffect.vala6
-rw-r--r--plugins/shotwell-transitions/ClockEffect.vala6
-rw-r--r--plugins/shotwell-transitions/CrumbleEffect.vala6
-rw-r--r--plugins/shotwell-transitions/FadeEffect.vala6
-rw-r--r--plugins/shotwell-transitions/SlideEffect.vala6
-rw-r--r--plugins/shotwell-transitions/SquaresEffect.vala6
-rw-r--r--plugins/shotwell-transitions/StripesEffect.vala6
-rw-r--r--plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml2
-rw-r--r--plugins/shotwell-transitions/shotwell-transitions.vala51
12 files changed, 50 insertions, 63 deletions
diff --git a/plugins/shotwell-transitions/BlindsEffect.vala b/plugins/shotwell-transitions/BlindsEffect.vala
index 19af7b3..f1dceb6 100644
--- a/plugins/shotwell-transitions/BlindsEffect.vala
+++ b/plugins/shotwell-transitions/BlindsEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class BlindsEffectDescriptor : ShotwellTransitionDescriptor {
- public BlindsEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public BlindsEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.blinds";
+ return "org.gnome.shotwell.transitions.blinds";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/ChessEffect.vala b/plugins/shotwell-transitions/ChessEffect.vala
index 9daa670..449f5d3 100644
--- a/plugins/shotwell-transitions/ChessEffect.vala
+++ b/plugins/shotwell-transitions/ChessEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class ChessEffectDescriptor : ShotwellTransitionDescriptor {
- public ChessEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public ChessEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.chess";
+ return "org.gnome.shotwell.transitions.chess";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CircleEffect.vala b/plugins/shotwell-transitions/CircleEffect.vala
index b03d8fb..5115c23 100644
--- a/plugins/shotwell-transitions/CircleEffect.vala
+++ b/plugins/shotwell-transitions/CircleEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class CircleEffectDescriptor : ShotwellTransitionDescriptor {
- public CircleEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public CircleEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.circle";
+ return "org.gnome.shotwell.transitions.circle";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CirclesEffect.vala b/plugins/shotwell-transitions/CirclesEffect.vala
index 259d801..2e97bfb 100644
--- a/plugins/shotwell-transitions/CirclesEffect.vala
+++ b/plugins/shotwell-transitions/CirclesEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class CirclesEffectDescriptor : ShotwellTransitionDescriptor {
- public CirclesEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public CirclesEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.circles";
+ return "org.gnome.shotwell.transitions.circles";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/ClockEffect.vala b/plugins/shotwell-transitions/ClockEffect.vala
index 2b7a56a..0dfd353 100644
--- a/plugins/shotwell-transitions/ClockEffect.vala
+++ b/plugins/shotwell-transitions/ClockEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class ClockEffectDescriptor : ShotwellTransitionDescriptor {
- public ClockEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public ClockEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.clock";
+ return "org.gnome.shotwell.transitions.clock";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CrumbleEffect.vala b/plugins/shotwell-transitions/CrumbleEffect.vala
index f707bab..ba7235e 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.vala
+++ b/plugins/shotwell-transitions/CrumbleEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class CrumbleEffectDescriptor : ShotwellTransitionDescriptor {
- public CrumbleEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public CrumbleEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.crumble";
+ return "org.gnome.shotwell.transitions.crumble";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/FadeEffect.vala b/plugins/shotwell-transitions/FadeEffect.vala
index 6330001..d28edb2 100644
--- a/plugins/shotwell-transitions/FadeEffect.vala
+++ b/plugins/shotwell-transitions/FadeEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class FadeEffectDescriptor : ShotwellTransitionDescriptor {
- public FadeEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public FadeEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.fade";
+ return "org.gnome.shotwell.transitions.fade";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/SlideEffect.vala b/plugins/shotwell-transitions/SlideEffect.vala
index 2b2aca0..e4d6412 100644
--- a/plugins/shotwell-transitions/SlideEffect.vala
+++ b/plugins/shotwell-transitions/SlideEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class SlideEffectDescriptor : ShotwellTransitionDescriptor {
- public SlideEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public SlideEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.slide";
+ return "org.gnome.shotwell.transitions.slide";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/SquaresEffect.vala b/plugins/shotwell-transitions/SquaresEffect.vala
index b397419..fcb7690 100644
--- a/plugins/shotwell-transitions/SquaresEffect.vala
+++ b/plugins/shotwell-transitions/SquaresEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class SquaresEffectDescriptor : ShotwellTransitionDescriptor {
- public SquaresEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public SquaresEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.squares";
+ return "org.gnome.shotwell.transitions.squares";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/StripesEffect.vala b/plugins/shotwell-transitions/StripesEffect.vala
index 55d8bd8..4d0282e 100644
--- a/plugins/shotwell-transitions/StripesEffect.vala
+++ b/plugins/shotwell-transitions/StripesEffect.vala
@@ -8,12 +8,12 @@
using Spit;
private class StripesEffectDescriptor : ShotwellTransitionDescriptor {
- public StripesEffectDescriptor(GLib.File resource_directory) {
- base(resource_directory);
+ public StripesEffectDescriptor() {
+ base();
}
public override unowned string get_id() {
- return "org.yorba.shotwell.transitions.stripes";
+ return "org.gnome.shotwell.transitions.stripes";
}
public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml b/plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
index 7545683..fedc742 100644
--- a/plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
+++ b/plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/Shotwell/Transitions">
- <file>slideshow-plugin.png</file>
+ <file alias="icons/hicolor/24x24/mimetypes/slideshow-plugin.png">slideshow-plugin.png</file>
</gresource>
</gresources>
diff --git a/plugins/shotwell-transitions/shotwell-transitions.vala b/plugins/shotwell-transitions/shotwell-transitions.vala
index 1d2344f..a4288bb 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.vala
+++ b/plugins/shotwell-transitions/shotwell-transitions.vala
@@ -9,19 +9,17 @@ extern const string _VERSION;
private class ShotwellTransitions : Object, Spit.Module {
private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
- public ShotwellTransitions(GLib.File module_file) {
- GLib.File resource_directory = module_file.get_parent();
-
- pluggables += new FadeEffectDescriptor(resource_directory);
- pluggables += new SlideEffectDescriptor(resource_directory);
- pluggables += new CrumbleEffectDescriptor(resource_directory);
- pluggables += new BlindsEffectDescriptor(resource_directory);
- pluggables += new CircleEffectDescriptor(resource_directory);
- pluggables += new CirclesEffectDescriptor(resource_directory);
- pluggables += new ClockEffectDescriptor(resource_directory);
- pluggables += new SquaresEffectDescriptor(resource_directory);
- pluggables += new ChessEffectDescriptor(resource_directory);
- pluggables += new StripesEffectDescriptor(resource_directory);
+ public ShotwellTransitions() {
+ pluggables += new FadeEffectDescriptor();
+ pluggables += new SlideEffectDescriptor();
+ pluggables += new CrumbleEffectDescriptor();
+ pluggables += new BlindsEffectDescriptor();
+ pluggables += new CircleEffectDescriptor();
+ pluggables += new CirclesEffectDescriptor();
+ pluggables += new ClockEffectDescriptor();
+ pluggables += new SquaresEffectDescriptor();
+ pluggables += new ChessEffectDescriptor();
+ pluggables += new StripesEffectDescriptor();
}
public unowned string get_module_name() {
@@ -33,7 +31,7 @@ private class ShotwellTransitions : Object, Spit.Module {
}
public unowned string get_id() {
- return "org.yorba.shotwell.transitions";
+ return "org.gnome.shotwell.transitions";
}
public unowned Spit.Pluggable[]? get_pluggables() {
@@ -47,20 +45,12 @@ public Spit.Module? spit_entry_point(Spit.EntryPointParams *params) {
params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
- ? new ShotwellTransitions(params->module_file) : null;
+ ? new ShotwellTransitions() : null;
}
// Base class for all transition descriptors in this module
public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
- private const string ICON_FILENAME = "slideshow-plugin.png";
-
- private static Gdk.Pixbuf[] icon_pixbuf_set = null;
-
- protected ShotwellTransitionDescriptor(GLib.File resource_directory) {
- if (icon_pixbuf_set == null)
- icon_pixbuf_set =
- Resources.load_from_resource(Resources.RESOURCE_PATH + "/" + ICON_FILENAME);
- }
+ protected ShotwellTransitionDescriptor() {}
public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
@@ -71,16 +61,13 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
public abstract unowned string get_pluggable_name();
- public void get_info(ref Spit.PluggableInfo info) {
+ public Spit.PluggableInfo get_info() {
+ var info = new Spit.PluggableInfo();
info.authors = "Maxim Kartashev";
info.copyright = _("Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy Inc.");
- info.translators = Resources.TRANSLATORS;
- info.version = _VERSION;
- info.website_name = Resources.WEBSITE_NAME;
- info.website_url = Resources.WEBSITE_URL;
- info.is_license_wordwrapped = false;
- info.license = Resources.LICENSE;
- info.icons = icon_pixbuf_set;
+ info.icon_name = "slideshow-plugin";
+
+ return info;
}
public void activation(bool enabled) {