- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, - Picasa (Google Plus), and more. -
-Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.
diff --git a/misc/shotwell.convert b/misc/shotwell.convert index 2f972c1..c8d4ee2 100644 --- a/misc/shotwell.convert +++ b/misc/shotwell.convert @@ -65,29 +65,11 @@ default-service = /apps/shotwell/sharing/default_service last-used-service = /apps/shotwell/sharing/last_used_service [org.yorba.shotwell.plugins.enable-state] -publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled -publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled -publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled -publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled -publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled -[org.yorba.shotwell.sharing.facebook] -uid = /apps/shotwell/sharing/facebook/uid -user-name = /apps/shotwell/sharing/facebook/user_name -default-size = /apps/shotwell/sharing/facebook/default_size - -[org.yorba.shotwell.sharing.flickr] -default-size = /apps/shotwell/sharing/flickr/default_size -visibility = /apps/shotwell/sharing/flickr/visibility - -[org.yorba.shotwell.sharing.picasa] -default-size = /apps/shotwell/sharing/picasa/default_size -last-album = /apps/shotwell/sharing/picasa/last_album - [org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username @@ -95,11 +77,3 @@ password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level - -[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] -auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token - -[org.yorba.shotwell.sharing.youtube] -user-name = /apps/shotwell/sharing/youtube/user_name -auth-token = /apps/shotwell/sharing/youtube/auth_token - diff --git a/misc/shotwell.desktop.head b/misc/shotwell.desktop.head index 09ca9ed..b85f3c6 100644 --- a/misc/shotwell.desktop.head +++ b/misc/shotwell.desktop.head @@ -3,7 +3,7 @@ Version=1.0 Name=Shotwell GenericName=Photo Manager Comment=Organize your photos -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;facebook;flickr;picasa;youtube;piwigo; +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;piwigo; Exec=shotwell %U Icon=shotwell Terminal=false diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala index d9bf2ce..9d47cf8 100644 --- a/plugins/common/RESTSupport.vala +++ b/plugins/common/RESTSupport.vala @@ -652,10 +652,6 @@ public abstract class BatchUploader { return session; } - protected Spit.Publishing.Publishable get_current_publishable() { - return publishables[current_file]; - } - protected abstract Transaction create_transaction(Spit.Publishing.Publishable publishable); public void upload(Spit.Publishing.ProgressCallback? status_updated = null) { diff --git a/plugins/plugins.mk b/plugins/plugins.mk index 687ceeb..ab82aed 100644 --- a/plugins/plugins.mk +++ b/plugins/plugins.mk @@ -6,32 +6,16 @@ PLUGINS := \ shotwell-data-imports PLUGINS_RC := \ - plugins/shotwell-publishing/facebook.png \ - plugins/shotwell-publishing/facebook_publishing_options_pane.glade \ - plugins/shotwell-publishing/flickr.png \ - plugins/shotwell-publishing/flickr_publishing_options_pane.glade \ - plugins/shotwell-publishing/flickr_pin_entry_pane.glade \ - plugins/shotwell-publishing/picasa.png \ - plugins/shotwell-publishing/picasa_publishing_options_pane.glade \ - plugins/shotwell-publishing/youtube.png \ - plugins/shotwell-publishing/youtube_publishing_options_pane.glade \ plugins/shotwell-publishing/piwigo.png \ plugins/shotwell-publishing/piwigo_authentication_pane.glade \ plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \ plugins/shotwell-transitions/slideshow-plugin.png -EXTRA_PLUGINS := \ - shotwell-publishing-extras - EXTRA_PLUGINS_RC := \ - plugins/shotwell-publishing-extras/yandex_publish_model.glade \ plugins/shotwell-data-imports/f-spot-24.png \ plugins/shotwell-publishing-extras/gallery3.png \ plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade \ plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade \ - plugins/shotwell-publishing-extras/tumblr.png \ - plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \ - plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade \ plugins/shotwell-publishing-extras/rajce.png \ plugins/shotwell-publishing-extras/rajce_authentication_pane.glade \ plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile index 607bc6b..40071ba 100644 --- a/plugins/shotwell-publishing/Makefile +++ b/plugins/shotwell-publishing/Makefile @@ -13,25 +13,12 @@ PLUGIN_PKGS := \ SRC_FILES := \ shotwell-publishing.vala \ - FacebookPublishing.vala \ - PicasaPublishing.vala \ - FlickrPublishing.vala \ - YouTubePublishing.vala \ PiwigoPublishing.vala RC_FILES := \ - facebook.png \ - facebook_publishing_options_pane.glade \ - flickr.png \ - flickr_publishing_options_pane.glade \ - flickr_pin_entry_pane.glade \ - picasa.png \ - picasa_publishing_options_pane.glade \ piwigo.png \ piwigo_authentication_pane.glade \ - piwigo_publishing_options_pane.glade \ - youtube.png \ - youtube_publishing_options_pane.glade + piwigo_publishing_options_pane.glade include ../Makefile.plugin.mk diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala index bbd5ddb..342f2f3 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.vala +++ b/plugins/shotwell-publishing/shotwell-publishing.vala @@ -6,7 +6,7 @@ extern const string _VERSION; -// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube +// "core services" is: Piwigo private class ShotwellPublishingCoreServices : Object, Spit.Module { private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; @@ -15,10 +15,6 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module { public ShotwellPublishingCoreServices(GLib.File module_file) { GLib.File resource_directory = module_file.get_parent(); - pluggables += new FacebookService(resource_directory); - pluggables += new PicasaService(resource_directory); - pluggables += new FlickrService(resource_directory); - pluggables += new YouTubeService(resource_directory); pluggables += new PiwigoService(resource_directory); } diff --git a/po/POTFILES.in b/po/POTFILES.in index d83fed1..9c9bd89 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,29 +17,15 @@ plugins/shotwell-data-imports/SqliteSupport.vala plugins/shotwell-data-imports/VersionNumber.vala plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala -plugins/shotwell-publishing-extras/TumblrPublishing.vala -plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade -[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade -[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_authentication_pane.glade [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade -[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade -plugins/shotwell-publishing/FacebookPublishing.vala -plugins/shotwell-publishing/FlickrPublishing.vala -plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala -plugins/shotwell-publishing/YouTubePublishing.vala -[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade -[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade -[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade -[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade [type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade [type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade plugins/shotwell-publishing/shotwell-publishing.vala -[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala index 6f06cba..8936cc9 100644 --- a/src/plugins/PublishingInterfaces.vala +++ b/src/plugins/PublishingInterfaces.vala @@ -8,8 +8,7 @@ * Shotwell Pluggable Publishing API * * The Shotwell Pluggable Publishing API allows you to write plugins that upload - * photos and videos to web services. The Shotwell distribution includes publishing - * support for four core services: Facebook, Flickr, Picasa Web Albums, and YouTube. + * photos and videos to web services. * To enable Shotwell to connect to additional services, developers like you write * publishing plugins, dynamically-loadable shared objects that are linked into the * Shotwell process at runtime. Publishing plugins are just one of several kinds of diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala index 857c8ff..7c67e55 100644 --- a/src/plugins/StandardHostInterface.vala +++ b/src/plugins/StandardHostInterface.vala @@ -22,24 +22,8 @@ public class StandardHostInterface : Object, Spit.HostInterface { private static string parse_key(string id) { // special case: legacy plugins (Web publishers moved into SPIT) have special names // new plugins will use their full ID - switch (id) { - case "org.yorba.shotwell.publishing.facebook": - return "facebook"; - - case "org.yorba.shotwell.publishing.picasa": - return "picasa"; - - case "org.yorba.shotwell.publishing.flickr": - return "flickr"; - - case "org.yorba.shotwell.publishing.youtube": - return "youtube"; - - default: - return id; - } + return id; } - public File get_module_file() { return module_file; }