mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 21:43:24 -07:00
Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.
This commit is contained in:
RKrom
parent
2a8e2475d8
commit
a03bc31aef
247 changed files with 6986 additions and 8233 deletions
|
|
@ -56,6 +56,9 @@ namespace GreenshotFlickrPlugin {
|
|||
|
||||
[IniProperty("AfterUploadLinkToClipBoard", Description = "After upload send flickr link to clipboard.", DefaultValue = "true")]
|
||||
public bool AfterUploadLinkToClipBoard;
|
||||
|
||||
[IniProperty("UsePageLink", Description = "Use pagelink instead of direct link on the clipboard", DefaultValue = "False")]
|
||||
public bool UsePageLink;
|
||||
|
||||
[IniProperty("FlickrToken", Description = "The Flickr token", Encrypted = true, ExcludeIfNull = true)]
|
||||
public string FlickrToken;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,12 @@ namespace GreenshotFlickrPlugin {
|
|||
|
||||
public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) {
|
||||
ExportInformation exportInformation = new ExportInformation(this.Designation, this.Description);
|
||||
plugin.Upload(captureDetails, surface, exportInformation);
|
||||
string uploadURL = null;
|
||||
bool uploaded = plugin.Upload(captureDetails, surface, out uploadURL);
|
||||
if (uploaded) {
|
||||
exportInformation.ExportMade = true;
|
||||
exportInformation.Uri = uploadURL;
|
||||
}
|
||||
ProcessExport(exportInformation, surface);
|
||||
return exportInformation;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,8 +123,9 @@ namespace GreenshotFlickrPlugin
|
|||
config.ShowConfigDialog();
|
||||
}
|
||||
|
||||
public void Upload(ICaptureDetails captureDetails, ISurface surface, ExportInformation exportInformation) {
|
||||
public bool Upload(ICaptureDetails captureDetails, ISurface surface, out String uploadUrl) {
|
||||
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(config.UploadFormat, config.UploadJpegQuality, false);
|
||||
uploadUrl = null;
|
||||
try {
|
||||
string flickrUrl = null;
|
||||
new PleaseWaitForm().ShowAndWait(Attributes.Name, Language.GetString("flickr", LangKey.communication_wait),
|
||||
|
|
@ -135,18 +136,19 @@ namespace GreenshotFlickrPlugin
|
|||
);
|
||||
|
||||
if (flickrUrl == null) {
|
||||
exportInformation.ExportMade = false;
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
exportInformation.ExportMade = true;
|
||||
exportInformation.Uri = flickrUrl;
|
||||
uploadUrl = flickrUrl;
|
||||
|
||||
if (config.AfterUploadLinkToClipBoard) {
|
||||
ClipboardHelper.SetClipboardData(flickrUrl);
|
||||
}
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
LOG.Error("Error uploading.", e);
|
||||
MessageBox.Show(Language.GetString("flickr", LangKey.upload_failure) + " " + e.Message);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,21 +68,20 @@ namespace GreenshotFlickrPlugin {
|
|||
}
|
||||
try {
|
||||
IDictionary<string, object> signedParameters = new Dictionary<string, object>();
|
||||
signedParameters.Add("content_type","2"); // Screenshot
|
||||
signedParameters.Add("tags","Greenshot");
|
||||
signedParameters.Add("is_public", config.IsPublic?"1":"0");
|
||||
signedParameters.Add("is_friend", config.IsFriend?"1":"0");
|
||||
signedParameters.Add("is_family", config.IsFamily?"1":"0");
|
||||
signedParameters.Add("content_type", "2"); // Screenshot
|
||||
signedParameters.Add("tags", "Greenshot");
|
||||
signedParameters.Add("is_public", config.IsPublic ? "1" : "0");
|
||||
signedParameters.Add("is_friend", config.IsFriend ? "1" : "0");
|
||||
signedParameters.Add("is_family", config.IsFamily ? "1" : "0");
|
||||
signedParameters.Add("safety_level", string.Format("{0}", (int)config.SafetyLevel));
|
||||
signedParameters.Add("hidden", config.HiddenFromSearch?"1":"2");
|
||||
signedParameters.Add("hidden", config.HiddenFromSearch ? "1" : "2");
|
||||
IDictionary<string, object> otherParameters = new Dictionary<string, object>();
|
||||
otherParameters.Add("photo", new SurfaceContainer(surfaceToUpload, outputSettings, filename));
|
||||
string response = oAuth.MakeOAuthRequest(HTTPMethod.POST, "http://api.flickr.com/services/upload/", signedParameters, otherParameters, null);
|
||||
string photoId = GetPhotoId(response);
|
||||
|
||||
// Get Photo Info
|
||||
signedParameters = new Dictionary<string, object>();
|
||||
signedParameters.Add("photo_id", photoId);
|
||||
signedParameters = new Dictionary<string, object> { { "photo_id", photoId } };
|
||||
string photoInfo = oAuth.MakeOAuthRequest(HTTPMethod.POST, "http://api.flickr.com/services/rest/?method=flickr.photos.getInfo", signedParameters, null, null);
|
||||
return GetUrl(photoInfo);
|
||||
} catch (Exception ex) {
|
||||
|
|
@ -102,9 +101,26 @@ namespace GreenshotFlickrPlugin {
|
|||
try {
|
||||
XmlDocument doc = new XmlDocument();
|
||||
doc.LoadXml(response);
|
||||
XmlNodeList nodes = doc.GetElementsByTagName("url");
|
||||
if(nodes.Count > 0) {
|
||||
return nodes.Item(0).InnerText;
|
||||
if (config.UsePageLink) {
|
||||
XmlNodeList nodes = doc.GetElementsByTagName("url");
|
||||
if (nodes.Count > 0) {
|
||||
return nodes.Item(0).InnerText;
|
||||
}
|
||||
} else {
|
||||
XmlNodeList nodes = doc.GetElementsByTagName("photo");
|
||||
if (nodes.Count > 0) {
|
||||
var item = nodes.Item(0);
|
||||
if (item != null) {
|
||||
if (item.Attributes != null) {
|
||||
string farmId = item.Attributes["farm"].Value;
|
||||
string serverId = item.Attributes["server"].Value;
|
||||
string photoId = item.Attributes["id"].Value;
|
||||
string secret = item.Attributes["secret"].Value;
|
||||
return string.Format("http://farm{0}.staticflickr.com/{1}/{2}_{3}.jpg", farmId, serverId, photoId, secret);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOG.Error("Error parsing Flickr Response.", ex);
|
||||
|
|
@ -117,7 +133,7 @@ namespace GreenshotFlickrPlugin {
|
|||
XmlDocument doc = new XmlDocument();
|
||||
doc.LoadXml(response);
|
||||
XmlNodeList nodes = doc.GetElementsByTagName("photoid");
|
||||
if(nodes.Count > 0) {
|
||||
if (nodes.Count > 0) {
|
||||
return nodes.Item(0).InnerText;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@ copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)bin\$(
|
|||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||
<PreBuildEvent>"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"
|
||||
|
||||
<PreBuildEvent>
|
||||
if exist "$(ProjectDir)FlickrCredentials.private.cs" (
|
||||
rename "$(ProjectDir)FlickrCredentials.cs" "FlickrCredentials.orig.cs"
|
||||
rename "$(ProjectDir)FlickrCredentials.private.cs" "FlickrCredentials.cs"
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
|
||||
<resources>
|
||||
<resource name="buttonAuthenticate">Ověřit</resource>
|
||||
<resource name="CANCEL">Zrušit</resource>
|
||||
<resource name="communication_wait">Komunikace s Flickr. Počkejte prosím...</resource>
|
||||
<resource name="Configure">Konfigurovat</resource>
|
||||
<resource name="delete_question">Jste si jistý, že chcete odstranit obrázek {0} z Flickr?</resource>
|
||||
<resource name="delete_title">Odstranit Flickr {0}</resource>
|
||||
<resource name="family">Rodina</resource>
|
||||
<resource name="FlickrHistory">Flickr historie</resource>
|
||||
<resource name="friend">Přátelé</resource>
|
||||
<resource name="History">Historie</resource>
|
||||
<resource name="label_AfterUpload">Po odeslání</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">Odkaz do schránky</resource>
|
||||
<resource name="label_AfterUploadOpenHistory">Otevřít historii</resource>
|
||||
<resource name="label_AuthToken">Ověření Token</resource>
|
||||
<resource name="label_DefaultSize">Výchozí velikost</resource>
|
||||
<resource name="label_HiddenFromSearch">Skrýt formulář hledání</resource>
|
||||
<resource name="label_SafetyLevel">Úroveň bezpečnosti</resource>
|
||||
<resource name="label_upload_format">Formát obrázku</resource>
|
||||
<resource name="OK">OK</resource>
|
||||
<resource name="public">Veřejné</resource>
|
||||
<resource name="settings_title">Nastavení Flickr</resource>
|
||||
<resource name="TokenNotSet">Prosím ověřit aplikaci Flickr. Otevřít nastavení obrazovky. ???</resource>
|
||||
<resource name="Upload">Odeslat</resource>
|
||||
<resource name="upload_failure">Při odesílání do Flicker došlo k chybě:</resource>
|
||||
<resource name="upload_menu_item">Odeslat do Flickr</resource>
|
||||
<resource name="upload_success">Úspěšně odeslaný obrázek do Flickr!</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
|
||||
<resources>
|
||||
<resource name="buttonAuthenticate">Ověřit</resource>
|
||||
<resource name="CANCEL">Zrušit</resource>
|
||||
<resource name="communication_wait">Komunikace s Flickr. Počkejte prosím...</resource>
|
||||
<resource name="Configure">Konfigurovat</resource>
|
||||
<resource name="delete_question">Jste si jistý, že chcete odstranit obrázek {0} z Flickr?</resource>
|
||||
<resource name="delete_title">Odstranit Flickr {0}</resource>
|
||||
<resource name="family">Rodina</resource>
|
||||
<resource name="FlickrHistory">Flickr historie</resource>
|
||||
<resource name="friend">Přátelé</resource>
|
||||
<resource name="History">Historie</resource>
|
||||
<resource name="label_AfterUpload">Po odeslání</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">Odkaz do schránky</resource>
|
||||
<resource name="label_AfterUploadOpenHistory">Otevřít historii</resource>
|
||||
<resource name="label_AuthToken">Ověření Token</resource>
|
||||
<resource name="label_DefaultSize">Výchozí velikost</resource>
|
||||
<resource name="label_HiddenFromSearch">Skrýt formulář hledání</resource>
|
||||
<resource name="label_SafetyLevel">Úroveň bezpečnosti</resource>
|
||||
<resource name="label_upload_format">Formát obrázku</resource>
|
||||
<resource name="OK">OK</resource>
|
||||
<resource name="public">Veřejné</resource>
|
||||
<resource name="settings_title">Nastavení Flickr</resource>
|
||||
<resource name="TokenNotSet">Prosím ověřit aplikaci Flickr. Otevřít nastavení obrazovky. ???</resource>
|
||||
<resource name="Upload">Odeslat</resource>
|
||||
<resource name="upload_failure">Při odesílání do Flicker došlo k chybě:</resource>
|
||||
<resource name="upload_menu_item">Odeslat do Flickr</resource>
|
||||
<resource name="upload_success">Úspěšně odeslaný obrázek do Flickr!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
Family
|
||||
</resource>
|
||||
<resource name="friend">
|
||||
Fiend
|
||||
Friend
|
||||
</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Bahasa Indonesia" ietf="id-ID" version="1.0.0.0" languagegroup="">
|
||||
<resources>
|
||||
<resource name="communication_wait">Menyambung ke Flickr. Tunggu sebentar...</resource>
|
||||
<resource name="Configure">Konfigurasi Flickr</resource>
|
||||
<resource name="family">Keluarga</resource>
|
||||
<resource name="friend">Teman</resource>
|
||||
<resource name="label_AfterUpload">Sesudah mengunggah</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">Sambung ke papanklip</resource>
|
||||
<resource name="label_HiddenFromSearch">Pencarian form tersembunyi</resource>
|
||||
<resource name="label_SafetyLevel">Tingkat keamanan</resource>
|
||||
<resource name="label_upload_format">Format gambar</resource>
|
||||
<resource name="public">Umum</resource>
|
||||
<resource name="settings_title">Setelan Flickr</resource>
|
||||
<resource name="upload_failure">Kesalahan terjadi ketika mengunggah ke Flickr:</resource>
|
||||
<resource name="upload_menu_item">Unggah ke Flickr</resource>
|
||||
<resource name="upload_success">Berhasil mengunggah gambar ke Flickr!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Polski" ietf="pl-PL" version="1.1.4" languagegroup="2">
|
||||
<resources>
|
||||
<resource name="communication_wait">Trwa komunikacja z Flickr. Proszę czekać...</resource>
|
||||
<resource name="Configure">Konfiguruj Flickr</resource>
|
||||
<resource name="family">Rodzina</resource>
|
||||
<resource name="friend">Przyjaciele</resource>
|
||||
<resource name="label_AfterUpload">Po wysłaniu</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">Link do schowka</resource>
|
||||
<resource name="label_HiddenFromSearch">Ukrywaj z wyszukiwarki</resource>
|
||||
<resource name="label_SafetyLevel">Poziom bezpieczeństwa</resource>
|
||||
<resource name="label_upload_format">Format obrazów</resource>
|
||||
<resource name="public">Publiczny</resource>
|
||||
<resource name="settings_title">Ustawienia Flickr</resource>
|
||||
<resource name="upload_failure">Wystąpił błąd przy wysyłaniu doFlickr:</resource>
|
||||
<resource name="upload_menu_item">Wyślij do Flickr</resource>
|
||||
<resource name="upload_success">Wysyłanie obrazu do Flickr powiodło się!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="communication_wait">正在與 Flickr 通訊，請稍候...</resource>
|
||||
<resource name="Configure">組態 Flickr</resource>
|
||||
<resource name="family">家庭</resource>
|
||||
<resource name="friend">尋找</resource>
|
||||
<resource name="label_AfterUpload">上傳後</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">連結到剪貼簿</resource>
|
||||
<resource name="label_HiddenFromSearch">從搜尋隱藏</resource>
|
||||
<resource name="label_SafetyLevel">安全性等級</resource>
|
||||
<resource name="label_upload_format">圖片格式</resource>
|
||||
<resource name="public">公開</resource>
|
||||
<resource name="settings_title">Flickr 設定</resource>
|
||||
<resource name="upload_failure">上傳到 Flickr 時發生錯誤:</resource>
|
||||
<resource name="upload_menu_item">上傳到 Flickr</resource>
|
||||
<resource name="upload_success">上傳圖片到 Flickr 成功!</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="communication_wait">正在與 Flickr 通訊，請稍候...</resource>
|
||||
<resource name="Configure">組態 Flickr</resource>
|
||||
<resource name="family">家庭</resource>
|
||||
<resource name="friend">尋找</resource>
|
||||
<resource name="label_AfterUpload">上傳後</resource>
|
||||
<resource name="label_AfterUploadLinkToClipBoard">連結到剪貼簿</resource>
|
||||
<resource name="label_HiddenFromSearch">從搜尋隱藏</resource>
|
||||
<resource name="label_SafetyLevel">安全性等級</resource>
|
||||
<resource name="label_upload_format">圖片格式</resource>
|
||||
<resource name="public">公開</resource>
|
||||
<resource name="settings_title">Flickr 設定</resource>
|
||||
<resource name="upload_failure">上傳到 Flickr 時發生錯誤:</resource>
|
||||
<resource name="upload_menu_item">上傳到 Flickr</resource>
|
||||
<resource name="upload_success">上傳圖片到 Flickr 成功!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -51,4 +51,4 @@ using Greenshot.Plugin;
|
|||
//
|
||||
// You can specify all the values or you can use the default the Revision and
|
||||
// Build Numbers by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.1.4.$WCREV$")]
|
||||
[assembly: AssemblyVersion("1.1.6.$WCREV$")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue