#3170: Plugins can now be enabled/disabled via the Preferences dialog.

Author: jimbonator

plugins/shotwell-publishing/FacebookPublishing.vala

@@ -10,11 +10,11 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
             Spit.Publishing.CURRENT_API_VERSION);
     }
 
-    public string get_id() {
+    public unowned string get_id() {
         return "org.yorba.shotwell.publishing.facebook";
     }
 
-    public string get_pluggable_name() {
+    public unowned string get_pluggable_name() {
         return "Facebook";
     }
 
@@ -26,6 +26,9 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
         info.website_url = "http://www.yorba.org";
     }
 
+    public void activation(bool enabled) {
+    }
+    
     public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
         return new Publishing.Facebook.FacebookPublisher(this, host);
     }

plugins/shotwell-publishing/PicasaPublishing.vala

@@ -10,11 +10,11 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
             Spit.Publishing.CURRENT_API_VERSION);
     }
 
-    public string get_id() {
+    public unowned string get_id() {
         return "org.yorba.shotwell.publishing.picasa";
     }
 
-    public string get_pluggable_name() {
+    public unowned string get_pluggable_name() {
         return "Picasa Web Albums";
     }
 
@@ -34,6 +34,9 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
         return (Spit.Publishing.Publisher.MediaType.PHOTO |
             Spit.Publishing.Publisher.MediaType.VIDEO);
     }
+    
+    public void activation(bool enabled) {
+    }
 }
 
 namespace Publishing.Picasa {

plugins/shotwell-publishing/shotwell-publishing.vala

@@ -18,19 +18,19 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
     ~ShotwellPublishingCoreServices() {
     }
 
-    public string get_name() {
-        return "Core Publishing Services";
+    public unowned string get_module_name() {
+        return _("Core Publishing Services");
     }
 
-    public string get_version() {
+    public unowned string get_version() {
         return _VERSION;
     }
 
-    public string get_id() {
+    public unowned string get_id() {
         return "org.yorba.shotwell.publishing.core_services";
     }
 
-    public Spit.Pluggable[]? get_pluggables() {
+    public unowned Spit.Pluggable[]? get_pluggables() {
         return pluggables;
     }
 }
@@ -58,7 +58,7 @@ public unowned Spit.Module? spit_entry_point(int host_min_spit_interface, int ho
 
 public void g_module_unload() {
     if (core_services != null)
-        debug("%s %s unloaded", core_services.get_name(), core_services.get_version());
+        debug("%s %s unloaded", core_services.get_module_name(), core_services.get_version());
     else
         debug("core_services unloaded prior to spit_entry_point being called");
 

plugins/shotwell-transitions/CrumbleEffect.vala

@@ -8,11 +8,11 @@
 using Spit;
 
 private class CrumbleEffectDescriptor : ShotwellTransitionDescriptor {
-    public override string get_id() {
+    public override unowned string get_id() {
         return "org.yorba.shotwell.transitions.crumble";
     }
 
-    public override string get_pluggable_name() {
+    public override unowned string get_pluggable_name() {
         return _("Crumble");
     }
 

plugins/shotwell-transitions/FadeEffect.vala

@@ -8,11 +8,11 @@
 using Spit;
 
 private class FadeEffectDescriptor : ShotwellTransitionDescriptor {
-    public override string get_id() {
+    public override unowned string get_id() {
         return "org.yorba.shotwell.transitions.fade";
     }
 
-    public override string get_pluggable_name() {
+    public override unowned string get_pluggable_name() {
         return _("Fade");
     }
 

plugins/shotwell-transitions/SlideEffect.vala

@@ -8,11 +8,11 @@
 using Spit;
 
 private class SlideEffectDescriptor : ShotwellTransitionDescriptor {
-    public override string get_id() {
+    public override unowned string get_id() {
         return "org.yorba.shotwell.transitions.slide";
     }
 
-    public override string get_pluggable_name() {
+    public override unowned string get_pluggable_name() {
         return _("Slide");
     }
 

plugins/shotwell-transitions/shotwell-transitions.vala

@@ -15,24 +15,24 @@ private class ShotwellTransitions : Object, Spit.Module {
         pluggables += new CrumbleEffectDescriptor();
     }
 
-    public string get_name() {
-        return "Shotwell Transitions";
+    public unowned string get_module_name() {
+        return _("Core Slideshow Transitions");
     }
 
-    public string get_version() {
+    public unowned string get_version() {
         return _VERSION;
     }
 
-    public string get_id() {
+    public unowned string get_id() {
         return "org.yorba.shotwell.transitions";
     }
 
-    public Spit.Pluggable[]? get_pluggables() {
+    public unowned Spit.Pluggable[]? get_pluggables() {
         return pluggables;
     }
 }
 
-private ShotwellTransitions? spitwad = null;
+private ShotwellTransitions? module = null;
 
 // This entry point is required for all SPIT modules.
 public unowned Spit.Module? spit_entry_point(int host_min_spit_interface, int host_max_spit_interface,
@@ -42,19 +42,19 @@ public unowned Spit.Module? spit_entry_point(int host_min_spit_interface, int ho
     if (module_spit_interface == Spit.UNSUPPORTED_INTERFACE)
         return null;
 
-    if (spitwad == null)
-        spitwad = new ShotwellTransitions();
+    if (module == null)
+        module = new ShotwellTransitions();
 
-    return spitwad;
+    return module;
 }
 
 public void g_module_unload() {
-    if (spitwad != null)
-        debug("%s %s unloaded", spitwad.get_name(), spitwad.get_version());
+    if (module != null)
+        debug("%s %s unloaded", module.get_module_name(), module.get_version());
     else
         debug("spitter unloaded prior to spit_entry_point being called");
 
-    spitwad = null;
+    module = null;
 }
 
 // This is here to keep valac happy.
@@ -68,9 +68,9 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
             Spit.Transitions.CURRENT_INTERFACE);
     }
 
-    public abstract string get_id();
+    public abstract unowned string get_id();
 
-    public abstract string get_pluggable_name();
+    public abstract unowned string get_pluggable_name();
 
     public void get_info(out Spit.PluggableInfo info) {
         info.authors = "Maxim Kartashev, Jim Nelson";
@@ -84,6 +84,9 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
         info.website_url = "http://www.yorba.org";
     }
 
+    public void activation(bool enabled) {
+    }
+    
     public abstract Spit.Transitions.Effect create(Spit.HostInterface host);
 }
 

src/Config.vala

@@ -269,8 +269,19 @@ public class Config {
         return get_int("/apps/shotwell/sharing/picasa/default_size", 3) - 1;
     }
 
-    private string make_plugin_path(string domain, string id, string key) {
-        return "%s/%s/%s/%s".printf(PATH_SHOTWELL, domain, id, key);
+    public static string? clean_plugin_id(string id) {
+        string cleaned = id.replace("/", "_");
+        cleaned = cleaned.strip();
+        
+        return !is_string_empty(cleaned) ? cleaned : null;
+    }
+    
+    private static string make_plugin_path(string domain, string id, string key) {
+        string? cleaned_id = clean_plugin_id(id);
+        if (cleaned_id == null)
+            cleaned_id = "default";
+        
+        return "%s/%s/%s/%s".printf(PATH_SHOTWELL, domain, cleaned_id, key);
     }
 
     public bool get_plugin_bool(string domain, string id, string key, bool def) {
@@ -309,6 +320,14 @@ public class Config {
         unset(make_plugin_path(domain, id, key));
     }
 
+    public bool is_plugin_enabled(string id, bool def) {
+        return get_bool("/apps/shotwell/plugins/%s/enabled".printf(clean_plugin_id(id)), def);
+    }
+    
+    public void set_plugin_enabled(string id, bool enabled) {
+        set_bool("/apps/shotwell/plugins/%s/enabled".printf(clean_plugin_id(id)), enabled);
+    }
+    
     public string? get_publishing_string(string domain, string key, string? default_value = null) {
         return get_string("/apps/shotwell/sharing/%s/%s".printf(domain, key), default_value);
     }

src/Dialogs.vala

@@ -1663,6 +1663,7 @@ public class PreferencesDialog {
     } 
 
     private static PreferencesDialog preferences_dialog;
+    
     private Gtk.Dialog dialog;
     private Gtk.Builder builder;
     private Gtk.Adjustment bg_color_adjustment;
@@ -1681,16 +1682,17 @@ public class PreferencesDialog {
     private GLib.DateTime example_date = new GLib.DateTime.local(2009, 3, 10, 18, 16, 11);
     private Gtk.CheckButton lowercase;
     private Gtk.Button close_button;
+    private Plugins.ManifestWidgetMediator plugins_mediator = new Plugins.ManifestWidgetMediator();
 
     private PreferencesDialog() {
         builder = AppWindow.create_builder();
-
+        
         dialog = builder.get_object("preferences_dialog") as Gtk.Dialog;
         dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
         dialog.set_transient_for(AppWindow.get_instance());
         dialog.delete_event.connect(on_delete);
         dialog.response.connect(on_close);
-
+        
         bg_color_adjustment = builder.get_object("bg_color_adjustment") as Gtk.Adjustment;
         bg_color_adjustment.set_value(bg_color_adjustment.get_upper() - 
             Config.get_instance().get_bg_color().red);
@@ -1726,7 +1728,10 @@ public class PreferencesDialog {
 
         lowercase = builder.get_object("lowercase") as Gtk.CheckButton;
         lowercase.toggled.connect(on_lowercase_toggled);
-
+        
+        Gtk.Bin plugin_manifest_container = builder.get_object("plugin-manifest-bin") as Gtk.Bin;
+        plugin_manifest_container.add(plugins_mediator.widget);
+        
         populate_preference_options();
 
         photo_editor_combo.changed.connect(on_photo_editor_changed);

src/Resources.vala

@@ -66,7 +66,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ENHANCE = "shotwell-auto-enhance";
     public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
     public const string PUBLISH = "applications-internet";
-    public const string MERGE = "shotwell-merge-events";   
+    public const string MERGE = "shotwell-merge-events";
 
     public const string ICON_APP = "shotwell.svg";
     public const string ICON_APP16 = "shotwell-16.svg";
@@ -673,6 +673,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return noninterpretable_badge_pixbuf;
     }
 
+    public Gtk.IconTheme get_icon_theme_engine() {
+        Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
+        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
+        
+        return icon_theme;
+    }
+    
     // This method returns a reference to a cached pixbuf that may be shared throughout the system.
     // If the pixbuf is to be modified, make a copy of it.
     public Gdk.Pixbuf? get_icon(string name, int scale = DEFAULT_ICON_SCALE) {

src/Sidebar.vala

@@ -122,14 +122,14 @@ public class Sidebar : Gtk.TreeView {
 
         popup_menu.connect(on_context_menu_keypress);
 
-        icon_theme = Gtk.IconTheme.get_default();
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
+        icon_theme = Resources.get_icon_theme_engine();
         icon_theme.changed.connect(on_theme_change);
     }
 
     ~Sidebar() {
         text.editing_canceled.disconnect(on_editing_canceled);
         text.editing_started.disconnect(on_editing_started);
+        icon_theme.changed.disconnect(on_theme_change);
     }
 
     public void place_cursor(SidebarPage page) {

src/WebConnectors.vala

@@ -1239,16 +1239,23 @@ public class ServiceFactory {
         string, ServiceCapabilities>();
 
     private ServiceFactory() {
+        load_wrapped_services();
+        Publishing.Glue.GlueFactory.get_instance().wrapped_services_changed.connect(
+            load_wrapped_services);
+    }
+    
+    private void load_wrapped_services() {
+        caps_map.clear();
+        
+        // in addition to the baked-in services above, add services dynamically loaded from
+        // plugins. since everything involving plugins is written in terms of the new publishing
+        // API, we have to use the glue code.
         add_caps(new FlickrConnector.Capabilities());
         add_caps(new YandexConnector.Capabilities());
         add_caps(new YouTubeConnector.Capabilities());
         add_caps(new PiwigoConnector.Capabilities());
 
-        // in addition to the baked-in services above, add services dynamically loaded from
-        // plugins. since everything involving plugins is written in terms of the new publishing
-        // API, we have to use the glue code.
-        Publishing.Glue.GlueFactory glue_factory = Publishing.Glue.GlueFactory.get_instance();
-        ServiceCapabilities[] caps = glue_factory.get_wrapped_services();
+        ServiceCapabilities[] caps = Publishing.Glue.GlueFactory.get_instance().get_wrapped_services();
         foreach (ServiceCapabilities current_caps in caps)
             add_caps(current_caps);
     }