diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index 313d3e127..eacda6514 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -408,7 +408,7 @@ namespace Greenshot { this.btnSpeechBubble.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnSpeechBubble.Image = ((System.Drawing.Image)(resources.GetObject("btnSpeechBubble.Image"))); this.btnSpeechBubble.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnSpeechBubble.LanguageKey = "editor_drawtextbox"; + this.btnSpeechBubble.Text = "Add speech bubble"; this.btnSpeechBubble.Name = "btnSpeechBubble"; this.btnSpeechBubble.Size = new System.Drawing.Size(22, 20); this.btnSpeechBubble.Click += new System.EventHandler(this.BtnSpeechBubbleClick); @@ -419,7 +419,7 @@ namespace Greenshot { this.btnStepLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnStepLabel.Image = ((System.Drawing.Image)(resources.GetObject("btnStepLabel01.Image"))); this.btnStepLabel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnStepLabel.LanguageKey = "editor_drawtextbox"; + this.btnStepLabel.Text = "Add counter"; this.btnStepLabel.Name = "btnStepLabel"; this.btnStepLabel.Size = new System.Drawing.Size(22, 20); this.btnStepLabel.Click += new System.EventHandler(this.BtnStepLabelClick); diff --git a/Greenshot/Forms/ImageEditorForm.resx b/Greenshot/Forms/ImageEditorForm.resx index 2a5211541..960e81a2d 100644 --- a/Greenshot/Forms/ImageEditorForm.resx +++ b/Greenshot/Forms/ImageEditorForm.resx @@ -1002,6 +1002,9 @@ ..\icons\notification-counter-20.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + 551, 17 diff --git a/Greenshot/releases/additional_files/readme.txt.template b/Greenshot/releases/additional_files/readme.txt.template index fe07d0fde..fdc55acbe 100644 --- a/Greenshot/releases/additional_files/readme.txt.template +++ b/Greenshot/releases/additional_files/readme.txt.template @@ -5,7 +5,16 @@ Apply text and shapes to the screenshot. Offers capture of window, region or ful CHANGE LOG: -@GITDETAILVERSION@ Windows 8.1 & Box bug-fix Release +@READABLEVERSION@ + +Features: +* Added a speech bubble to the editor. +* Added automaticly numbered labels to the editor. +* Added a resize effect with settings window to the editor. +* Added a settings window for the torn-edge effect in the editor. +* Added a settings window for the drop shadow effect in the editor. + +1.1.9.13-g01ce82d Windows 8.1 & Box bug-fix Release Bugs resolved: * Bug #1604,#1631,#1634: Capture problems since update to Windows 8.1 with multiple displays diff --git a/build.ps1 b/build.ps1 index a14532cd8..4237e373e 100644 --- a/build.ps1 +++ b/build.ps1 @@ -30,8 +30,9 @@ $gittag = $gitversion -replace '-.*','' $commitversion = $gitversion -replace ($gittag + '-'),'' -replace '-.*','' $githash = $gitversion -replace '.*-','' $version = $gittag + '.' + $commitversion -$detailversion = $version + '-' + $githash -$readableversion = $gittag + ' build ' + $commitversion + " (" + $githash + ")" +$detailversion = $gittag + '.' + $commitversion + '-' + $githash +$readableversion = $gittag + ' build ' + $commitversion + " (" + $githash + ")" + '-UNSTABLE' +$fileversion = $gittag + '.' + $commitversion + '-UNSTABLE' Function WaitForKey { $x = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") @@ -238,8 +239,8 @@ Function PackageZip { $destinstaller = "$destbase\NO-INSTALLER" # Only remove the zip we are going to create, to prevent adding but keeping the history - if (Test-Path ("$destbase\Greenshot-NO-INSTALLER-$version.zip")) { - Remove-Item "$destbase\Greenshot-NO-INSTALLER-$version.zip" -Confirm:$false + if (Test-Path ("$destbase\Greenshot-NO-INSTALLER-$fileversion.zip")) { + Remove-Item "$destbase\Greenshot-NO-INSTALLER-$fileversion.zip" -Confirm:$false } # Remove the directory to create the files in if (Test-Path ("$destinstaller")) { @@ -276,7 +277,7 @@ Function PackageZip { $zipOutput = "$(get-location)\zip" $zip7 = "$(get-location)\greenshot\tools\7zip\7za.exe" - $arguments = @('a', '-mx9', '-tzip', '-r', "$destbase\Greenshot-NO-INSTALLER-$version.zip", "$destinstaller\*") + $arguments = @('a', '-mx9', '-tzip', '-r', "$destbase\Greenshot-NO-INSTALLER-$fileversion.zip", "$destinstaller\*") echo "Starting $zip7 $arguments" $zipResult = Start-Process -wait -PassThru "$zip7" -ArgumentList $arguments -NoNewWindow -RedirectStandardOutput "$zipOutput.log" -RedirectStandardError "$zipOutput.error" if ($zipResult.ExitCode -ne 0) {