From c0da7b9f39c0c3449462ce06f9187da416581356 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 20 Nov 2013 20:20:46 +0200 Subject: [PATCH] README and version history changes --- Docs/VersionHistory.txt | 29 +++++++++++++++-------------- Docs/license.txt => LICENSE.txt | 0 README.md | 24 +++++++++++++++++++++++- ShareX Setup.iss | 4 ++-- ShareX/Forms/MainForm.cs | 4 +--- Update.xml | 11 ----------- 6 files changed, 41 insertions(+), 31 deletions(-) rename Docs/license.txt => LICENSE.txt (100%) delete mode 100644 Update.xml diff --git a/Docs/VersionHistory.txt b/Docs/VersionHistory.txt index c0d666431..f7f1fd72c 100644 --- a/Docs/VersionHistory.txt +++ b/Docs/VersionHistory.txt @@ -2,23 +2,24 @@ This update is focused on performance improvements and features additions to image effects and watermark. These changes break backward compatibility. Therefore image effects and watermark settings will be reset. -Added new drawings category to image effects for be able to add background, border, checkerboard, image and text (watermark) -Added new image adjustment effects: black & white, polaroid and sepia -Added new image filter effects: edge detect, emboss, gaussian blur, convolution matrix, mean removal, sharpen and smooth -Added new image manipulation effect: crop -Image effects accessible from Tools menu for be able to load image file (or drag and drop image) and save changes -Simplified watermark settings -In task settings be able to choose which FTP account to be used -Allow Jira address with subfolder -Using GitHub API for check updates +* Added new drawings category to image effects for be able to add background, border, checkerboard, image and text (watermark) +* Added new image adjustment effects: black & white, polaroid and sepia +* Added new image filter effects: edge detect, emboss, gaussian blur, convolution matrix, mean removal, sharpen and smooth +* Added new image manipulation effect: crop +* Image effects accessible from Tools menu +* Simplified watermark settings +* In task settings be able to choose which FTP account to be used +* Allow Jira address with subfolder +* Using GitHub API for check updates +* Added remember main window size setting ShareX 8.3 r747 - 2013-11-02 -Tray icon can now report progress percentage -Color picker improvements -Added new After Capture task "Add image effects" in favour of resize, border and shadow -Added hotkey support for Tools (screen color picker, hash check and index folder) and to stop uploading -Added mega.co.nz file uploader support +* Tray icon can now report progress percentage +* Color picker improvements +* Added new After Capture task "Add image effects" in favour of resize, border and shadow +* Added hotkey support for Tools (screen color picker, hash check and index folder) and to stop uploading +* Added mega.co.nz file uploader support ShareX 8.2 r655 – 2013-09-26 diff --git a/Docs/license.txt b/LICENSE.txt similarity index 100% rename from Docs/license.txt rename to LICENSE.txt diff --git a/README.md b/README.md index 451d4b60a..6395522bc 100644 --- a/README.md +++ b/README.md @@ -1 +1,23 @@ -ShareX is an open source program that lets you take screenshots of any selected area with a single key, save them in your clipboard, hard disk or instantly upload them to over 25 different file hosting services. ShareX can capture screenshots with different shapes: rectangle, rounded rectangle, ellipse, triangle, diamond, polygon and also freehand. It can upload images, text files and all other different file types. It is able to capture screenshots with transparency and shadow. The program also supports clipboard upload and drag-and-drop. \ No newline at end of file +#Website: [getsharex.com](http://getsharex.com) + +ShareX is an open source program that lets you take screenshots of any selected area with a single key, save them in your clipboard, hard disk or instantly upload them to over 25 different file hosting services. ShareX can capture screenshots with different shapes: rectangle, rounded rectangle, ellipse, triangle, diamond, polygon and also freehand. It can upload images, text files and all other different file types. It is able to capture screenshots with transparency and shadow. The program also supports clipboard upload and drag-and-drop. + +**Capture methods:** Fullscreen, Active window, Window list, Active monitor, Monitor list, Rectangle, Rectangle + Window, Rounded rectangle, Ellipse, Triangle, Diamond, Polygon, Free hand, Last region, Screen recording (Supports animated gif), Auto capture + +**After capture:** Add image effects, Add watermark, Annotate image, Copy image to clipboard, Print image, Save image to file, Save image to file as, Copy file to clipboard, Copy file path to clipboard, Perform actions, Upload image to host + +**Upload methods:** File upload, Clipboard upload, Drag and drop, Send to from Windows Explorer, Watch folder + +**After upload:** Use URL shortener, Post URL to social networking service, Send URL with Email, Copy URL to clipboard + +**Image uploaders:** imageshack.us, tinypic.com, imgur.com, flickr.com, photobucket.com, picasaweb.google.com, uploadscreenshot.com, twitpic.com, twitsnaps.com, yfrog.com, imm.io, File uploader + +**Text uploaders:** pastebin.com, pastebin.ca, paste2.org, slexy.org, pastee.org, paste.ee, File uploader + +**File uploaders:** dropbox.com, mega.co.nz, Google Drive, rapidshare.com, sendspace.com, minus.com, box.com, ge.tt, localhostr.com, Custom uploader, FTP server, Shared folder, Email + +**URL shorteners:** goo.gl, bit.ly, j.mp, is.gd, tinyurl.com, turl.ca + +**Social networking services:** twitter.com + +**Tools:** Screen color picker, Hash check, Index folder, Image effects \ No newline at end of file diff --git a/ShareX Setup.iss b/ShareX Setup.iss index a72cfacf2..ce4e94e96 100644 --- a/ShareX Setup.iss +++ b/ShareX Setup.iss @@ -28,7 +28,7 @@ DirExistsWarning=no ;InfoBeforeFile=Docs\VersionHistory.txt InternalCompressLevel=ultra64 LanguageDetectionMethod=uilanguage -LicenseFile=Docs\license.txt +LicenseFile=LICENSE.txt MinVersion=0,5.01.2600 OutputBaseFilename={#MyAppName}-{#MyAppVersion}-setup OutputDir=Output\ @@ -58,7 +58,7 @@ Name: "CreateStartupIcon"; Description: "Launch {#MyAppName} automatically at Wi Source: "ShareX\bin\Release\*.exe"; Excludes: *.vshost.exe; DestDir: {app}; Flags: ignoreversion Source: "ShareX\bin\Release\*.dll"; DestDir: {app}; Flags: ignoreversion Source: "ShareX\bin\Release\*.css"; DestDir: {app}; Flags: ignoreversion -Source: "Docs\license.txt"; DestDir: {app}; Flags: ignoreversion +Source: "LICENSE.txt"; DestDir: {app}; Flags: ignoreversion ;Source: "ShareX\bin\Release\*.pdb"; DestDir: {app}; Flags: ignoreversion [Icons] diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 2ef29d0f8..543e6ca2f 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -767,9 +767,7 @@ namespace ShareX private void tsmiImageEffects_Click(object sender, EventArgs e) { - ImageEffectsForm form = new ImageEffectsForm(ShareXResources.Logo); - form.EditorMode(); - form.Show(); + OpenImageEffects(); } private void tsbScreenshotsFolder_Click(object sender, EventArgs e) diff --git a/Update.xml b/Update.xml deleted file mode 100644 index 0303ca0aa..000000000 --- a/Update.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 8.3.0.747 - https://sharex.googlecode.com/files/ShareX-8.3.0.747-setup.exe - 2013-11-02 - - - - \ No newline at end of file