From a9fd3b66b5f4c95eb27b651d6b5061937147ef59 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Sat, 20 Mar 2021 20:28:33 +0100 Subject: [PATCH] Picasa is no longer supported, but Google now has Google Photos. Although it's not working, just rename the filenames from Picasa to Google Photos. --- Greenshot.sln | 2 +- .../Forms/GooglePhotosForm.cs | 6 +- .../Forms/SettingsForm.Designer.cs | 294 +++++++++--------- .../Forms/SettingsForm.cs | 76 ++--- GreenshotGooglePhotosPlugin/GooglePhotos.png | Bin 0 -> 12803 bytes .../GooglePhotosConfiguration.cs | 186 +++++------ .../GooglePhotosDestination.cs | 108 +++---- .../GooglePhotosPlugin.cs | 249 ++++++++------- .../GooglePhotosPlugin.resx | 4 +- .../GooglePhotosUtils.cs | 240 +++++++------- ...hotGooglePhotosPlugin.Credentials.template | 8 +- .../GreenshotGooglePhotosPlugin.csproj | 34 +- .../LanguageKeys.cs | 8 +- .../language_googlephotosplugin-cs-CZ.xml | 56 ++-- .../language_googlephotosplugin-de-DE.xml | 12 +- .../language_googlephotosplugin-en-US.xml | 12 +- .../language_googlephotosplugin-fr-FR.xml | 26 +- .../language_googlephotosplugin-id-ID.xml | 26 +- .../language_googlephotosplugin-it-IT.xml | 64 ++-- .../language_googlephotosplugin-ja-JP.xml | 14 + .../language_googlephotosplugin-kab-DZ.xml | 12 +- .../language_googlephotosplugin-ko-KR.xml | 12 +- .../language_googlephotosplugin-lv-LV.xml | 12 +- .../language_googlephotosplugin-pl-PL.xml | 14 + .../language_googlephotosplugin-pt-PT.xml | 12 +- .../language_googlephotosplugin-ru-RU.xml | 26 +- .../language_googlephotosplugin-sr-RS.xml | 26 +- .../language_googlephotosplugin-sv-SE.xml | 12 +- .../language_googlephotosplugin-uk-UA.xml | 28 +- .../language_googlephotosplugin-zh-CN.xml | 14 + .../language_googlephotosplugin-zh-TW.xml | 14 + .../Properties/AssemblyInfo.cs | 2 +- .../README | 0 .../Languages/language_picasaplugin-ja-JP.xml | 14 - .../Languages/language_picasaplugin-pl-PL.xml | 14 - .../Languages/language_picasaplugin-zh-CN.xml | 14 - .../Languages/language_picasaplugin-zh-TW.xml | 14 - GreenshotPicasaPlugin/Picasa.png | Bin 4954 -> 0 bytes 38 files changed, 829 insertions(+), 836 deletions(-) rename GreenshotPicasaPlugin/Forms/PicasaForm.cs => GreenshotGooglePhotosPlugin/Forms/GooglePhotosForm.cs (85%) rename {GreenshotPicasaPlugin => GreenshotGooglePhotosPlugin}/Forms/SettingsForm.Designer.cs (91%) rename {GreenshotPicasaPlugin => GreenshotGooglePhotosPlugin}/Forms/SettingsForm.cs (86%) create mode 100644 GreenshotGooglePhotosPlugin/GooglePhotos.png rename GreenshotPicasaPlugin/PicasaConfiguration.cs => GreenshotGooglePhotosPlugin/GooglePhotosConfiguration.cs (72%) rename GreenshotPicasaPlugin/PicasaDestination.cs => GreenshotGooglePhotosPlugin/GooglePhotosDestination.cs (75%) rename GreenshotPicasaPlugin/PicasaPlugin.cs => GreenshotGooglePhotosPlugin/GooglePhotosPlugin.cs (68%) rename GreenshotPicasaPlugin/PicasaPlugin.resx => GreenshotGooglePhotosPlugin/GooglePhotosPlugin.resx (96%) rename GreenshotPicasaPlugin/PicasaUtils.cs => GreenshotGooglePhotosPlugin/GooglePhotosUtils.cs (75%) rename GreenshotPicasaPlugin/GreenshotPicasaPlugin.Credentials.template => GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.Credentials.template (83%) rename GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj => GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.csproj (62%) rename {GreenshotPicasaPlugin => GreenshotGooglePhotosPlugin}/LanguageKeys.cs (92%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-cs-CZ.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-cs-CZ.xml (74%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-de-DE.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-de-DE.xml (74%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-en-US.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-en-US.xml (73%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-fr-FR.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-fr-FR.xml (62%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-id-ID.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-id-ID.xml (58%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-it-IT.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-it-IT.xml (73%) create mode 100644 GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ja-JP.xml rename GreenshotPicasaPlugin/Languages/language_picasaplugin-kab-DZ.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-kab-DZ.xml (59%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-ko-KR.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ko-KR.xml (74%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-lv-LV.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-lv-LV.xml (75%) create mode 100644 GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pl-PL.xml rename GreenshotPicasaPlugin/Languages/language_picasaplugin-pt-PT.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pt-PT.xml (73%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-ru-RU.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ru-RU.xml (61%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-sr-RS.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sr-RS.xml (98%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-sv-SE.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sv-SE.xml (73%) rename GreenshotPicasaPlugin/Languages/language_picasaplugin-uk-UA.xml => GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-uk-UA.xml (53%) create mode 100644 GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-CN.xml create mode 100644 GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-TW.xml rename {GreenshotPicasaPlugin => GreenshotGooglePhotosPlugin}/Properties/AssemblyInfo.cs (94%) rename {GreenshotPicasaPlugin => GreenshotGooglePhotosPlugin}/README (100%) delete mode 100644 GreenshotPicasaPlugin/Languages/language_picasaplugin-ja-JP.xml delete mode 100644 GreenshotPicasaPlugin/Languages/language_picasaplugin-pl-PL.xml delete mode 100644 GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-CN.xml delete mode 100644 GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-TW.xml delete mode 100644 GreenshotPicasaPlugin/Picasa.png diff --git a/Greenshot.sln b/Greenshot.sln index 27df62d85..88c120c1c 100644 --- a/Greenshot.sln +++ b/Greenshot.sln @@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotDropboxPlugin", "G EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotFlickrPlugin", "GreenshotFlickrPlugin\GreenshotFlickrPlugin.csproj", "{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotPicasaPlugin", "GreenshotPicasaPlugin\GreenshotPicasaPlugin.csproj", "{1893A2E4-A78A-4713-A8E7-E70058DABEE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotGooglePhotosPlugin", "GreenshotGooglePhotosPlugin\GreenshotGooglePhotosPlugin.csproj", "{1893A2E4-A78A-4713-A8E7-E70058DABEE0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotOfficePlugin", "GreenshotOfficePlugin\GreenshotOfficePlugin.csproj", "{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}" EndProject diff --git a/GreenshotPicasaPlugin/Forms/PicasaForm.cs b/GreenshotGooglePhotosPlugin/Forms/GooglePhotosForm.cs similarity index 85% rename from GreenshotPicasaPlugin/Forms/PicasaForm.cs rename to GreenshotGooglePhotosPlugin/Forms/GooglePhotosForm.cs index cea5a2f35..10b18bebe 100644 --- a/GreenshotPicasaPlugin/Forms/PicasaForm.cs +++ b/GreenshotGooglePhotosPlugin/Forms/GooglePhotosForm.cs @@ -1,5 +1,5 @@ /* - * A Picasa Plugin for Greenshot + * A GooglePhotos Plugin for Greenshot * Copyright (C) 2011 Francis Noel * * For more information see: http://getgreenshot.org/ @@ -20,7 +20,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotPicasaPlugin.Forms { - public class PicasaForm : GreenshotForm { +namespace GreenshotGooglePhotosPlugin.Forms { + public class GooglePhotosForm : GreenshotForm { } } diff --git a/GreenshotPicasaPlugin/Forms/SettingsForm.Designer.cs b/GreenshotGooglePhotosPlugin/Forms/SettingsForm.Designer.cs similarity index 91% rename from GreenshotPicasaPlugin/Forms/SettingsForm.Designer.cs rename to GreenshotGooglePhotosPlugin/Forms/SettingsForm.Designer.cs index 38555c179..cea2b6acf 100644 --- a/GreenshotPicasaPlugin/Forms/SettingsForm.Designer.cs +++ b/GreenshotGooglePhotosPlugin/Forms/SettingsForm.Designer.cs @@ -1,147 +1,147 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -namespace GreenshotPicasaPlugin.Forms { - partial class SettingsForm { - /// - /// Designer variable used to keep track of non-visual components. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Disposes resources used by the form. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing) { - if (components != null) { - components.Dispose(); - } - } - base.Dispose(disposing); - } - - /// - /// This method is required for Windows Forms designer support. - /// Do not change the method contents inside the source code editor. The Forms designer might - /// not be able to load this method if it was changed manually. - /// - private void InitializeComponent() - { - this.buttonOK = new GreenshotPlugin.Controls.GreenshotButton(); - this.buttonCancel = new GreenshotPlugin.Controls.GreenshotButton(); - this.combobox_uploadimageformat = new GreenshotPlugin.Controls.GreenshotComboBox(); - this.label_upload_format = new GreenshotPlugin.Controls.GreenshotLabel(); - this.label_AfterUpload = new GreenshotPlugin.Controls.GreenshotLabel(); - this.checkboxAfterUploadLinkToClipBoard = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.SuspendLayout(); - // - // buttonOK - // - this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOK.LanguageKey = "OK"; - this.buttonOK.Location = new System.Drawing.Point(267, 78); - this.buttonOK.Name = "buttonOK"; - this.buttonOK.Size = new System.Drawing.Size(75, 23); - this.buttonOK.TabIndex = 10; - this.buttonOK.UseVisualStyleBackColor = true; - // - // buttonCancel - // - this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.LanguageKey = "CANCEL"; - this.buttonCancel.Location = new System.Drawing.Point(348, 78); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 11; - this.buttonCancel.UseVisualStyleBackColor = true; - // - // combobox_uploadimageformat - // - this.combobox_uploadimageformat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.combobox_uploadimageformat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.combobox_uploadimageformat.FormattingEnabled = true; - this.combobox_uploadimageformat.Location = new System.Drawing.Point(197, 12); - this.combobox_uploadimageformat.Name = "combobox_uploadimageformat"; - this.combobox_uploadimageformat.PropertyName = "UploadFormat"; - this.combobox_uploadimageformat.SectionName = "Picasa"; - this.combobox_uploadimageformat.Size = new System.Drawing.Size(225, 21); - this.combobox_uploadimageformat.TabIndex = 1; - // - // label_upload_format - // - this.label_upload_format.LanguageKey = "picasa.label_upload_format"; - this.label_upload_format.Location = new System.Drawing.Point(10, 18); - this.label_upload_format.Name = "label_upload_format"; - this.label_upload_format.Size = new System.Drawing.Size(181, 33); - this.label_upload_format.TabIndex = 4; - // - // label_AfterUpload - // - this.label_AfterUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_AfterUpload.LanguageKey = "picasa.label_AfterUpload"; - this.label_AfterUpload.Location = new System.Drawing.Point(10, 51); - this.label_AfterUpload.Name = "label_AfterUpload"; - this.label_AfterUpload.Size = new System.Drawing.Size(181, 29); - this.label_AfterUpload.TabIndex = 8; - // - // checkboxAfterUploadLinkToClipBoard - // - this.checkboxAfterUploadLinkToClipBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.checkboxAfterUploadLinkToClipBoard.LanguageKey = "picasa.label_AfterUploadLinkToClipBoard"; - this.checkboxAfterUploadLinkToClipBoard.Location = new System.Drawing.Point(197, 50); - this.checkboxAfterUploadLinkToClipBoard.Name = "checkboxAfterUploadLinkToClipBoard"; - this.checkboxAfterUploadLinkToClipBoard.PropertyName = "AfterUploadLinkToClipBoard"; - this.checkboxAfterUploadLinkToClipBoard.SectionName = "Picasa"; - this.checkboxAfterUploadLinkToClipBoard.Size = new System.Drawing.Size(104, 17); - this.checkboxAfterUploadLinkToClipBoard.TabIndex = 2; - this.checkboxAfterUploadLinkToClipBoard.UseVisualStyleBackColor = true; - // - // SettingsForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(432, 110); - this.Controls.Add(this.checkboxAfterUploadLinkToClipBoard); - this.Controls.Add(this.label_AfterUpload); - this.Controls.Add(this.label_upload_format); - this.Controls.Add(this.combobox_uploadimageformat); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOK); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.LanguageKey = "picasa.settings_title"; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "SettingsForm"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - private GreenshotPlugin.Controls.GreenshotComboBox combobox_uploadimageformat; - private GreenshotPlugin.Controls.GreenshotLabel label_upload_format; - private GreenshotPlugin.Controls.GreenshotButton buttonCancel; - private GreenshotPlugin.Controls.GreenshotButton buttonOK; - private GreenshotPlugin.Controls.GreenshotLabel label_AfterUpload; - private GreenshotPlugin.Controls.GreenshotCheckBox checkboxAfterUploadLinkToClipBoard; - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +namespace GreenshotGooglePhotosPlugin.Forms { + partial class SettingsForm { + /// + /// Designer variable used to keep track of non-visual components. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Disposes resources used by the form. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing) { + if (components != null) { + components.Dispose(); + } + } + base.Dispose(disposing); + } + + /// + /// This method is required for Windows Forms designer support. + /// Do not change the method contents inside the source code editor. The Forms designer might + /// not be able to load this method if it was changed manually. + /// + private void InitializeComponent() + { + this.buttonOK = new GreenshotPlugin.Controls.GreenshotButton(); + this.buttonCancel = new GreenshotPlugin.Controls.GreenshotButton(); + this.combobox_uploadimageformat = new GreenshotPlugin.Controls.GreenshotComboBox(); + this.label_upload_format = new GreenshotPlugin.Controls.GreenshotLabel(); + this.label_AfterUpload = new GreenshotPlugin.Controls.GreenshotLabel(); + this.checkboxAfterUploadLinkToClipBoard = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.SuspendLayout(); + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.buttonOK.LanguageKey = "OK"; + this.buttonOK.Location = new System.Drawing.Point(267, 78); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(75, 23); + this.buttonOK.TabIndex = 10; + this.buttonOK.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.LanguageKey = "CANCEL"; + this.buttonCancel.Location = new System.Drawing.Point(348, 78); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 11; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // combobox_uploadimageformat + // + this.combobox_uploadimageformat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.combobox_uploadimageformat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combobox_uploadimageformat.FormattingEnabled = true; + this.combobox_uploadimageformat.Location = new System.Drawing.Point(197, 12); + this.combobox_uploadimageformat.Name = "combobox_uploadimageformat"; + this.combobox_uploadimageformat.PropertyName = "UploadFormat"; + this.combobox_uploadimageformat.SectionName = "GooglePhotos"; + this.combobox_uploadimageformat.Size = new System.Drawing.Size(225, 21); + this.combobox_uploadimageformat.TabIndex = 1; + // + // label_upload_format + // + this.label_upload_format.LanguageKey = "googlephotos.label_upload_format"; + this.label_upload_format.Location = new System.Drawing.Point(10, 18); + this.label_upload_format.Name = "label_upload_format"; + this.label_upload_format.Size = new System.Drawing.Size(181, 33); + this.label_upload_format.TabIndex = 4; + // + // label_AfterUpload + // + this.label_AfterUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_AfterUpload.LanguageKey = "googlephotos.label_AfterUpload"; + this.label_AfterUpload.Location = new System.Drawing.Point(10, 51); + this.label_AfterUpload.Name = "label_AfterUpload"; + this.label_AfterUpload.Size = new System.Drawing.Size(181, 29); + this.label_AfterUpload.TabIndex = 8; + // + // checkboxAfterUploadLinkToClipBoard + // + this.checkboxAfterUploadLinkToClipBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkboxAfterUploadLinkToClipBoard.LanguageKey = "googlephotos.label_AfterUploadLinkToClipBoard"; + this.checkboxAfterUploadLinkToClipBoard.Location = new System.Drawing.Point(197, 50); + this.checkboxAfterUploadLinkToClipBoard.Name = "checkboxAfterUploadLinkToClipBoard"; + this.checkboxAfterUploadLinkToClipBoard.PropertyName = "AfterUploadLinkToClipBoard"; + this.checkboxAfterUploadLinkToClipBoard.SectionName = "GooglePhotos"; + this.checkboxAfterUploadLinkToClipBoard.Size = new System.Drawing.Size(104, 17); + this.checkboxAfterUploadLinkToClipBoard.TabIndex = 2; + this.checkboxAfterUploadLinkToClipBoard.UseVisualStyleBackColor = true; + // + // SettingsForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(432, 110); + this.Controls.Add(this.checkboxAfterUploadLinkToClipBoard); + this.Controls.Add(this.label_AfterUpload); + this.Controls.Add(this.label_upload_format); + this.Controls.Add(this.combobox_uploadimageformat); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.LanguageKey = "googlephotos.settings_title"; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "SettingsForm"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + private GreenshotPlugin.Controls.GreenshotComboBox combobox_uploadimageformat; + private GreenshotPlugin.Controls.GreenshotLabel label_upload_format; + private GreenshotPlugin.Controls.GreenshotButton buttonCancel; + private GreenshotPlugin.Controls.GreenshotButton buttonOK; + private GreenshotPlugin.Controls.GreenshotLabel label_AfterUpload; + private GreenshotPlugin.Controls.GreenshotCheckBox checkboxAfterUploadLinkToClipBoard; + } +} diff --git a/GreenshotPicasaPlugin/Forms/SettingsForm.cs b/GreenshotGooglePhotosPlugin/Forms/SettingsForm.cs similarity index 86% rename from GreenshotPicasaPlugin/Forms/SettingsForm.cs rename to GreenshotGooglePhotosPlugin/Forms/SettingsForm.cs index a6691a424..be31f1d44 100644 --- a/GreenshotPicasaPlugin/Forms/SettingsForm.cs +++ b/GreenshotGooglePhotosPlugin/Forms/SettingsForm.cs @@ -1,38 +1,38 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -namespace GreenshotPicasaPlugin.Forms { - /// - /// Description of PasswordRequestForm. - /// - public partial class SettingsForm : PicasaForm { - - public SettingsForm() - { - // - // The InitializeComponent() call is required for Windows Forms designer support. - // - InitializeComponent(); - CancelButton = buttonCancel; - AcceptButton = buttonOK; - } - - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +namespace GreenshotGooglePhotosPlugin.Forms { + /// + /// Description of PasswordRequestForm. + /// + public partial class SettingsForm : GooglePhotosForm { + + public SettingsForm() + { + // + // The InitializeComponent() call is required for Windows Forms designer support. + // + InitializeComponent(); + CancelButton = buttonCancel; + AcceptButton = buttonOK; + } + + } +} diff --git a/GreenshotGooglePhotosPlugin/GooglePhotos.png b/GreenshotGooglePhotosPlugin/GooglePhotos.png new file mode 100644 index 0000000000000000000000000000000000000000..ea7824f9d4fa04499fc4f37b05503b3c5ab2e503 GIT binary patch literal 12803 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 literal 0 HcmV?d00001 diff --git a/GreenshotPicasaPlugin/PicasaConfiguration.cs b/GreenshotGooglePhotosPlugin/GooglePhotosConfiguration.cs similarity index 72% rename from GreenshotPicasaPlugin/PicasaConfiguration.cs rename to GreenshotGooglePhotosPlugin/GooglePhotosConfiguration.cs index 202929459..7e1b614b2 100644 --- a/GreenshotPicasaPlugin/PicasaConfiguration.cs +++ b/GreenshotGooglePhotosPlugin/GooglePhotosConfiguration.cs @@ -1,93 +1,93 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -using System.Windows.Forms; -using GreenshotPlugin.Core; -using System; -using GreenshotPicasaPlugin.Forms; -using GreenshotPlugin.IniFile; - -namespace GreenshotPicasaPlugin { - /// - /// Description of PicasaConfiguration. - /// - [IniSection("Picasa", Description = "Greenshot Picasa Plugin configuration")] - public class PicasaConfiguration : IniSection { - [IniProperty("UploadFormat", Description="What file type to use for uploading", DefaultValue="png")] - public OutputFormat UploadFormat { get; set; } - - [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] - public int UploadJpegQuality { get; set; } - - [IniProperty("AfterUploadLinkToClipBoard", Description = "After upload send Picasa link to clipboard.", DefaultValue = "true")] - public bool AfterUploadLinkToClipBoard { get; set; } - [IniProperty("AddFilename", Description = "Is the filename passed on to Picasa", DefaultValue = "False")] - public bool AddFilename { - get; - set; - } - - [IniProperty("UploadUser", Description = "The Picasa user to upload to", DefaultValue = "default")] - public string UploadUser { - get; - set; - } - - [IniProperty("UploadAlbum", Description = "The Picasa album to upload to", DefaultValue = "default")] - public string UploadAlbum { - get; - set; - } - - [IniProperty("RefreshToken", Description = "Picasa authorization refresh Token", Encrypted = true)] - public string RefreshToken { - get; - set; - } - - /// - /// Not stored - /// - public string AccessToken { - get; - set; - } - - /// - /// Not stored - /// - public DateTimeOffset AccessTokenExpires { - get; - set; - } - - /// - /// A form for token - /// - /// bool true if OK was pressed, false if cancel - public bool ShowConfigDialog() { - DialogResult result = new SettingsForm().ShowDialog(); - if (result == DialogResult.OK) { - return true; - } - return false; - } - - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +using System.Windows.Forms; +using GreenshotPlugin.Core; +using System; +using GreenshotGooglePhotosPlugin.Forms; +using GreenshotPlugin.IniFile; + +namespace GreenshotGooglePhotosPlugin { + /// + /// Description of GooglePhotosConfiguration. + /// + [IniSection("GooglePhotos", Description = "Greenshot GooglePhotos Plugin configuration")] + public class GooglePhotosConfiguration : IniSection { + [IniProperty("UploadFormat", Description="What file type to use for uploading", DefaultValue="png")] + public OutputFormat UploadFormat { get; set; } + + [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] + public int UploadJpegQuality { get; set; } + + [IniProperty("AfterUploadLinkToClipBoard", Description = "After upload send GooglePhotos link to clipboard.", DefaultValue = "true")] + public bool AfterUploadLinkToClipBoard { get; set; } + [IniProperty("AddFilename", Description = "Is the filename passed on to GooglePhotos", DefaultValue = "False")] + public bool AddFilename { + get; + set; + } + + [IniProperty("UploadUser", Description = "The GooglePhotos user to upload to", DefaultValue = "default")] + public string UploadUser { + get; + set; + } + + [IniProperty("UploadAlbum", Description = "The GooglePhotos album to upload to", DefaultValue = "default")] + public string UploadAlbum { + get; + set; + } + + [IniProperty("RefreshToken", Description = "GooglePhotos authorization refresh Token", Encrypted = true)] + public string RefreshToken { + get; + set; + } + + /// + /// Not stored + /// + public string AccessToken { + get; + set; + } + + /// + /// Not stored + /// + public DateTimeOffset AccessTokenExpires { + get; + set; + } + + /// + /// A form for token + /// + /// bool true if OK was pressed, false if cancel + public bool ShowConfigDialog() { + DialogResult result = new SettingsForm().ShowDialog(); + if (result == DialogResult.OK) { + return true; + } + return false; + } + + } +} diff --git a/GreenshotPicasaPlugin/PicasaDestination.cs b/GreenshotGooglePhotosPlugin/GooglePhotosDestination.cs similarity index 75% rename from GreenshotPicasaPlugin/PicasaDestination.cs rename to GreenshotGooglePhotosPlugin/GooglePhotosDestination.cs index 4107ecd48..586a6e842 100644 --- a/GreenshotPicasaPlugin/PicasaDestination.cs +++ b/GreenshotGooglePhotosPlugin/GooglePhotosDestination.cs @@ -1,54 +1,54 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -using System.ComponentModel; -using System.Drawing; -using GreenshotPlugin.Core; -using GreenshotPlugin.Interfaces; - -namespace GreenshotPicasaPlugin { - public class PicasaDestination : AbstractDestination { - private readonly PicasaPlugin _plugin; - public PicasaDestination(PicasaPlugin plugin) { - _plugin = plugin; - } - - public override string Designation => "Picasa"; - - public override string Description => Language.GetString("picasa", LangKey.upload_menu_item); - - public override Image DisplayIcon { - get { - ComponentResourceManager resources = new ComponentResourceManager(typeof(PicasaPlugin)); - return (Image)resources.GetObject("Picasa"); - } - } - - public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) { - ExportInformation exportInformation = new ExportInformation(Designation, Description); - bool uploaded = _plugin.Upload(captureDetails, surface, out var uploadUrl); - if (uploaded) { - exportInformation.ExportMade = true; - exportInformation.Uri = uploadUrl; - } - ProcessExport(exportInformation, surface); - return exportInformation; - } - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +using System.ComponentModel; +using System.Drawing; +using GreenshotPlugin.Core; +using GreenshotPlugin.Interfaces; + +namespace GreenshotGooglePhotosPlugin { + public class GooglePhotosDestination : AbstractDestination { + private readonly GooglePhotosPlugin _plugin; + public GooglePhotosDestination(GooglePhotosPlugin plugin) { + _plugin = plugin; + } + + public override string Designation => "GooglePhotos"; + + public override string Description => Language.GetString("googlephotos", LangKey.upload_menu_item); + + public override Image DisplayIcon { + get { + ComponentResourceManager resources = new ComponentResourceManager(typeof(GooglePhotosPlugin)); + return (Image)resources.GetObject("GooglePhotos"); + } + } + + public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) { + ExportInformation exportInformation = new ExportInformation(Designation, Description); + bool uploaded = _plugin.Upload(captureDetails, surface, out var uploadUrl); + if (uploaded) { + exportInformation.ExportMade = true; + exportInformation.Uri = uploadUrl; + } + ProcessExport(exportInformation, surface); + return exportInformation; + } + } +} diff --git a/GreenshotPicasaPlugin/PicasaPlugin.cs b/GreenshotGooglePhotosPlugin/GooglePhotosPlugin.cs similarity index 68% rename from GreenshotPicasaPlugin/PicasaPlugin.cs rename to GreenshotGooglePhotosPlugin/GooglePhotosPlugin.cs index a8f312484..b5d37f62c 100644 --- a/GreenshotPicasaPlugin/PicasaPlugin.cs +++ b/GreenshotGooglePhotosPlugin/GooglePhotosPlugin.cs @@ -1,125 +1,124 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -using System; -using System.ComponentModel; -using System.Drawing; -using System.IO; -using System.Windows.Forms; -using GreenshotPlugin.Controls; -using GreenshotPlugin.Core; -using GreenshotPlugin.IniFile; -using GreenshotPlugin.Interfaces; -using GreenshotPlugin.Interfaces.Plugin; - -namespace GreenshotPicasaPlugin { - /// - /// This is the Picasa base code - /// - [Plugin("Picasa", true)] - public class PicasaPlugin : IGreenshotPlugin { - private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(PicasaPlugin)); - private static PicasaConfiguration _config; - private ComponentResourceManager _resources; - private ToolStripMenuItem _itemPlugInRoot; - - public void Dispose() { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected void Dispose(bool disposing) { - if (disposing) { - if (_itemPlugInRoot != null) { - _itemPlugInRoot.Dispose(); - _itemPlugInRoot = null; - } - } - } - - /// - /// Implementation of the IGreenshotPlugin.Initialize - /// - public bool Initialize() { - SimpleServiceProvider.Current.AddService(new PicasaDestination(this)); - - // Get configuration - _config = IniConfig.GetIniSection(); - _resources = new ComponentResourceManager(typeof(PicasaPlugin)); - - _itemPlugInRoot = new ToolStripMenuItem - { - Text = Language.GetString("picasa", LangKey.Configure), - Image = (Image) _resources.GetObject("Picasa") - }; - _itemPlugInRoot.Click += ConfigMenuClick; - PluginUtils.AddToContextMenu(_itemPlugInRoot); - Language.LanguageChanged += OnLanguageChanged; - return true; - } - - public void OnLanguageChanged(object sender, EventArgs e) { - if (_itemPlugInRoot != null) { - _itemPlugInRoot.Text = Language.GetString("picasa", LangKey.Configure); - } - } - - public void Shutdown() { - Log.Debug("Picasa Plugin shutdown."); - Language.LanguageChanged -= OnLanguageChanged; - //host.OnImageEditorOpen -= new OnImageEditorOpenHandler(ImageEditorOpened); - } - - /// - /// Implementation of the IPlugin.Configure - /// - public void Configure() { - _config.ShowConfigDialog(); - } - - public void ConfigMenuClick(object sender, EventArgs eventArgs) { - Configure(); - } - - public bool Upload(ICaptureDetails captureDetails, ISurface surfaceToUpload, out string uploadUrl) { - SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(_config.UploadFormat, _config.UploadJpegQuality); - try { - string url = null; - new PleaseWaitForm().ShowAndWait("Picasa", Language.GetString("picasa", LangKey.communication_wait), - delegate - { - string filename = Path.GetFileName(FilenameHelper.GetFilename(_config.UploadFormat, captureDetails)); - url = PicasaUtils.UploadToPicasa(surfaceToUpload, outputSettings, captureDetails.Title, filename); - } - ); - uploadUrl = url; - - if (uploadUrl != null && _config.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(uploadUrl); - } - return true; - } catch (Exception e) { - Log.Error("Error uploading.", e); - MessageBox.Show(Language.GetString("picasa", LangKey.upload_failure) + " " + e.Message); - } - uploadUrl = null; - return false; - } - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +using System; +using System.ComponentModel; +using System.Drawing; +using System.IO; +using System.Windows.Forms; +using GreenshotPlugin.Controls; +using GreenshotPlugin.Core; +using GreenshotPlugin.IniFile; +using GreenshotPlugin.Interfaces; +using GreenshotPlugin.Interfaces.Plugin; + +namespace GreenshotGooglePhotosPlugin { + /// + /// This is the GooglePhotos base code + /// + [Plugin("GooglePhotos", true)] + public class GooglePhotosPlugin : IGreenshotPlugin { + private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(GooglePhotosPlugin)); + private static GooglePhotosConfiguration _config; + private ComponentResourceManager _resources; + private ToolStripMenuItem _itemPlugInRoot; + + public void Dispose() { + Dispose(true); + GC.SuppressFinalize(this); + } + + private void Dispose(bool disposing) + { + if (!disposing) return; + if (_itemPlugInRoot == null) return; + _itemPlugInRoot.Dispose(); + _itemPlugInRoot = null; + } + + /// + /// Implementation of the IGreenshotPlugin.Initialize + /// + public bool Initialize() { + SimpleServiceProvider.Current.AddService(new GooglePhotosDestination(this)); + + // Get configuration + _config = IniConfig.GetIniSection(); + _resources = new ComponentResourceManager(typeof(GooglePhotosPlugin)); + + _itemPlugInRoot = new ToolStripMenuItem + { + Text = Language.GetString("googlephotos", LangKey.Configure), + Image = (Image) _resources.GetObject("GooglePhotos") + }; + _itemPlugInRoot.Click += ConfigMenuClick; + PluginUtils.AddToContextMenu(_itemPlugInRoot); + Language.LanguageChanged += OnLanguageChanged; + return true; + } + + public void OnLanguageChanged(object sender, EventArgs e) { + if (_itemPlugInRoot != null) { + _itemPlugInRoot.Text = Language.GetString("googlephotos", LangKey.Configure); + } + } + + public void Shutdown() { + Log.Debug("GooglePhotos Plugin shutdown."); + Language.LanguageChanged -= OnLanguageChanged; + //host.OnImageEditorOpen -= new OnImageEditorOpenHandler(ImageEditorOpened); + } + + /// + /// Implementation of the IPlugin.Configure + /// + public void Configure() { + _config.ShowConfigDialog(); + } + + public void ConfigMenuClick(object sender, EventArgs eventArgs) { + Configure(); + } + + public bool Upload(ICaptureDetails captureDetails, ISurface surfaceToUpload, out string uploadUrl) { + SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(_config.UploadFormat, _config.UploadJpegQuality); + try { + string url = null; + new PleaseWaitForm().ShowAndWait("GooglePhotos", Language.GetString("googlephotos", LangKey.communication_wait), + delegate + { + string filename = Path.GetFileName(FilenameHelper.GetFilename(_config.UploadFormat, captureDetails)); + url = GooglePhotosUtils.UploadToGooglePhotos(surfaceToUpload, outputSettings, captureDetails.Title, filename); + } + ); + uploadUrl = url; + + if (uploadUrl != null && _config.AfterUploadLinkToClipBoard) { + ClipboardHelper.SetClipboardData(uploadUrl); + } + return true; + } catch (Exception e) { + Log.Error("Error uploading.", e); + MessageBox.Show(Language.GetString("googlephotos", LangKey.upload_failure) + " " + e.Message); + } + uploadUrl = null; + return false; + } + } +} diff --git a/GreenshotPicasaPlugin/PicasaPlugin.resx b/GreenshotGooglePhotosPlugin/GooglePhotosPlugin.resx similarity index 96% rename from GreenshotPicasaPlugin/PicasaPlugin.resx rename to GreenshotGooglePhotosPlugin/GooglePhotosPlugin.resx index de5045226..240e4a53e 100644 --- a/GreenshotPicasaPlugin/PicasaPlugin.resx +++ b/GreenshotGooglePhotosPlugin/GooglePhotosPlugin.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - picasa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + GooglePhotos.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GreenshotPicasaPlugin/PicasaUtils.cs b/GreenshotGooglePhotosPlugin/GooglePhotosUtils.cs similarity index 75% rename from GreenshotPicasaPlugin/PicasaUtils.cs rename to GreenshotGooglePhotosPlugin/GooglePhotosUtils.cs index 637c8aaa3..27aa13d8f 100644 --- a/GreenshotPicasaPlugin/PicasaUtils.cs +++ b/GreenshotGooglePhotosPlugin/GooglePhotosUtils.cs @@ -1,120 +1,120 @@ -/* - * A Picasa Plugin for Greenshot - * Copyright (C) 2011 Francis Noel - * - * For more information see: http://getgreenshot.org/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -using GreenshotPlugin.Core; -using System; -using System.Xml; -using GreenshotPlugin.Core.OAuth; -using GreenshotPlugin.IniFile; -using GreenshotPlugin.Interfaces; -using GreenshotPlugin.Interfaces.Plugin; - -namespace GreenshotPicasaPlugin { - /// - /// Description of PicasaUtils. - /// - public static class PicasaUtils { - private const string PicasaScope = "https://picasaweb.google.com/data/"; - private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(PicasaUtils)); - private static readonly PicasaConfiguration Config = IniConfig.GetIniSection(); - private const string AuthUrl = "https://accounts.google.com/o/oauth2/auth?response_type=code&client_id={ClientId}&redirect_uri={RedirectUrl}&state={State}&scope=" + PicasaScope; - private const string TokenUrl = "https://www.googleapis.com/oauth2/v3/token"; - private const string UploadUrl = "https://picasaweb.google.com/data/feed/api/user/{0}/albumid/{1}"; - - /// - /// Do the actual upload to Picasa - /// - /// Image to upload - /// - /// - /// - /// PicasaResponse - public static string UploadToPicasa(ISurface surfaceToUpload, SurfaceOutputSettings outputSettings, string title, string filename) { - // Fill the OAuth2Settings - var settings = new OAuth2Settings - { - AuthUrlPattern = AuthUrl, - TokenUrl = TokenUrl, - CloudServiceName = "Picasa", - ClientId = PicasaCredentials.ClientId, - ClientSecret = PicasaCredentials.ClientSecret, - AuthorizeMode = OAuth2AuthorizeMode.LocalServer, - RefreshToken = Config.RefreshToken, - AccessToken = Config.AccessToken, - AccessTokenExpires = Config.AccessTokenExpires - }; - - // Copy the settings from the config, which is kept in memory and on the disk - - try { - var webRequest = OAuth2Helper.CreateOAuth2WebRequest(HTTPMethod.POST, string.Format(UploadUrl, Config.UploadUser, Config.UploadAlbum), settings); - if (Config.AddFilename) { - webRequest.Headers.Add("Slug", NetworkHelper.EscapeDataString(filename)); - } - SurfaceContainer container = new SurfaceContainer(surfaceToUpload, outputSettings, filename); - container.Upload(webRequest); - - string response = NetworkHelper.GetResponseAsString(webRequest); - - return ParseResponse(response); - } finally { - // Copy the settings back to the config, so they are stored. - Config.RefreshToken = settings.RefreshToken; - Config.AccessToken = settings.AccessToken; - Config.AccessTokenExpires = settings.AccessTokenExpires; - Config.IsDirty = true; - IniConfig.Save(); - } - } - - /// - /// Parse the upload URL from the response - /// - /// - /// - public static string ParseResponse(string response) { - if (response == null) { - return null; - } - try { - XmlDocument doc = new XmlDocument(); - doc.LoadXml(response); - XmlNodeList nodes = doc.GetElementsByTagName("link", "*"); - if(nodes.Count > 0) { - string url = null; - foreach(XmlNode node in nodes) { - if (node.Attributes != null) { - url = node.Attributes["href"].Value; - string rel = node.Attributes["rel"].Value; - // Pictures with rel="http://schemas.google.com/photos/2007#canonical" are the direct link - if (rel != null && rel.EndsWith("canonical")) { - break; - } - } - } - return url; - } - } catch(Exception e) { - Log.ErrorFormat("Could not parse Picasa response due to error {0}, response was: {1}", e.Message, response); - } - return null; - } - } -} +/* + * A GooglePhotos Plugin for Greenshot + * Copyright (C) 2011 Francis Noel + * + * For more information see: http://getgreenshot.org/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +using GreenshotPlugin.Core; +using System; +using System.Xml; +using GreenshotPlugin.Core.OAuth; +using GreenshotPlugin.IniFile; +using GreenshotPlugin.Interfaces; +using GreenshotPlugin.Interfaces.Plugin; + +namespace GreenshotGooglePhotosPlugin { + /// + /// Description of GooglePhotosUtils. + /// + public static class GooglePhotosUtils { + private const string GooglePhotosScope = "https://picasaweb.google.com/data/"; + private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(GooglePhotosUtils)); + private static readonly GooglePhotosConfiguration Config = IniConfig.GetIniSection(); + private const string AuthUrl = "https://accounts.google.com/o/oauth2/auth?response_type=code&client_id={ClientId}&redirect_uri={RedirectUrl}&state={State}&scope=" + GooglePhotosScope; + private const string TokenUrl = "https://www.googleapis.com/oauth2/v3/token"; + private const string UploadUrl = "https://picasaweb.google.com/data/feed/api/user/{0}/albumid/{1}"; + + /// + /// Do the actual upload to GooglePhotos + /// + /// Image to upload + /// SurfaceOutputSettings + /// string + /// string + /// GooglePhotosResponse + public static string UploadToGooglePhotos(ISurface surfaceToUpload, SurfaceOutputSettings outputSettings, string title, string filename) { + // Fill the OAuth2Settings + var settings = new OAuth2Settings + { + AuthUrlPattern = AuthUrl, + TokenUrl = TokenUrl, + CloudServiceName = "GooglePhotos", + ClientId = GooglePhotosCredentials.ClientId, + ClientSecret = GooglePhotosCredentials.ClientSecret, + AuthorizeMode = OAuth2AuthorizeMode.JsonReceiver, + RefreshToken = Config.RefreshToken, + AccessToken = Config.AccessToken, + AccessTokenExpires = Config.AccessTokenExpires + }; + + // Copy the settings from the config, which is kept in memory and on the disk + + try { + var webRequest = OAuth2Helper.CreateOAuth2WebRequest(HTTPMethod.POST, string.Format(UploadUrl, Config.UploadUser, Config.UploadAlbum), settings); + if (Config.AddFilename) { + webRequest.Headers.Add("Slug", NetworkHelper.EscapeDataString(filename)); + } + SurfaceContainer container = new SurfaceContainer(surfaceToUpload, outputSettings, filename); + container.Upload(webRequest); + + string response = NetworkHelper.GetResponseAsString(webRequest); + + return ParseResponse(response); + } finally { + // Copy the settings back to the config, so they are stored. + Config.RefreshToken = settings.RefreshToken; + Config.AccessToken = settings.AccessToken; + Config.AccessTokenExpires = settings.AccessTokenExpires; + Config.IsDirty = true; + IniConfig.Save(); + } + } + + /// + /// Parse the upload URL from the response + /// + /// + /// + public static string ParseResponse(string response) { + if (response == null) { + return null; + } + try { + XmlDocument doc = new XmlDocument(); + doc.LoadXml(response); + XmlNodeList nodes = doc.GetElementsByTagName("link", "*"); + if(nodes.Count > 0) { + string url = null; + foreach(XmlNode node in nodes) { + if (node.Attributes != null) { + url = node.Attributes["href"].Value; + string rel = node.Attributes["rel"].Value; + // Pictures with rel="http://schemas.google.com/photos/2007#canonical" are the direct link + if (rel != null && rel.EndsWith("canonical")) { + break; + } + } + } + return url; + } + } catch(Exception e) { + Log.ErrorFormat("Could not parse GooglePhotos response due to error {0}, response was: {1}", e.Message, response); + } + return null; + } + } +} diff --git a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.Credentials.template b/GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.Credentials.template similarity index 83% rename from GreenshotPicasaPlugin/GreenshotPicasaPlugin.Credentials.template rename to GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.Credentials.template index 47172f2d4..452922112 100644 --- a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.Credentials.template +++ b/GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.Credentials.template @@ -19,13 +19,13 @@ * along with this program. If not, see . */ -namespace GreenshotPicasaPlugin { +namespace GreenshotGooglePhotosPlugin { /// /// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration. /// You can set your own values here /// - public static class PicasaCredentials { - public static string ClientId = "${Picasa_ClientId}"; - public static string ClientSecret = "${Picasa_ClientSecret}"; + public static class GooglePhotosCredentials { + public static string ClientId = "${GooglePhotos_ClientId}"; + public static string ClientSecret = "${GooglePhotos_ClientSecret}"; } } diff --git a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj b/GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.csproj similarity index 62% rename from GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj rename to GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.csproj index ac827cfec..3fb62aa99 100644 --- a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj +++ b/GreenshotGooglePhotosPlugin/GreenshotGooglePhotosPlugin.csproj @@ -1,21 +1,15 @@ - - - - GreenshotPicasaPlugin - GreenshotPicasaPlugin - - - - - PreserveNewest - - - - - - - - - - + + + + PreserveNewest + + + + + + + + + + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/LanguageKeys.cs b/GreenshotGooglePhotosPlugin/LanguageKeys.cs similarity index 92% rename from GreenshotPicasaPlugin/LanguageKeys.cs rename to GreenshotGooglePhotosPlugin/LanguageKeys.cs index 58a488db5..b91824e7e 100644 --- a/GreenshotPicasaPlugin/LanguageKeys.cs +++ b/GreenshotGooglePhotosPlugin/LanguageKeys.cs @@ -1,5 +1,5 @@ /* - * A Picasa Plugin for Greenshot + * A GooglePhotos Plugin for Greenshot * Copyright (C) 2011 Francis Noel * * For more information see: http://getgreenshot.org/ @@ -16,9 +16,9 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ - -namespace GreenshotPicasaPlugin { + */ + +namespace GreenshotGooglePhotosPlugin { public enum LangKey { upload_menu_item, diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-cs-CZ.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-cs-CZ.xml similarity index 74% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-cs-CZ.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-cs-CZ.xml index 4fe14494b..7168b569c 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-cs-CZ.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-cs-CZ.xml @@ -1,29 +1,29 @@ - - - - Zrušit - Probíhá komunikace s Picasem. Prosím počkejte ... - Konfigurace - Opravdu chcete odstranit obrázek {0} z Picasa? - Odstranit Picasa {0} - Historie - Neplatná oprávnění. Otevřít nastavení pro provedené změn. - Po odeslání - Kopírovat odkaz do schránky - Zobrazit historii - Výchozí velikost - Heslo - Formát obrázku - Jméno - OK - Originál URL - Čtvercové náhledy URL ??? - Webová adresa URL - Nastavení Picasa - Nahrát - Nahrání obrázku do Picasa se nezdařilo: - Nahrát do Picasa - Úspěšně odeslaný obrázek do Picasa! - Prosím ověřit aplikaci Picasa. Otevřít nastavení obrazovky. ??? - + + + + Zrušit + Probíhá komunikace s Picasem. Prosím počkejte ... + Konfigurace + Opravdu chcete odstranit obrázek {0} z GooglePhotos? + Odstranit GooglePhotos {0} + Historie + Neplatná oprávnění. Otevřít nastavení pro provedené změn. + Po odeslání + Kopírovat odkaz do schránky + Zobrazit historii + Výchozí velikost + Heslo + Formát obrázku + Jméno + OK + Originál URL + Čtvercové náhledy URL ??? + Webová adresa URL + Nastavení GooglePhotos + Nahrát + Nahrání obrázku do GooglePhotos se nezdařilo: + Nahrát do GooglePhotos + Úspěšně odeslaný obrázek do GooglePhotos! + Prosím ověřit aplikaci GooglePhotos. Otevřít nastavení obrazovky. ??? + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-de-DE.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-de-DE.xml similarity index 74% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-de-DE.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-de-DE.xml index 6b30f0214..0a437a443 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-de-DE.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-de-DE.xml @@ -8,25 +8,25 @@ Anschliessend - Picasa konfigurieren + GooglePhotos konfigurieren - Hochladen zu Picasa + Hochladen zu GooglePhotos - Picasa Einstellungen + GooglePhotos Einstellungen - Hochladen zu Picasa war erfolgreich ! + Hochladen zu GooglePhotos war erfolgreich ! - Fehler beim Hochladen zu Picasa: + Fehler beim Hochladen zu GooglePhotos: Grafikformat - Übermittle Daten zu Picasa. Bitte warten... + Übermittle Daten zu GooglePhotos. Bitte warten... diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-en-US.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-en-US.xml similarity index 73% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-en-US.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-en-US.xml index e99c84ed7..70ec9f14a 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-en-US.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-en-US.xml @@ -8,25 +8,25 @@ After upload - Configure Picasa + Configure GooglePhotos - Upload to Picasa + Upload to GooglePhotos - Picasa settings + GooglePhotos settings - Successfully uploaded image to Picasa! + Successfully uploaded image to GooglePhotos! - An error occured while uploading to Picasa: + An error occured while uploading to GooglePhotos: Image format - Communicating with Picasa. Please wait... + Communicating with GooglePhotos. Please wait... \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-fr-FR.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-fr-FR.xml similarity index 62% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-fr-FR.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-fr-FR.xml index 589d55613..553d5725e 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-fr-FR.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-fr-FR.xml @@ -1,14 +1,14 @@ - - - - Communication en cours avec Picasa. Veuillez patientez... - Configurer Picasa - Après téléversement - Copier le lien dans le presse-papier - Format image - Paramètres Picasa - Une erreur s'est produite lors du téléversement vers Picasa : - Téléverser vers Picasa - Image téléversée avec succès vers Picasa ! - + + + + Communication en cours avec GooglePhotos. Veuillez patientez... + Configurer GooglePhotos + Après téléversement + Copier le lien dans le presse-papier + Format image + Paramètres GooglePhotos + Une erreur s'est produite lors du téléversement vers GooglePhotos : + Téléverser vers GooglePhotos + Image téléversée avec succès vers GooglePhotos ! + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-id-ID.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-id-ID.xml similarity index 58% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-id-ID.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-id-ID.xml index 5632a3daa..c906bb08e 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-id-ID.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-id-ID.xml @@ -1,14 +1,14 @@ - - - - Menyambungkan ke Picasa. Tunggu sebentar... - Konfigurasi Picasa - Sesudah mengunggah - Sambung ke papanklip - Format gambar - Pengaturan Picasa - Kesalahan terjadi ketika mengunggah ke Picasa: - Unggah ke Picasa - Berhasil mengunggah gambar ke Picasa! - + + + + Menyambungkan ke GooglePhotos. Tunggu sebentar... + Konfigurasi GooglePhotos + Sesudah mengunggah + Sambung ke papanklip + Format gambar + Pengaturan GooglePhotos + Kesalahan terjadi ketika mengunggah ke GooglePhotos: + Unggah ke GooglePhotos + Berhasil mengunggah gambar ke GooglePhotos! + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-it-IT.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-it-IT.xml similarity index 73% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-it-IT.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-it-IT.xml index 6f0b76c78..801e57cfd 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-it-IT.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-it-IT.xml @@ -1,32 +1,32 @@ - - - - - Collegamento agli Appunti - - - Dopo il caricamento - - - Impostazioni Picasa - - - Carica su Picasa - - - Impostazioni Picasa - - - Caricamento immagine su Picasa completato! - - - Si è verificato un errore durante il caricamento su Picasa: - - - Formato immagine - - - Comunicazione con Picasa... - - - + + + + + Collegamento agli Appunti + + + Dopo il caricamento + + + Impostazioni GooglePhotos + + + Carica su GooglePhotos + + + Impostazioni GooglePhotos + + + Caricamento immagine su GooglePhotos completato! + + + Si è verificato un errore durante il caricamento su GooglePhotos: + + + Formato immagine + + + Comunicazione con GooglePhotos... + + + diff --git a/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ja-JP.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ja-JP.xml new file mode 100644 index 000000000..19c1ffc6c --- /dev/null +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ja-JP.xml @@ -0,0 +1,14 @@ + + + + リンクをクリップボードへコピー + アップロード後 + GooglePhotos の設定 + GooglePhotos にアップロード + GooglePhotos の設定 + GooglePhotos へのアップロードに成功しました！ + GooglePhotos へのアップロード中にエラーが発生しました: + 画像フォーマット + GooglePhotos に接続中です。しばらくお待ち下さい... + + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-kab-DZ.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-kab-DZ.xml similarity index 59% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-kab-DZ.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-kab-DZ.xml index 367287108..dd5c784d4 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-kab-DZ.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-kab-DZ.xml @@ -1,14 +1,14 @@ - S tidett tebɣiḍ ad tekkseḍ amazray adigan n Picasa ?... - Swel Picasa + S tidett tebɣiḍ ad tekkseḍ amazray adigan n GooglePhotos ?... + Swel GooglePhotos Ticki yemmed usali Nɣel aseɣwen ɣef afus Amsal n tugna - Iɣewwaṛen Picasa - Teḍra-d tuccḍa deg usali ɣer Picasa : - Sali ɣer Picasa - Tugna tuli ɣer Picasa ! + Iɣewwaṛen GooglePhotos + Teḍra-d tuccḍa deg usali ɣer GooglePhotos : + Sali ɣer GooglePhotos + Tugna tuli ɣer GooglePhotos ! diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ko-KR.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ko-KR.xml similarity index 74% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-ko-KR.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ko-KR.xml index f452a9618..d095f9f72 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ko-KR.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ko-KR.xml @@ -8,25 +8,25 @@ 얼로드 후 - Picasa 설정 + GooglePhotos 설정 - Picasa로 업로드 + GooglePhotos로 업로드 - Picasa 설정 + GooglePhotos 설정 - Picasa로 이미지 업로드 성공! + GooglePhotos로 이미지 업로드 성공! - Picasa로 업로드시 오류 발생: + GooglePhotos로 업로드시 오류 발생: 이미지 형식 - Picasa와 연결 중 잠시 기다리세요... + GooglePhotos와 연결 중 잠시 기다리세요... \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-lv-LV.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-lv-LV.xml similarity index 75% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-lv-LV.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-lv-LV.xml index c33bdc519..7e0e0b8ca 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-lv-LV.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-lv-LV.xml @@ -9,25 +9,25 @@ Pēc augšupielādes - Picasa iestatījumi + GooglePhotos iestatījumi - Augšupieladēt uz Picasa + Augšupieladēt uz GooglePhotos - Picasa iestatījumi + GooglePhotos iestatījumi - Attēls veiksmīgi augšupielādēts uz Picasa! + Attēls veiksmīgi augšupielādēts uz GooglePhotos! - Kļūda augšuplādējot uz Picasa: + Kļūda augšuplādējot uz GooglePhotos: Attēla formāts - Savienojos ar Picasa. Lūdzu uzgaidiet... + Savienojos ar GooglePhotos. Lūdzu uzgaidiet... diff --git a/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pl-PL.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pl-PL.xml new file mode 100644 index 000000000..be521cb06 --- /dev/null +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pl-PL.xml @@ -0,0 +1,14 @@ + + + + Trwa komunikacja z GooglePhotos. Proszę czekać... + Konfiguruj GooglePhotos + Po wysłaniu + Link do schowka + Format obrazów + Ustawienia GooglePhotos + Wystąpił błąd przy wysyłaniu do GooglePhotos: + Wyślij do GooglePhotos + Wysyłanie obrazu do GooglePhotos powiodło się! + + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-pt-PT.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pt-PT.xml similarity index 73% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-pt-PT.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pt-PT.xml index 4649e8005..c3194dad0 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-pt-PT.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-pt-PT.xml @@ -8,25 +8,25 @@ Após enviar - Configurar o Picasa + Configurar o GooglePhotos - enviar para o Picasa + enviar para o GooglePhotos - Definições Picasa + Definições GooglePhotos - Imagem enviada com êxito para o Picasa! + Imagem enviada com êxito para o GooglePhotos! - Ocorreu um erro ao enviar para o Picasa: + Ocorreu um erro ao enviar para o GooglePhotos: Formato da imagem - A comunicar com o Picasa. Por favor aguarde... + A comunicar com o GooglePhotos. Por favor aguarde... \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ru-RU.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ru-RU.xml similarity index 61% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-ru-RU.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ru-RU.xml index 7a273bce7..c7aa0317d 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ru-RU.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-ru-RU.xml @@ -1,14 +1,14 @@ - - - - Обмен данными с Picasa. Подождите... - Настройка Picasa - После загрузки - Ссылки в буфер обмена - Формат изображения - Настройки Picasa - Произошла ошибка при загрузке на Picasa: - Загрузить на Picasa - Изображение успешно загружено на Picasa! - + + + + Обмен данными с GooglePhotos. Подождите... + Настройка GooglePhotos + После загрузки + Ссылки в буфер обмена + Формат изображения + Настройки GooglePhotos + Произошла ошибка при загрузке на GooglePhotos: + Загрузить на GooglePhotos + Изображение успешно загружено на GooglePhotos! + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-sr-RS.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sr-RS.xml similarity index 98% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-sr-RS.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sr-RS.xml index f43494f01..88c045edd 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-sr-RS.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sr-RS.xml @@ -1,14 +1,14 @@ - - - - Комуницирам с Пикасом. Сачекајте… - Поставке Пикасе - Након отпремања: - Веза ка остави - Формат слике: - Поставке Пикасе - Дошло је до грешке при отпремању на Пикасу: - Отпреми на Пикасу - Слика је успешно отпремљена на Пикасу. - + + + + Комуницирам с Пикасом. Сачекајте… + Поставке Пикасе + Након отпремања: + Веза ка остави + Формат слике: + Поставке Пикасе + Дошло је до грешке при отпремању на Пикасу: + Отпреми на Пикасу + Слика је успешно отпремљена на Пикасу. + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-sv-SE.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sv-SE.xml similarity index 73% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-sv-SE.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sv-SE.xml index d3469d802..86a0aec4c 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-sv-SE.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-sv-SE.xml @@ -8,25 +8,25 @@ Vid uppladdning - Konfigurera Picasa + Konfigurera GooglePhotos - Ladda upp till Picasa + Ladda upp till GooglePhotos - Picasa-inställningar + GooglePhotos-inställningar - Skärmdumpen laddades upp till Picasa! + Skärmdumpen laddades upp till GooglePhotos! - Ett fel uppstod vid uppladdning till Picasa: + Ett fel uppstod vid uppladdning till GooglePhotos: Bildformat - Kommunicerar med Picasa. Vänta... + Kommunicerar med GooglePhotos. Vänta... \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-uk-UA.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-uk-UA.xml similarity index 53% rename from GreenshotPicasaPlugin/Languages/language_picasaplugin-uk-UA.xml rename to GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-uk-UA.xml index c1ecd0a4c..9be4ab5b6 100644 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-uk-UA.xml +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-uk-UA.xml @@ -1,14 +1,14 @@ - - - - Посилання в буфер обміну - Після вивантаження - Налаштувати Picasa - Вивантажити на Picasa - Параметри Picasa - Зображення вдало вивантажено на Picasa! - Відбулась помилка під час вивантаження на Picasa: - Формат зображення - З’єднання з Picasa. Будь ласка, зачекайте... - - + + + + Посилання в буфер обміну + Після вивантаження + Налаштувати GooglePhotos + Вивантажити на GooglePhotos + Параметри GooglePhotos + Зображення вдало вивантажено на GooglePhotos! + Відбулась помилка під час вивантаження на GooglePhotos: + Формат зображення + З’єднання з GooglePhotos. Будь ласка, зачекайте... + + diff --git a/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-CN.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-CN.xml new file mode 100644 index 000000000..0323ba38d --- /dev/null +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-CN.xml @@ -0,0 +1,14 @@ + + + + 正在连接到GooglePhotos。请稍后... + 配置 GooglePhotos + 上传之后 + 复制链接到剪贴板 + 图片格式 + GooglePhotos设置 + 上传到GooglePhotos时发生错误： + 上传到GooglePhotos + 图片已成功上传到了GooglePhotos！ + + \ No newline at end of file diff --git a/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-TW.xml b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-TW.xml new file mode 100644 index 000000000..34fa14d3f --- /dev/null +++ b/GreenshotGooglePhotosPlugin/Languages/language_googlephotosplugin-zh-TW.xml @@ -0,0 +1,14 @@ + + + + 正在與 GooglePhotos 通訊，請稍候... + 組態 GooglePhotos + 上傳後 + 連結到剪貼簿 + 圖片格式 + GooglePhotos 設定 + 上傳到 GooglePhotos 時發生錯誤: + 上傳到 GooglePhotos + 上傳圖片到 GooglePhotos 成功! + + \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs b/GreenshotGooglePhotosPlugin/Properties/AssemblyInfo.cs similarity index 94% rename from GreenshotPicasaPlugin/Properties/AssemblyInfo.cs rename to GreenshotGooglePhotosPlugin/Properties/AssemblyInfo.cs index 3a917ddcd..d4fa2878a 100644 --- a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs +++ b/GreenshotGooglePhotosPlugin/Properties/AssemblyInfo.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyDescription("A plugin to upload images to Picasa")] +[assembly: AssemblyDescription("A plugin to upload images to GooglePhotos")] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotPicasaPlugin/README b/GreenshotGooglePhotosPlugin/README similarity index 100% rename from GreenshotPicasaPlugin/README rename to GreenshotGooglePhotosPlugin/README diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ja-JP.xml b/GreenshotPicasaPlugin/Languages/language_picasaplugin-ja-JP.xml deleted file mode 100644 index ac8216e96..000000000 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-ja-JP.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - リンクをクリップボードへコピー - アップロード後 - Picasa の設定 - Picasa にアップロード - Picasa の設定 - Picasa へのアップロードに成功しました！ - Picasa へのアップロード中にエラーが発生しました: - 画像フォーマット - Picasa に接続中です。しばらくお待ち下さい... - - \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-pl-PL.xml b/GreenshotPicasaPlugin/Languages/language_picasaplugin-pl-PL.xml deleted file mode 100644 index c4be12b84..000000000 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-pl-PL.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - Trwa komunikacja z Picasa. Proszę czekać... - Konfiguruj Picasa - Po wysłaniu - Link do schowka - Format obrazów - Ustawienia Picasa - Wystąpił błąd przy wysyłaniu do Picasa: - Wyślij do Picasa - Wysyłanie obrazu do Picasa powiodło się! - - \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-CN.xml b/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-CN.xml deleted file mode 100644 index 38601fc93..000000000 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-CN.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 正在连接到Picasa。请稍后... - 配置 Picasa - 上传之后 - 复制链接到剪贴板 - 图片格式 - Picasa设置 - 上传到Picasa时发生错误： - 上传到Picasa - 图片已成功上传到了Picasa！ - - \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-TW.xml b/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-TW.xml deleted file mode 100644 index a818bc748..000000000 --- a/GreenshotPicasaPlugin/Languages/language_picasaplugin-zh-TW.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 正在與 Picasa 通訊，請稍候... - 組態 Picasa - 上傳後 - 連結到剪貼簿 - 圖片格式 - Picasa 設定 - 上傳到 Picasa 時發生錯誤: - 上傳到 Picasa - 上傳圖片到 Picasa 成功! - - \ No newline at end of file diff --git a/GreenshotPicasaPlugin/Picasa.png b/GreenshotPicasaPlugin/Picasa.png deleted file mode 100644 index 97b70cf86c92763dda7b6b2f4eba92058c4d60e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4954 zcmV-g6Q%5lP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000PqNklGIux}n<)MtIRP0nO zqM&UpJ~ zNkfPVPIu-zXU{o1`~Ci2`%qk33lxtXTV7F7F=c#NS!r%=?kE(*qOqQnO-;>5jvQ%d zKYjWbVEBKw!otF`)vH%OvE!Y0cAxF+jEd)p#Nr~|-6_OkBCac4Jw4GK@4dHs^_n$L z6c!bgUCi9-i++Z~;n9!%=&{GwJo?BFiVBMJ0eUuWVpPq05Q{^<3)Vtr2IS|%v}rJJ z9#maRTW?SIuh#$a_byz`Q+o-?Ov!GYRO4~vMj)^tnPv0f1o>D;$Zn!bLc zm?=|4uAVJ2YqrSOW{OOmE;4Dd$n+Uvzw=!&|JfrVBA@L4^l(+xoNs<^Oo#h;$Fe&f z-1gTuUMWyxi$8tk2u-^>=s0ke+;JfaXH9~eZ=&s^1B~cw$H@*uKtV7ggw9+ z>pweBgfsZ1va)jiOE15)zN2UV3@`?8_)P9({p;RS&OPH?wS3dEHyb(ft-DBTcSIS>u4?IK=v+5$B(Hh&no}n>b2|66Odn!Uv~d}_djrC zXDji}B!N(x+(~=XQ3MDOi}o?{x**?JRYh)Ic)*Prj>Ci}pXBVrtLaX}aYRx=I2RHi zBLnGfBvJD;4}O2e1NjA`%LW82TC(V_JT*G6y}lb2R49k@$Q>M_i3nrn=W_juYX~~Q zVasX!BM%c@w~h|i!_j)+p8$e`1RT7EHz;wA=Pg{k?5=YHg10WXWl_hWZj5VDft2cV z$rrtdjlbt^;*mZCuu35cL^-KvAV{)l z7nA3%oH4p+Oqnxb;)H2Iotcx2c_|ZA3f4fM>0$bvrI$oLP*r)Cr7SlZt3kAjH9pn| zex#jj?{vh?BK_s2gN?jEBx$&YDVl<+` zDvdFq4Oky+w1uMLv8BPx%*;Hm-y5)8dj>Zv%GJv%C@H@JYfL&P6e9AaBF>RpD@Z^g z0!F~t6m+`p$9u>Og+@ABYdq~k0JP`hj)-#g@(N1Ii)rub#q~8Jash@TJ_ltfdu<8#jvg>$-X7?G}tSSZgrGV69D0E(86~ z`(}(m8_-tJ7JQR}HsBdZN;a`rUvIFzt)n^aN1-^t%-g0?kRRqB`_J(F`w8;1EJnL% z2bAOBIL<%_hK6Dw?r9;$7>v!tH$uRGuTsRm1=m81Jlfk%HwRmqTkB&sl9+o-RnBF( znQZ^)3|scQwDt&RO$661LOBjfr34HoVkr550LR1EmVhPgjZ}5HfgH{xvlFLUP9App zB9Y?_jSYvaz@PVZQN2G#Yj={vCwfS@9@_WuJP*(F@O^&(TI*r^etNv``*^-jJdvO` z0)5dmdZ90?oW@gqhax>)O+i5Ksd;~U>5S{D-fg*zmQI)26MY~VIM(2K9w;ZZB?kf* zcwuk|&a>VaEIx_i`9!8(j#Yv-7VR5kR0VrpeRn(H2LV3VyYIEz7S^xp>zo?M)M|z2hhJXF@m^jE`u8(uzH&KIAW5+i)@isjWG^R}36! z1w;T5#HL_VHHa9&8o`RiPx#y#TEO47z4g09qQ7ZC0Khx{+V$*DXI-_pa_ofik2^9T zn1L7{tA)d78+g5SD`XGaUxuznG6;4E1n^<1JC&2&laKA(we#l}97sIR@7(JZmFMbAAbr<(scnDc^@#eqZh8$~vA z*TUP^HziES^$lWeYBDp#vY{au`W}NyUC9EyAo=FjHy^F7uibc2_kxbju8*6KHSV1= zrLd|Xzo?)!(MnCvzae7~xeS3C6#srG>MLR~i>WwW(NMjm`re}_j{fPAuV#UOQ*ce? zwU5uee(wEk;kNvP9HiN4CY}*bNk11rn{sTLva_-$UODZ`J10+>yfCLQXJ#@dnHzIrxQ+`z$cD%@xn%Wc#S&){2OAq2->j{# zt?o~zO6@COPKR?!Zcc7_!Ki{MBlAX