github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 14:24:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing .NET 5.0 and some DPI issues and updating the dependencies.

Browse source
This commit is contained in:
Robin 2020-11-17 14:52:05 +01:00
commit f001a42a00
33 changed files with 144 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

4
azure-pipelines.yml
View file

@ -25,10 +25,10 @@ steps:
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1
- task: UseDotNet@2 - task: UseDotNet@2
displayName: 'Use .NET Core sdk 5.0.100-rc.2' displayName: 'Use .NET Core sdk 5.0'
inputs: inputs:
packageType: sdk packageType: sdk
version: 5.0.100-rc.2.20479.15 version: 5.0.100
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: NuGet restore displayName: NuGet restore

2
src/Directory.Build.props
View file

@ -7,7 +7,7 @@
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl> <PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl>
<PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl> <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
<LangVersion>8</LangVersion> <LangVersion>9</LangVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>

2
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -19,6 +19,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CliWrap" Version="3.2.1" /> <PackageReference Include="CliWrap" Version="3.2.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -23,6 +23,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" /> <PackageReference Include="MahApps.Metro" Version="2.3.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Jira" Version="1.0.5" /> <PackageReference Include="Dapplo.Jira" Version="1.1.4" />
<PackageReference Include="Dapplo.Jira.SvgWinForms" Version="1.0.5" /> <PackageReference Include="Dapplo.Jira.SvgWinForms" Version="1.1.4" />
<PackageReference Include="DynamicData" Version="6.16.8" /> <PackageReference Include="DynamicData" Version="6.17.14" />
</ItemGroup> </ItemGroup>
</Project> </Project>

37
src/Greenshot.Addon.Jira/JiraConnector.cs
View file

@ -93,7 +93,6 @@ namespace Greenshot.Addon.Jira
{ {
Task.Run(async () => Task.Run(async () =>
{ {
await LogoutAsync();
_issueTypeBitmapCache.Dispose(); _issueTypeBitmapCache.Dispose();
}).Wait(); }).Wait();
} }
@ -146,7 +145,6 @@ namespace Greenshot.Addon.Jira
/// <returns>Task</returns> /// <returns>Task</returns>
public async Task LoginAsync(CancellationToken cancellationToken = default) public async Task LoginAsync(CancellationToken cancellationToken = default)
{ {
await LogoutAsync(cancellationToken);
try try
{ {
// Get the system name, so the user knows where to login to // Get the system name, so the user knows where to login to
@ -189,39 +187,12 @@ namespace Greenshot.Addon.Jira
} }
} }
/// <summary>
/// End the session, if there was one
/// </summary>
public Task LogoutAsync(CancellationToken cancellationToken = default)
{
if (_jiraClient != null && IsLoggedIn)
{
// TODO: Remove Jira Client?
//_jiraMonitor.Dispose();
IsLoggedIn = false;
}
return Task.CompletedTask;
}
/// <summary>
/// check the login credentials, to prevent timeouts of the session, or makes a login
/// Do not use ConfigureAwait to call this, as it will move await from the UI thread.
/// </summary>
/// <returns></returns>
private Task CheckCredentialsAsync(CancellationToken cancellationToken = default)
{
// TODO: Do we need to do something?
return Task.CompletedTask;
}
/// <summary> /// <summary>
/// Get the favourite filters /// Get the favourite filters
/// </summary> /// </summary>
/// <returns>List with filters</returns> /// <returns>List with filters</returns>
public async Task<IList<Filter>> GetFavoriteFiltersAsync(CancellationToken cancellationToken = default) public async Task<IList<Filter>> GetFavoriteFiltersAsync(CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken);
return await _jiraClient.Filter.GetFavoritesAsync(cancellationToken).ConfigureAwait(false); return await _jiraClient.Filter.GetFavoritesAsync(cancellationToken).ConfigureAwait(false);
} }
@ -233,7 +204,6 @@ namespace Greenshot.Addon.Jira
/// <returns>Issue</returns> /// <returns>Issue</returns>
public async Task<Issue> GetIssueAsync(string issueKey, CancellationToken cancellationToken = default) public async Task<Issue> GetIssueAsync(string issueKey, CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken);
try try
{ {
return await _jiraClient.Issue.GetAsync(issueKey, cancellationToken).ConfigureAwait(false); return await _jiraClient.Issue.GetAsync(issueKey, cancellationToken).ConfigureAwait(false);
@ -254,7 +224,6 @@ namespace Greenshot.Addon.Jira
/// <returns>Task</returns> /// <returns>Task</returns>
public async Task AttachAsync(string issueKey, ISurface surface, string filename = null, CancellationToken cancellationToken = default) public async Task AttachAsync(string issueKey, ISurface surface, string filename = null, CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken).ConfigureAwait(true);
using var memoryStream = new MemoryStream(); using var memoryStream = new MemoryStream();
surface.WriteToStream(memoryStream, _coreConfiguration, _jiraConfiguration); surface.WriteToStream(memoryStream, _coreConfiguration, _jiraConfiguration);
memoryStream.Seek(0, SeekOrigin.Begin); memoryStream.Seek(0, SeekOrigin.Begin);
@ -269,10 +238,9 @@ namespace Greenshot.Addon.Jira
/// <param name="body">text</param> /// <param name="body">text</param>
/// <param name="visibility">the visibility role</param> /// <param name="visibility">the visibility role</param>
/// <param name="cancellationToken">CancellationToken</param> /// <param name="cancellationToken">CancellationToken</param>
public async Task AddCommentAsync(string issueKey, string body, string visibility = null, CancellationToken cancellationToken = default) public async Task AddCommentAsync(string issueKey, string body, CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken); await _jiraClient.Issue.AddCommentAsync(issueKey, body, cancellationToken: cancellationToken).ConfigureAwait(false);
await _jiraClient.Issue.AddCommentAsync(issueKey, body, visibility, cancellationToken).ConfigureAwait(false);
} }
/// <summary> /// <summary>
@ -283,7 +251,6 @@ namespace Greenshot.Addon.Jira
/// <returns></returns> /// <returns></returns>
public async Task<IList<Issue>> SearchAsync(Filter filter, CancellationToken cancellationToken = default) public async Task<IList<Issue>> SearchAsync(Filter filter, CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken);
var searchResult = var searchResult =
await _jiraClient.Issue.SearchAsync(filter.Jql, await _jiraClient.Issue.SearchAsync(filter.Jql,
new Page { MaxResults = 20}, new Page { MaxResults = 20},

4
src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs generated
View file

@ -258,8 +258,8 @@ namespace Greenshot.Addon.LegacyEditor.Controls {
// //
// ColorDialog // ColorDialog
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(584, 404); this.ClientSize = new System.Drawing.Size(584, 404);
this.Controls.Add(this.panelRecentColors); this.Controls.Add(this.panelRecentColors);
this.Controls.Add(this.panelColors); this.Controls.Add(this.panelColors);

10
src/Greenshot.Addon.LegacyEditor/Forms/DropShadowSettingsForm.Designer.cs generated
View file

@ -108,7 +108,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label3 // label3
// //
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(153, 35); this.label3.Location = new System.Drawing.Point(153, 35);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(14, 13); this.label3.Size = new System.Drawing.Size(14, 13);
@ -169,7 +168,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelDarkness // labelDarkness
// //
this.labelDarkness.AutoSize = true;
this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness"; this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness";
this.labelDarkness.Location = new System.Drawing.Point(12, 73); this.labelDarkness.Location = new System.Drawing.Point(12, 73);
this.labelDarkness.Name = "labelDarkness"; this.labelDarkness.Name = "labelDarkness";
@ -178,7 +176,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelOffset // labelOffset
// //
this.labelOffset.AutoSize = true;
this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset"; this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset";
this.labelOffset.Location = new System.Drawing.Point(12, 35); this.labelOffset.Location = new System.Drawing.Point(12, 35);
this.labelOffset.Name = "labelOffset"; this.labelOffset.Name = "labelOffset";
@ -187,7 +184,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelThickness // labelThickness
// //
this.labelThickness.AutoSize = true;
this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness"; this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness";
this.labelThickness.Location = new System.Drawing.Point(12, 9); this.labelThickness.Location = new System.Drawing.Point(12, 9);
this.labelThickness.Name = "labelThickness"; this.labelThickness.Name = "labelThickness";
@ -197,9 +193,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// DropShadowSettingsForm // DropShadowSettingsForm
// //
this.AcceptButton = this.buttonOK; this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.buttonCancel; this.CancelButton = this.buttonCancel;
this.ClientSize = new System.Drawing.Size(230, 154); this.ClientSize = new System.Drawing.Size(230, 154);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.labelThickness); this.Controls.Add(this.labelThickness);

16
src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs generated
View file

@ -213,8 +213,8 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// topToolStripContainer // topToolStripContainer
// //
this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
// //
// topToolStripContainer.BottomToolStripPanel // topToolStripContainer.BottomToolStripPanel
// //
@ -1518,12 +1518,12 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
this.alignRightToolStripMenuItem.LanguageKey = "editor.editor_align_right"; this.alignRightToolStripMenuItem.LanguageKey = "editor.editor_align_right";
this.alignRightToolStripMenuItem.Name = "alignRightToolStripMenuItem"; this.alignRightToolStripMenuItem.Name = "alignRightToolStripMenuItem";
this.alignRightToolStripMenuItem.Tag = System.Drawing.StringAlignment.Far; this.alignRightToolStripMenuItem.Tag = System.Drawing.StringAlignment.Far;
// //
// ImageEditorForm // ImageEditorForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(785, 485); this.ClientSize = new System.Drawing.Size(785, 485);
this.Controls.Add(this.topToolStripContainer); this.Controls.Add(this.topToolStripContainer);
this.KeyPreview = true; this.KeyPreview = true;
this.LanguageKey = "editor.editor_title"; this.LanguageKey = "editor.editor_title";

9
src/Greenshot.Addon.LegacyEditor/Forms/ResizeSettingsForm.Designer.cs generated
View file

@ -79,7 +79,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// checkbox_aspectratio // checkbox_aspectratio
// //
this.checkbox_aspectratio.AutoSize = true;
this.checkbox_aspectratio.LanguageKey = "editor.editor_resize_aspectratio"; this.checkbox_aspectratio.LanguageKey = "editor.editor_resize_aspectratio";
this.checkbox_aspectratio.Location = new System.Drawing.Point(22, 64); this.checkbox_aspectratio.Location = new System.Drawing.Point(22, 64);
this.checkbox_aspectratio.Name = "checkbox_aspectratio"; this.checkbox_aspectratio.Name = "checkbox_aspectratio";
@ -89,7 +88,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label_width // label_width
// //
this.label_width.AutoSize = true;
this.label_width.LanguageKey = "editor.editor_resize_width"; this.label_width.LanguageKey = "editor.editor_resize_width";
this.label_width.Location = new System.Drawing.Point(19, 15); this.label_width.Location = new System.Drawing.Point(19, 15);
this.label_width.Name = "label_width"; this.label_width.Name = "label_width";
@ -98,7 +96,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label_height // label_height
// //
this.label_height.AutoSize = true;
this.label_height.LanguageKey = "editor.editor_resize_height"; this.label_height.LanguageKey = "editor.editor_resize_height";
this.label_height.Location = new System.Drawing.Point(19, 38); this.label_height.Location = new System.Drawing.Point(19, 38);
this.label_height.Name = "label_height"; this.label_height.Name = "label_height";
@ -143,9 +140,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// ResizeSettingsForm // ResizeSettingsForm
// //
this.AcceptButton = this.buttonOK; this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.buttonCancel; this.CancelButton = this.buttonCancel;
this.ClientSize = new System.Drawing.Size(244, 122); this.ClientSize = new System.Drawing.Size(244, 122);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.combobox_height); this.Controls.Add(this.combobox_height);

15
src/Greenshot.Addon.LegacyEditor/Forms/TornEdgeSettingsForm.Designer.cs generated
View file

@ -123,7 +123,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label3 // label3
// //
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(153, 63); this.label3.Location = new System.Drawing.Point(153, 63);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(12, 13); this.label3.Size = new System.Drawing.Size(12, 13);
@ -184,7 +183,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelDarkness // labelDarkness
// //
this.labelDarkness.AutoSize = true;
this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness"; this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness";
this.labelDarkness.Location = new System.Drawing.Point(12, 97); this.labelDarkness.Location = new System.Drawing.Point(12, 97);
this.labelDarkness.Name = "labelDarkness"; this.labelDarkness.Name = "labelDarkness";
@ -194,7 +192,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelOffset // labelOffset
// //
this.labelOffset.AutoSize = true;
this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset"; this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset";
this.labelOffset.Location = new System.Drawing.Point(12, 63); this.labelOffset.Location = new System.Drawing.Point(12, 63);
this.labelOffset.Name = "labelOffset"; this.labelOffset.Name = "labelOffset";
@ -203,7 +200,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelThickness // labelThickness
// //
this.labelThickness.AutoSize = true;
this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness"; this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness";
this.labelThickness.Location = new System.Drawing.Point(12, 37); this.labelThickness.Location = new System.Drawing.Point(12, 37);
this.labelThickness.Name = "labelThickness"; this.labelThickness.Name = "labelThickness";
@ -234,7 +230,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label_toothsize // label_toothsize
// //
this.label_toothsize.AutoSize = true;
this.label_toothsize.LanguageKey = "editor.editor_tornedge_toothsize"; this.label_toothsize.LanguageKey = "editor.editor_tornedge_toothsize";
this.label_toothsize.Location = new System.Drawing.Point(12, 140); this.label_toothsize.Location = new System.Drawing.Point(12, 140);
this.label_toothsize.Name = "label_toothsize"; this.label_toothsize.Name = "label_toothsize";
@ -243,7 +238,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// label_horizontaltoothrange // label_horizontaltoothrange
// //
this.label_horizontaltoothrange.AutoSize = true;
this.label_horizontaltoothrange.LanguageKey = "editor.editor_tornedge_horizontaltoothrange"; this.label_horizontaltoothrange.LanguageKey = "editor.editor_tornedge_horizontaltoothrange";
this.label_horizontaltoothrange.Location = new System.Drawing.Point(12, 166); this.label_horizontaltoothrange.Location = new System.Drawing.Point(12, 166);
this.label_horizontaltoothrange.Name = "label_horizontaltoothrange"; this.label_horizontaltoothrange.Name = "label_horizontaltoothrange";
@ -273,7 +267,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// labelVerticaltoothrange // labelVerticaltoothrange
// //
this.labelVerticaltoothrange.AutoSize = true;
this.labelVerticaltoothrange.LanguageKey = "editor.editor_tornedge_verticaltoothrange"; this.labelVerticaltoothrange.LanguageKey = "editor.editor_tornedge_verticaltoothrange";
this.labelVerticaltoothrange.Location = new System.Drawing.Point(12, 192); this.labelVerticaltoothrange.Location = new System.Drawing.Point(12, 192);
this.labelVerticaltoothrange.Name = "labelVerticaltoothrange"; this.labelVerticaltoothrange.Name = "labelVerticaltoothrange";
@ -351,7 +344,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// shadowCheckbox // shadowCheckbox
// //
this.shadowCheckbox.AutoSize = true;
this.shadowCheckbox.LanguageKey = "editor.editor_tornedge_shadow"; this.shadowCheckbox.LanguageKey = "editor.editor_tornedge_shadow";
this.shadowCheckbox.Location = new System.Drawing.Point(12, 12); this.shadowCheckbox.Location = new System.Drawing.Point(12, 12);
this.shadowCheckbox.Name = "shadowCheckbox"; this.shadowCheckbox.Name = "shadowCheckbox";
@ -362,7 +354,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// //
// all // all
// //
this.all.AutoSize = true;
this.all.LanguageKey = "editor.editor_tornedge_all"; this.all.LanguageKey = "editor.editor_tornedge_all";
this.all.Location = new System.Drawing.Point(251, 12); this.all.Location = new System.Drawing.Point(251, 12);
this.all.Name = "all"; this.all.Name = "all";
@ -374,9 +365,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
// TornEdgeSettingsForm // TornEdgeSettingsForm
// //
this.AcceptButton = this.buttonOK; this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.buttonCancel; this.CancelButton = this.buttonCancel;
this.ClientSize = new System.Drawing.Size(502, 223); this.ClientSize = new System.Drawing.Size(502, 223);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.all); this.Controls.Add(this.all);

2
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -23,6 +23,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" /> <PackageReference Include="MahApps.Metro" Version="2.3.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -22,6 +22,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" /> <PackageReference Include="MahApps.Metro" Version="2.3.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
src/Greenshot.Addons/Controls/BackgroundForm.Designer.cs generated
View file

@ -55,7 +55,6 @@ namespace Greenshot.Addons.Controls
// //
// label_pleasewait // label_pleasewait
// //
this.label_pleasewait.AutoSize = true;
this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill; this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill;
this.label_pleasewait.Location = new System.Drawing.Point(0, 0); this.label_pleasewait.Location = new System.Drawing.Point(0, 0);
this.label_pleasewait.Name = "label_pleasewait"; this.label_pleasewait.Name = "label_pleasewait";
@ -70,12 +69,11 @@ namespace Greenshot.Addons.Controls
// //
this.timer_checkforclose.Interval = 200; this.timer_checkforclose.Interval = 200;
this.timer_checkforclose.Tick += new System.EventHandler(this.Timer_checkforcloseTick); this.timer_checkforclose.Tick += new System.EventHandler(this.Timer_checkforcloseTick);
// //
// BackgroundForm // BackgroundForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(169, 52); this.ClientSize = new System.Drawing.Size(169, 52);
this.ControlBox = true; this.ControlBox = true;
this.Controls.Add(this.label_pleasewait); this.Controls.Add(this.label_pleasewait);

9
src/Greenshot.Addons/Controls/MovableShowColorForm.Designer.cs generated
View file

@ -52,7 +52,6 @@ namespace Greenshot.Addons.Controls
// //
// label1 // label1
// //
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(40, 5); this.label1.Location = new System.Drawing.Point(40, 5);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(37, 13); this.label1.Size = new System.Drawing.Size(37, 13);
@ -69,7 +68,6 @@ namespace Greenshot.Addons.Controls
// //
// label2 // label2
// //
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(2, 37); this.label2.Location = new System.Drawing.Point(2, 37);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(33, 13); this.label2.Size = new System.Drawing.Size(33, 13);
@ -92,7 +90,6 @@ namespace Greenshot.Addons.Controls
// //
// label4 // label4
// //
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(2, 50); this.label4.Location = new System.Drawing.Point(2, 50);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(42, 13); this.label4.Size = new System.Drawing.Size(42, 13);
@ -108,7 +105,6 @@ namespace Greenshot.Addons.Controls
// //
// label6 // label6
// //
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(2, 63); this.label6.Location = new System.Drawing.Point(2, 63);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(34, 13); this.label6.Size = new System.Drawing.Size(34, 13);
@ -124,7 +120,6 @@ namespace Greenshot.Addons.Controls
// //
// label5 // label5
// //
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(2, 76); this.label5.Location = new System.Drawing.Point(2, 76);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(40, 13); this.label5.Size = new System.Drawing.Size(40, 13);
@ -156,8 +151,8 @@ namespace Greenshot.Addons.Controls
// //
this.Visible = false; this.Visible = false;
this.Location = new System.Drawing.Point(-10000,-10000); this.Location = new System.Drawing.Point(-10000,-10000);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(100, 100); this.ClientSize = new System.Drawing.Size(100, 100);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;

14
src/Greenshot.Addons/Controls/PleaseWaitForm.Designer.cs generated
View file

@ -50,7 +50,6 @@ namespace Greenshot.Addons.Controls {
// //
// label_pleasewait // label_pleasewait
// //
this.label_pleasewait.AutoSize = true;
this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill; this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill;
this.label_pleasewait.Location = new System.Drawing.Point(0, 0); this.label_pleasewait.Location = new System.Drawing.Point(0, 0);
this.label_pleasewait.Name = "label_pleasewait"; this.label_pleasewait.Name = "label_pleasewait";
@ -74,13 +73,12 @@ namespace Greenshot.Addons.Controls {
this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.UseVisualStyleBackColor = true;
this.cancelButton.UseWaitCursor = true; this.cancelButton.UseWaitCursor = true;
this.cancelButton.Click += new System.EventHandler(this.CancelButtonClick); this.cancelButton.Click += new System.EventHandler(this.CancelButtonClick);
// //
// PleaseWaitForm // PleaseWaitForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoSize = true; this.CancelButton = this.cancelButton;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(169, 76); this.ClientSize = new System.Drawing.Size(169, 76);
this.Controls.Add(this.cancelButton); this.Controls.Add(this.cancelButton);
this.Controls.Add(this.label_pleasewait); this.Controls.Add(this.label_pleasewait);

11
src/Greenshot.Addons/Controls/QualityDialog.Designer.cs generated
View file

@ -108,19 +108,18 @@ namespace Greenshot.Addons.Controls {
// //
// checkBox_reduceColors // checkBox_reduceColors
// //
this.checkBox_reduceColors.AutoSize = true;
this.checkBox_reduceColors.Location = new System.Drawing.Point(12, 11); this.checkBox_reduceColors.Location = new System.Drawing.Point(12, 11);
this.checkBox_reduceColors.Name = "checkBox_reduceColors"; this.checkBox_reduceColors.Name = "checkBox_reduceColors";
this.checkBox_reduceColors.Size = new System.Drawing.Size(95, 17); this.checkBox_reduceColors.Size = new System.Drawing.Size(95, 17);
this.checkBox_reduceColors.TabIndex = 2; this.checkBox_reduceColors.TabIndex = 2;
this.checkBox_reduceColors.Text = "settings_reducecolors"; this.checkBox_reduceColors.Text = "settings_reducecolors";
this.checkBox_reduceColors.UseVisualStyleBackColor = true; this.checkBox_reduceColors.UseVisualStyleBackColor = true;
// //
// QualityDialog // QualityDialog
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(299, 184); this.ClientSize = new System.Drawing.Size(299, 184);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.checkBox_reduceColors); this.Controls.Add(this.checkBox_reduceColors);
this.Controls.Add(this.button_ok); this.Controls.Add(this.button_ok);

4
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -26,8 +26,8 @@
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.17" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.17" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.17" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.3.0" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
<PackageReference Include="Svg" Version="3.1.1" /> <PackageReference Include="Svg" Version="3.1.1" />
</ItemGroup> </ItemGroup>

10
src/Greenshot.Addons/Views/ExportNotificationView.xaml
View file

@ -7,7 +7,7 @@
xmlns:cal="http://www.caliburnproject.org" xmlns:cal="http://www.caliburnproject.org"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:toasts="clr-namespace:Dapplo.CaliburnMicro.Toasts;assembly=Dapplo.CaliburnMicro.Toasts" xmlns:toasts="clr-namespace:Dapplo.CaliburnMicro.Toasts;assembly=Dapplo.CaliburnMicro.Toasts"
mc:Ignorable="d" Background="{DynamicResource AccentBaseColorBrush}" Width="300" Height="256" Padding="5" mc:Ignorable="d" Background="{DynamicResource MahApps.Brushes.AccentBase}" Width="300" Height="256" Padding="5"
d:DataContext="{d:DesignInstance viewModels:ExportNotificationViewModel,IsDesignTimeCreatable=False}" d:DataContext="{d:DesignInstance viewModels:ExportNotificationViewModel,IsDesignTimeCreatable=False}"
d:DesignHeight="100" d:DesignWidth="200" HorizontalContentAlignment="Stretch" HorizontalAlignment="Right"> d:DesignHeight="100" d:DesignWidth="200" HorizontalContentAlignment="Stretch" HorizontalAlignment="Right">
<toasts:ToastView.Resources> <toasts:ToastView.Resources>
@ -27,7 +27,7 @@
<!-- Top row --> <!-- Top row -->
<Image Source="{Binding GreenshotIcon}" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0"/> <Image Source="{Binding GreenshotIcon}" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0"/>
<TextBlock Text="{Binding Information.DestinationDesignation}" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Light" Foreground="{DynamicResource IdealForegroundColorBrush}" TextWrapping="WrapWithOverflow" Grid.Row="0" Grid.Column="1" /> <TextBlock Text="{Binding Information.DestinationDesignation}" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Light" Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" TextWrapping="WrapWithOverflow" Grid.Row="0" Grid.Column="1" />
<Image Source="{Binding Source.DisplayIconWpf}" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Row="0" Grid.Column="2"/> <Image Source="{Binding Source.DisplayIconWpf}" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Row="0" Grid.Column="2"/>
<!-- Middle row --> <!-- Middle row -->
@ -35,9 +35,9 @@
<Image cal:Message.Attach="[Event MouseDown] = [Action OpenExport()]" Source="{Binding ExportBitmapSource}" Visibility="{Binding Information.IsOk, Converter={StaticResource BooleanToVisibility}}" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" Grid.Row="1" Grid.Column="1"/> <Image cal:Message.Attach="[Event MouseDown] = [Action OpenExport()]" Source="{Binding ExportBitmapSource}" Visibility="{Binding Information.IsOk, Converter={StaticResource BooleanToVisibility}}" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" Grid.Row="1" Grid.Column="1"/>
<!-- Bottom row --> <!-- Bottom row -->
<TextBlock Text="{Binding Information.DestinationDescription}" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Light" Foreground="{DynamicResource IdealForegroundColorBrush}" TextWrapping="WrapWithOverflow" Grid.Row="2" Grid.Column="1" /> <TextBlock Text="{Binding Information.DestinationDescription}" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Light" Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" TextWrapping="WrapWithOverflow" Grid.Row="2" Grid.Column="1" />
<Button x:Name="Configure" ToolTip="Configure" Style="{DynamicResource SquareButtonStyle}" Grid.Row="2" Grid.Column="2" > <Button x:Name="Configure" ToolTip="Configure" Style="{DynamicResource MahApps.Styles.Button.Square}" Grid.Row="2" Grid.Column="2" >
<iconPacks:PackIconMaterial Kind="Settings" /> <iconPacks:PackIconMaterial Kind="Cog" />
</Button> </Button>
</Grid> </Grid>
</toasts:ToastView> </toasts:ToastView>

2
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Addons" Version="1.3.3" /> <PackageReference Include="Dapplo.Addons" Version="1.3.3" />
<PackageReference Include="Dapplo.Log" Version="1.3.26" /> <PackageReference Include="Dapplo.Log" Version="1.4.1" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.17" />
<PackageReference Include="Svg" Version="3.1.1" /> <PackageReference Include="Svg" Version="3.1.1" />
<PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Memory" Version="4.5.4" />

4
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -30,9 +30,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" /> <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="CommandLineParser" Version="2.8.0" /> <PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" /> <PackageReference Include="Dapplo.Log.XUnit" Version="1.4.1" />
<PackageReference Include="Dapplo.Windows" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows" Version="0.11.17" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" /> <PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" /> <PackageReference Include="xunit.analyzers" Version="0.10.0" />

19
src/Greenshot/App.config
View file

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<!--<system.windows.forms jitDebugging="true" />--> <System.Windows.Forms.ApplicationConfigurationSection>
<startup> <add key="DpiAwareness" value="PerMonitorV2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> </System.Windows.Forms.ApplicationConfigurationSection>
</startup> <runtime>
<runtime>
<loadFromRemoteSources enabled="true" /> <loadFromRemoteSources enabled="true" />
<relativeBindForResources enabled="true" /> <relativeBindForResources enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Addons" /> <probing privatePath="Addons" />
<probing privatePath="App\Greenshot" /> <probing privatePath="App\Greenshot" />
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

26
src/Greenshot/FodyWeavers.xsd
View file

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

12
src/Greenshot/Forms/AboutForm.Designer.cs generated
View file

@ -177,12 +177,12 @@ namespace Greenshot.Forms {
this.lblTranslation.Name = "lblTranslation"; this.lblTranslation.Name = "lblTranslation";
this.lblTranslation.Size = new System.Drawing.Size(466, 23); this.lblTranslation.Size = new System.Drawing.Size(466, 23);
this.lblTranslation.TabIndex = 15; this.lblTranslation.TabIndex = 15;
// //
// AboutForm // AboutForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(530, 293); this.ClientSize = new System.Drawing.Size(530, 293);
this.Controls.Add(this.lblTranslation); this.Controls.Add(this.lblTranslation);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.linkLabel1); this.Controls.Add(this.linkLabel1);

12
src/Greenshot/Forms/BugReportForm.Designer.cs generated
View file

@ -96,12 +96,12 @@ namespace Greenshot.Forms {
this.linkLblBugs.TabStop = true; this.linkLblBugs.TabStop = true;
this.linkLblBugs.Text = "http://getgreenshot.org/tickets/"; this.linkLblBugs.Text = "http://getgreenshot.org/tickets/";
this.linkLblBugs.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLblBugsLinkClicked); this.linkLblBugs.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLblBugsLinkClicked);
// //
// BugReportForm // BugReportForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.btnClose; this.CancelButton = this.btnClose;
this.ClientSize = new System.Drawing.Size(528, 452); this.ClientSize = new System.Drawing.Size(528, 452);
this.Controls.Add(this.linkLblBugs); this.Controls.Add(this.linkLblBugs);
this.Controls.Add(this.btnClose); this.Controls.Add(this.btnClose);

13
src/Greenshot/Forms/CaptureForm.Designer.cs generated
View file

@ -52,18 +52,19 @@ namespace Greenshot.Forms {
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown); this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.OnPaint); this.Paint += new System.Windows.Forms.PaintEventHandler(this.OnPaint);
this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp); this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp);
// //
// CaptureForm // CaptureForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(0, 0); this.ClientSize = new System.Drawing.Size(0, 0);
this.Cursor = System.Windows.Forms.Cursors.Cross; this.Cursor = System.Windows.Forms.Cursors.Cross;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "CaptureForm"; this.Name = "CaptureForm";
this.ShowIcon = true; this.ShowIcon = true;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.TopMost = true; this.TopMost = true;
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyDown);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyUp); this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyUp);
this.Visible = false; this.Visible = false;

6
src/Greenshot/Forms/LanguageDialog.Designer.cs generated
View file

@ -72,9 +72,9 @@ namespace Greenshot.Forms {
// LanguageDialog // LanguageDialog
// //
this.AcceptButton = this.btnOK; this.AcceptButton = this.btnOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(390, 77); this.ClientSize = new System.Drawing.Size(390, 77);
this.ControlBox = true; this.ControlBox = true;
this.Controls.Add(this.btnOK); this.Controls.Add(this.btnOK);
this.Controls.Add(this.comboBoxLanguage); this.Controls.Add(this.comboBoxLanguage);

12
src/Greenshot/Forms/MainForm.Designer.cs generated
View file

@ -253,12 +253,12 @@ namespace Greenshot.Forms {
this.backgroundWorkerTimer.Enabled = true; this.backgroundWorkerTimer.Enabled = true;
this.backgroundWorkerTimer.Interval = 300000; this.backgroundWorkerTimer.Interval = 300000;
this.backgroundWorkerTimer.Tick += new System.EventHandler(this.BackgroundWorkerTimerTick); this.backgroundWorkerTimer.Tick += new System.EventHandler(this.BackgroundWorkerTimerTick);
// //
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(0, 0); this.ClientSize = new System.Drawing.Size(0, 0);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.LanguageKey = "application_title"; this.LanguageKey = "application_title";
this.Name = "MainForm"; this.Name = "MainForm";

23
src/Greenshot/Forms/PrintOptionsDialog.Designer.cs generated
View file

@ -71,7 +71,6 @@ namespace Greenshot.Forms
// //
// checkbox_dontaskagain // checkbox_dontaskagain
// //
this.checkbox_dontaskagain.AutoSize = true;
this.checkbox_dontaskagain.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkbox_dontaskagain.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkbox_dontaskagain.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkbox_dontaskagain.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkbox_dontaskagain.LanguageKey = "printoptions_dontaskagain"; this.checkbox_dontaskagain.LanguageKey = "printoptions_dontaskagain";
@ -85,7 +84,6 @@ namespace Greenshot.Forms
// //
// checkboxAllowShrink // checkboxAllowShrink
// //
this.checkboxAllowShrink.AutoSize = true;
this.checkboxAllowShrink.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowShrink.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowShrink.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowShrink.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowShrink.LanguageKey = "printoptions_allowshrink"; this.checkboxAllowShrink.LanguageKey = "printoptions_allowshrink";
@ -100,7 +98,6 @@ namespace Greenshot.Forms
// //
// checkboxAllowEnlarge // checkboxAllowEnlarge
// //
this.checkboxAllowEnlarge.AutoSize = true;
this.checkboxAllowEnlarge.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowEnlarge.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowEnlarge.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowEnlarge.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowEnlarge.LanguageKey = "printoptions_allowenlarge"; this.checkboxAllowEnlarge.LanguageKey = "printoptions_allowenlarge";
@ -115,7 +112,6 @@ namespace Greenshot.Forms
// //
// checkboxAllowCenter // checkboxAllowCenter
// //
this.checkboxAllowCenter.AutoSize = true;
this.checkboxAllowCenter.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowCenter.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowCenter.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowCenter.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowCenter.LanguageKey = "printoptions_allowcenter"; this.checkboxAllowCenter.LanguageKey = "printoptions_allowcenter";
@ -130,7 +126,6 @@ namespace Greenshot.Forms
// //
// checkboxAllowRotate // checkboxAllowRotate
// //
this.checkboxAllowRotate.AutoSize = true;
this.checkboxAllowRotate.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowRotate.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowRotate.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowRotate.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxAllowRotate.LanguageKey = "printoptions_allowrotate"; this.checkboxAllowRotate.LanguageKey = "printoptions_allowrotate";
@ -158,7 +153,6 @@ namespace Greenshot.Forms
// //
// checkboxDateTime // checkboxDateTime
// //
this.checkboxDateTime.AutoSize = true;
this.checkboxDateTime.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxDateTime.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxDateTime.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxDateTime.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxDateTime.LanguageKey = "printoptions_timestamp"; this.checkboxDateTime.LanguageKey = "printoptions_timestamp";
@ -185,7 +179,6 @@ namespace Greenshot.Forms
// //
// checkboxPrintInverted // checkboxPrintInverted
// //
this.checkboxPrintInverted.AutoSize = true;
this.checkboxPrintInverted.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxPrintInverted.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxPrintInverted.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxPrintInverted.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.checkboxPrintInverted.LanguageKey = "printoptions_inverted"; this.checkboxPrintInverted.LanguageKey = "printoptions_inverted";
@ -200,7 +193,6 @@ namespace Greenshot.Forms
// //
// radioBtnGrayScale // radioBtnGrayScale
// //
this.radioBtnGrayScale.AutoSize = true;
this.radioBtnGrayScale.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnGrayScale.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnGrayScale.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnGrayScale.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnGrayScale.LanguageKey = "printoptions_printgrayscale"; this.radioBtnGrayScale.LanguageKey = "printoptions_printgrayscale";
@ -215,7 +207,6 @@ namespace Greenshot.Forms
// //
// radioBtnMonochrome // radioBtnMonochrome
// //
this.radioBtnMonochrome.AutoSize = true;
this.radioBtnMonochrome.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnMonochrome.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnMonochrome.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnMonochrome.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnMonochrome.LanguageKey = "printoptions_printmonochrome"; this.radioBtnMonochrome.LanguageKey = "printoptions_printmonochrome";
@ -230,7 +221,6 @@ namespace Greenshot.Forms
// //
// groupBoxPrintLayout // groupBoxPrintLayout
// //
this.groupBoxPrintLayout.AutoSize = true;
this.groupBoxPrintLayout.Controls.Add(this.checkboxDateTime); this.groupBoxPrintLayout.Controls.Add(this.checkboxDateTime);
this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowShrink); this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowShrink);
this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowEnlarge); this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowEnlarge);
@ -246,7 +236,6 @@ namespace Greenshot.Forms
// //
// groupBoxColors // groupBoxColors
// //
this.groupBoxColors.AutoSize = true;
this.groupBoxColors.Controls.Add(this.checkboxPrintInverted); this.groupBoxColors.Controls.Add(this.checkboxPrintInverted);
this.groupBoxColors.Controls.Add(this.radioBtnColorPrint); this.groupBoxColors.Controls.Add(this.radioBtnColorPrint);
this.groupBoxColors.Controls.Add(this.radioBtnGrayScale); this.groupBoxColors.Controls.Add(this.radioBtnGrayScale);
@ -261,7 +250,6 @@ namespace Greenshot.Forms
// //
// radioBtnColorPrint // radioBtnColorPrint
// //
this.radioBtnColorPrint.AutoSize = true;
this.radioBtnColorPrint.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnColorPrint.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnColorPrint.LanguageKey = "printoptions_printcolor"; this.radioBtnColorPrint.LanguageKey = "printoptions_printcolor";
@ -272,12 +260,11 @@ namespace Greenshot.Forms
this.radioBtnColorPrint.TabIndex = 11; this.radioBtnColorPrint.TabIndex = 11;
this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft;
this.radioBtnColorPrint.UseVisualStyleBackColor = true; this.radioBtnColorPrint.UseVisualStyleBackColor = true;
// //
// PrintOptionsDialog // PrintOptionsDialog
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(355, 390); this.ClientSize = new System.Drawing.Size(355, 390);
this.Controls.Add(this.groupBoxColors); this.Controls.Add(this.groupBoxColors);
this.Controls.Add(this.groupBoxPrintLayout); this.Controls.Add(this.groupBoxPrintLayout);

10
src/Greenshot/Greenshot.csproj
View file

@ -36,14 +36,14 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" /> <PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.1.10" /> <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.1.10" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.26" /> <PackageReference Include="Dapplo.Log.LogFile" Version="1.4.1" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" /> <PackageReference Include="Dapplo.Log.Loggers" Version="1.4.1" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.17" /> <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.17" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />
<PackageReference Include="sqlite-net-pcl" Version="1.7.335" /> <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
<PackageReference Include="Svg" Version="3.1.1" /> <PackageReference Include="Svg" Version="3.1.1" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.4.1" /> <PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.4.3" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.4.1" /> <PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.4.3" />
<TrimmerRootAssembly Include="System.Diagnostics.Debug" /> <TrimmerRootAssembly Include="System.Diagnostics.Debug" />
</ItemGroup> </ItemGroup>

2
src/Greenshot/Ui/Configuration/ViewModels/ConfigViewModel.cs
View file

@ -87,7 +87,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
/// </summary> /// </summary>
public Control Icon => new PackIconMaterial public Control Icon => new PackIconMaterial
{ {
Kind = PackIconMaterialKind.Settings, Kind = PackIconMaterialKind.Cog,
Margin = new Thickness(10) Margin = new Thickness(10)
}; };

2
src/Greenshot/Ui/Configuration/Views/ConfigView.xaml
View file

@ -12,7 +12,7 @@
d:DataContext="{d:DesignInstance viewModels:ConfigViewModel,IsDesignTimeCreatable=False}" d:DataContext="{d:DesignInstance viewModels:ConfigViewModel,IsDesignTimeCreatable=False}"
ResizeMode="CanResizeWithGrip" SizeToContent="Width" Width="700" MinWidth="700" MaxWidth="1000" Height="500"> ResizeMode="CanResizeWithGrip" SizeToContent="Width" Width="700" MinWidth="700" MaxWidth="1000" Height="500">
<behaviors:FrameworkElementIcon.Value> <behaviors:FrameworkElementIcon.Value>
<iconPacks:PackIconMaterial Kind="Settings" Margin="10" Visibility="Visible" /> <iconPacks:PackIconMaterial Kind="Cog" Margin="10" Visibility="Visible" />
</behaviors:FrameworkElementIcon.Value> </behaviors:FrameworkElementIcon.Value>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>

74
src/Greenshot/greenshot.manifest
View file

@ -1,41 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" <!-- Make sure windows Vista and above treat Greenshot as "DPI Aware" See: http://msdn.microsoft.com/en-us/library/ms633543.aspx -->
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> <asmv3:application>
<!-- Make sure windows Vista and above treat Greenshot as "DPI Aware" <asmv3:windowsSettings>
See: http://msdn.microsoft.com/en-us/library/ms633543.aspx --> <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
<asmv3:application> <!-- Important for Greenshot, so it can enumerate immersive windows (UWP etc) from the desktop -->
<asmv3:windowsSettings> <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware> <printerDriverIsolation xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</printerDriverIsolation>
<!-- Important for Greenshot, so it can enumerate immersive windows (UWP etc) from the desktop --> <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness>
<disableWindowFiltering xmlns="https://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering> <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
<printerDriverIsolation xmlns="https://schemas.microsoft.com/SMI/2011/WindowsSettings">true</printerDriverIsolation> <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling>
<dpiAwareness xmlns="https://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness> </asmv3:windowsSettings>
<gdiScaling xmlns="https://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> </asmv3:application>
</asmv3:windowsSettings> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
</asmv3:application> <application>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <!-- Windows 10 -->
<application> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<!-- Windows 10 --> <maxversiontested Id="10.0.18363.0"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!-- Windows 8.1 -->
<maxversiontested Id="10.0.18362.0"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 8.1 --> <!--Windows 8 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!--Windows 8 --> <!-- Windows 7 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
<!-- Windows 7 --> </application>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> </compatibility>
</application> <!-- Set UAC level to "asInvoker" and disable registry virtualization -->
</compatibility> <asmv2:trustInfo>
<!-- Set UAC level to "asInvoker" and disable registry virtualization --> <asmv2:security>
<asmv2:trustInfo> <asmv3:requestedPrivileges>
<asmv2:security> <!--
<asmv3:requestedPrivileges>
<!--
The presence of the "requestedExecutionLevel" node will disable The presence of the "requestedExecutionLevel" node will disable
file and registry virtualization on Vista. See: file and registry virtualization on Vista. See:
http://msdn.microsoft.com/en-us/library/aa965884%28v=vs.85%29.aspx http://msdn.microsoft.com/en-us/library/aa965884%28v=vs.85%29.aspx
Use the "level" attribute to specify the User Account Control level: Use the "level" attribute to specify the User Account Control level:
asInvoker = Never prompt for elevation asInvoker = Never prompt for elevation
requireAdministrator = Always prompt for elevation requireAdministrator = Always prompt for elevation
@ -43,8 +41,8 @@
but do not prompt for administrator password when started by but do not prompt for administrator password when started by
standard user. standard user.
--> -->
<asmv3:requestedExecutionLevel level="asInvoker" /> <asmv3:requestedExecutionLevel level="asInvoker" />
</asmv3:requestedPrivileges> </asmv3:requestedPrivileges>
</asmv2:security> </asmv2:security>
</asmv2:trustInfo> </asmv2:trustInfo>
</assembly> </assembly>