diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f3f35022..f25769744 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,10 +25,10 @@ steps: - task: NuGetToolInstaller@1 - task: UseDotNet@2 - displayName: 'Use .NET Core sdk 5.0.100-rc.2' + displayName: 'Use .NET Core sdk 5.0' inputs: packageType: sdk - version: 5.0.100-rc.2.20479.15 + version: 5.0.100 - task: NuGetCommand@2 displayName: NuGet restore diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 1a4ac01d0..cd01ebd81 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -7,7 +7,7 @@ git https://github.com/greenshot/greenshot https://www.gnu.org/licenses/gpl.html - 8 + 9 true true true diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 8fdded646..c5fdf1040 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -19,6 +19,6 @@ - + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 765cc2654..b403aab33 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -23,6 +23,6 @@ - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index a74be3fa4..5e245db55 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -20,8 +20,8 @@ - - - + + + diff --git a/src/Greenshot.Addon.Jira/JiraConnector.cs b/src/Greenshot.Addon.Jira/JiraConnector.cs index eb140a915..634cdc78b 100644 --- a/src/Greenshot.Addon.Jira/JiraConnector.cs +++ b/src/Greenshot.Addon.Jira/JiraConnector.cs @@ -93,7 +93,6 @@ namespace Greenshot.Addon.Jira { Task.Run(async () => { - await LogoutAsync(); _issueTypeBitmapCache.Dispose(); }).Wait(); } @@ -146,7 +145,6 @@ namespace Greenshot.Addon.Jira /// Task public async Task LoginAsync(CancellationToken cancellationToken = default) { - await LogoutAsync(cancellationToken); try { // Get the system name, so the user knows where to login to @@ -189,39 +187,12 @@ namespace Greenshot.Addon.Jira } } - /// - /// End the session, if there was one - /// - public Task LogoutAsync(CancellationToken cancellationToken = default) - { - if (_jiraClient != null && IsLoggedIn) - { - // TODO: Remove Jira Client? - //_jiraMonitor.Dispose(); - IsLoggedIn = false; - } - - return Task.CompletedTask; - } - - /// - /// 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. - /// - /// - private Task CheckCredentialsAsync(CancellationToken cancellationToken = default) - { - // TODO: Do we need to do something? - return Task.CompletedTask; - } - /// /// Get the favourite filters /// /// List with filters public async Task> GetFavoriteFiltersAsync(CancellationToken cancellationToken = default) { - await CheckCredentialsAsync(cancellationToken); return await _jiraClient.Filter.GetFavoritesAsync(cancellationToken).ConfigureAwait(false); } @@ -233,7 +204,6 @@ namespace Greenshot.Addon.Jira /// Issue public async Task GetIssueAsync(string issueKey, CancellationToken cancellationToken = default) { - await CheckCredentialsAsync(cancellationToken); try { return await _jiraClient.Issue.GetAsync(issueKey, cancellationToken).ConfigureAwait(false); @@ -254,7 +224,6 @@ namespace Greenshot.Addon.Jira /// Task public async Task AttachAsync(string issueKey, ISurface surface, string filename = null, CancellationToken cancellationToken = default) { - await CheckCredentialsAsync(cancellationToken).ConfigureAwait(true); using var memoryStream = new MemoryStream(); surface.WriteToStream(memoryStream, _coreConfiguration, _jiraConfiguration); memoryStream.Seek(0, SeekOrigin.Begin); @@ -269,10 +238,9 @@ namespace Greenshot.Addon.Jira /// text /// the visibility role /// CancellationToken - 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, visibility, cancellationToken).ConfigureAwait(false); + await _jiraClient.Issue.AddCommentAsync(issueKey, body, cancellationToken: cancellationToken).ConfigureAwait(false); } /// @@ -283,7 +251,6 @@ namespace Greenshot.Addon.Jira /// public async Task> SearchAsync(Filter filter, CancellationToken cancellationToken = default) { - await CheckCredentialsAsync(cancellationToken); var searchResult = await _jiraClient.Issue.SearchAsync(filter.Jql, new Page { MaxResults = 20}, diff --git a/src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs b/src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs index 70dc73d6e..c85832420 100644 --- a/src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs +++ b/src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs @@ -258,8 +258,8 @@ namespace Greenshot.Addon.LegacyEditor.Controls { // // ColorDialog // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(584, 404); this.Controls.Add(this.panelRecentColors); this.Controls.Add(this.panelColors); diff --git a/src/Greenshot.Addon.LegacyEditor/Forms/DropShadowSettingsForm.Designer.cs b/src/Greenshot.Addon.LegacyEditor/Forms/DropShadowSettingsForm.Designer.cs index 2ba92b85d..65edebf07 100644 --- a/src/Greenshot.Addon.LegacyEditor/Forms/DropShadowSettingsForm.Designer.cs +++ b/src/Greenshot.Addon.LegacyEditor/Forms/DropShadowSettingsForm.Designer.cs @@ -108,7 +108,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(153, 35); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(14, 13); @@ -169,7 +168,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelDarkness // - this.labelDarkness.AutoSize = true; this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness"; this.labelDarkness.Location = new System.Drawing.Point(12, 73); this.labelDarkness.Name = "labelDarkness"; @@ -178,7 +176,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelOffset // - this.labelOffset.AutoSize = true; this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset"; this.labelOffset.Location = new System.Drawing.Point(12, 35); this.labelOffset.Name = "labelOffset"; @@ -187,7 +184,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelThickness // - this.labelThickness.AutoSize = true; this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness"; this.labelThickness.Location = new System.Drawing.Point(12, 9); this.labelThickness.Name = "labelThickness"; @@ -197,9 +193,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // DropShadowSettingsForm // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(230, 154); this.ControlBox = false; this.Controls.Add(this.labelThickness); diff --git a/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs b/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs index 57bae2406..db126cbb2 100644 --- a/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs +++ b/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs @@ -213,8 +213,8 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // topToolStripContainer // - this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; // // topToolStripContainer.BottomToolStripPanel // @@ -1518,12 +1518,12 @@ namespace Greenshot.Addon.LegacyEditor.Forms { this.alignRightToolStripMenuItem.LanguageKey = "editor.editor_align_right"; this.alignRightToolStripMenuItem.Name = "alignRightToolStripMenuItem"; this.alignRightToolStripMenuItem.Tag = System.Drawing.StringAlignment.Far; - // - // ImageEditorForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(785, 485); + // + // ImageEditorForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(785, 485); this.Controls.Add(this.topToolStripContainer); this.KeyPreview = true; this.LanguageKey = "editor.editor_title"; diff --git a/src/Greenshot.Addon.LegacyEditor/Forms/ResizeSettingsForm.Designer.cs b/src/Greenshot.Addon.LegacyEditor/Forms/ResizeSettingsForm.Designer.cs index 551f96d9f..9ef351bc5 100644 --- a/src/Greenshot.Addon.LegacyEditor/Forms/ResizeSettingsForm.Designer.cs +++ b/src/Greenshot.Addon.LegacyEditor/Forms/ResizeSettingsForm.Designer.cs @@ -79,7 +79,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // checkbox_aspectratio // - this.checkbox_aspectratio.AutoSize = true; this.checkbox_aspectratio.LanguageKey = "editor.editor_resize_aspectratio"; this.checkbox_aspectratio.Location = new System.Drawing.Point(22, 64); this.checkbox_aspectratio.Name = "checkbox_aspectratio"; @@ -89,7 +88,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label_width // - this.label_width.AutoSize = true; this.label_width.LanguageKey = "editor.editor_resize_width"; this.label_width.Location = new System.Drawing.Point(19, 15); this.label_width.Name = "label_width"; @@ -98,7 +96,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label_height // - this.label_height.AutoSize = true; this.label_height.LanguageKey = "editor.editor_resize_height"; this.label_height.Location = new System.Drawing.Point(19, 38); this.label_height.Name = "label_height"; @@ -143,9 +140,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // ResizeSettingsForm // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(244, 122); this.ControlBox = false; this.Controls.Add(this.combobox_height); diff --git a/src/Greenshot.Addon.LegacyEditor/Forms/TornEdgeSettingsForm.Designer.cs b/src/Greenshot.Addon.LegacyEditor/Forms/TornEdgeSettingsForm.Designer.cs index 825b2e1b9..ff9790f48 100644 --- a/src/Greenshot.Addon.LegacyEditor/Forms/TornEdgeSettingsForm.Designer.cs +++ b/src/Greenshot.Addon.LegacyEditor/Forms/TornEdgeSettingsForm.Designer.cs @@ -123,7 +123,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label3 // - this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(153, 63); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(12, 13); @@ -184,7 +183,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelDarkness // - this.labelDarkness.AutoSize = true; this.labelDarkness.LanguageKey = "editor.editor_dropshadow_darkness"; this.labelDarkness.Location = new System.Drawing.Point(12, 97); this.labelDarkness.Name = "labelDarkness"; @@ -194,7 +192,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelOffset // - this.labelOffset.AutoSize = true; this.labelOffset.LanguageKey = "editor.editor_dropshadow_offset"; this.labelOffset.Location = new System.Drawing.Point(12, 63); this.labelOffset.Name = "labelOffset"; @@ -203,7 +200,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelThickness // - this.labelThickness.AutoSize = true; this.labelThickness.LanguageKey = "editor.editor_dropshadow_thickness"; this.labelThickness.Location = new System.Drawing.Point(12, 37); this.labelThickness.Name = "labelThickness"; @@ -234,7 +230,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label_toothsize // - this.label_toothsize.AutoSize = true; this.label_toothsize.LanguageKey = "editor.editor_tornedge_toothsize"; this.label_toothsize.Location = new System.Drawing.Point(12, 140); this.label_toothsize.Name = "label_toothsize"; @@ -243,7 +238,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // label_horizontaltoothrange // - this.label_horizontaltoothrange.AutoSize = true; this.label_horizontaltoothrange.LanguageKey = "editor.editor_tornedge_horizontaltoothrange"; this.label_horizontaltoothrange.Location = new System.Drawing.Point(12, 166); this.label_horizontaltoothrange.Name = "label_horizontaltoothrange"; @@ -273,7 +267,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // labelVerticaltoothrange // - this.labelVerticaltoothrange.AutoSize = true; this.labelVerticaltoothrange.LanguageKey = "editor.editor_tornedge_verticaltoothrange"; this.labelVerticaltoothrange.Location = new System.Drawing.Point(12, 192); this.labelVerticaltoothrange.Name = "labelVerticaltoothrange"; @@ -351,7 +344,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // shadowCheckbox // - this.shadowCheckbox.AutoSize = true; this.shadowCheckbox.LanguageKey = "editor.editor_tornedge_shadow"; this.shadowCheckbox.Location = new System.Drawing.Point(12, 12); this.shadowCheckbox.Name = "shadowCheckbox"; @@ -362,7 +354,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // // all // - this.all.AutoSize = true; this.all.LanguageKey = "editor.editor_tornedge_all"; this.all.Location = new System.Drawing.Point(251, 12); this.all.Name = "all"; @@ -374,9 +365,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms { // TornEdgeSettingsForm // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(502, 223); this.ControlBox = false; this.Controls.Add(this.all); diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 396683fef..eeb87fafd 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 7eb35600e..bcd3db5fa 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/src/Greenshot.Addons/Controls/BackgroundForm.Designer.cs b/src/Greenshot.Addons/Controls/BackgroundForm.Designer.cs index d6baa722a..e5f3ddfcd 100644 --- a/src/Greenshot.Addons/Controls/BackgroundForm.Designer.cs +++ b/src/Greenshot.Addons/Controls/BackgroundForm.Designer.cs @@ -55,7 +55,6 @@ namespace Greenshot.Addons.Controls // // label_pleasewait // - this.label_pleasewait.AutoSize = true; this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill; this.label_pleasewait.Location = new System.Drawing.Point(0, 0); this.label_pleasewait.Name = "label_pleasewait"; @@ -70,12 +69,11 @@ namespace Greenshot.Addons.Controls // this.timer_checkforclose.Interval = 200; this.timer_checkforclose.Tick += new System.EventHandler(this.Timer_checkforcloseTick); - // - // BackgroundForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; + // + // BackgroundForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(169, 52); this.ControlBox = true; this.Controls.Add(this.label_pleasewait); diff --git a/src/Greenshot.Addons/Controls/MovableShowColorForm.Designer.cs b/src/Greenshot.Addons/Controls/MovableShowColorForm.Designer.cs index 4a339413b..e7f1b74a9 100644 --- a/src/Greenshot.Addons/Controls/MovableShowColorForm.Designer.cs +++ b/src/Greenshot.Addons/Controls/MovableShowColorForm.Designer.cs @@ -52,7 +52,6 @@ namespace Greenshot.Addons.Controls // // label1 // - this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(40, 5); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(37, 13); @@ -69,7 +68,6 @@ namespace Greenshot.Addons.Controls // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(2, 37); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(33, 13); @@ -92,7 +90,6 @@ namespace Greenshot.Addons.Controls // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(2, 50); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(42, 13); @@ -108,7 +105,6 @@ namespace Greenshot.Addons.Controls // // label6 // - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(2, 63); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(34, 13); @@ -124,7 +120,6 @@ namespace Greenshot.Addons.Controls // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(2, 76); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(40, 13); @@ -156,8 +151,8 @@ namespace Greenshot.Addons.Controls // this.Visible = false; this.Location = new System.Drawing.Point(-10000,-10000); - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(100, 100); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; diff --git a/src/Greenshot.Addons/Controls/PleaseWaitForm.Designer.cs b/src/Greenshot.Addons/Controls/PleaseWaitForm.Designer.cs index 821dc9bd6..22a82866d 100644 --- a/src/Greenshot.Addons/Controls/PleaseWaitForm.Designer.cs +++ b/src/Greenshot.Addons/Controls/PleaseWaitForm.Designer.cs @@ -50,7 +50,6 @@ namespace Greenshot.Addons.Controls { // // label_pleasewait // - this.label_pleasewait.AutoSize = true; this.label_pleasewait.Dock = System.Windows.Forms.DockStyle.Fill; this.label_pleasewait.Location = new System.Drawing.Point(0, 0); this.label_pleasewait.Name = "label_pleasewait"; @@ -74,13 +73,12 @@ namespace Greenshot.Addons.Controls { this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.UseWaitCursor = true; this.cancelButton.Click += new System.EventHandler(this.CancelButtonClick); - // - // PleaseWaitForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.CancelButton = this.cancelButton; + // + // PleaseWaitForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(169, 76); this.Controls.Add(this.cancelButton); this.Controls.Add(this.label_pleasewait); diff --git a/src/Greenshot.Addons/Controls/QualityDialog.Designer.cs b/src/Greenshot.Addons/Controls/QualityDialog.Designer.cs index 29d582679..f1782fa8d 100644 --- a/src/Greenshot.Addons/Controls/QualityDialog.Designer.cs +++ b/src/Greenshot.Addons/Controls/QualityDialog.Designer.cs @@ -108,19 +108,18 @@ namespace Greenshot.Addons.Controls { // // checkBox_reduceColors // - this.checkBox_reduceColors.AutoSize = true; this.checkBox_reduceColors.Location = new System.Drawing.Point(12, 11); this.checkBox_reduceColors.Name = "checkBox_reduceColors"; this.checkBox_reduceColors.Size = new System.Drawing.Size(95, 17); this.checkBox_reduceColors.TabIndex = 2; this.checkBox_reduceColors.Text = "settings_reducecolors"; this.checkBox_reduceColors.UseVisualStyleBackColor = true; - // + // // QualityDialog - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(299, 184); + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(299, 184); this.ControlBox = false; this.Controls.Add(this.checkBox_reduceColors); this.Controls.Add(this.button_ok); diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 93f5e9bba..2a3973ebd 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/Greenshot.Addons/Views/ExportNotificationView.xaml b/src/Greenshot.Addons/Views/ExportNotificationView.xaml index 2075269f0..d9c8fb123 100644 --- a/src/Greenshot.Addons/Views/ExportNotificationView.xaml +++ b/src/Greenshot.Addons/Views/ExportNotificationView.xaml @@ -7,7 +7,7 @@ xmlns:cal="http://www.caliburnproject.org" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" 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:DesignHeight="100" d:DesignWidth="200" HorizontalContentAlignment="Stretch" HorizontalAlignment="Right"> @@ -27,7 +27,7 @@ - + @@ -35,9 +35,9 @@ - - diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 2c405c2b7..e1f152d86 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 720cbf632..0629b5cde 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -30,9 +30,9 @@ - + - + diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config index 1e9d63bac..e72077f58 100644 --- a/src/Greenshot/App.config +++ b/src/Greenshot/App.config @@ -1,15 +1,14 @@ - + - - - - - + + + + - - - + + + - + diff --git a/src/Greenshot/FodyWeavers.xsd b/src/Greenshot/FodyWeavers.xsd deleted file mode 100644 index 6e1ac6983..000000000 --- a/src/Greenshot/FodyWeavers.xsd +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/src/Greenshot/Forms/AboutForm.Designer.cs b/src/Greenshot/Forms/AboutForm.Designer.cs index 82284e490..549fcc0db 100644 --- a/src/Greenshot/Forms/AboutForm.Designer.cs +++ b/src/Greenshot/Forms/AboutForm.Designer.cs @@ -177,12 +177,12 @@ namespace Greenshot.Forms { this.lblTranslation.Name = "lblTranslation"; this.lblTranslation.Size = new System.Drawing.Size(466, 23); this.lblTranslation.TabIndex = 15; - // - // AboutForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(530, 293); + // + // AboutForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(530, 293); this.Controls.Add(this.lblTranslation); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.linkLabel1); diff --git a/src/Greenshot/Forms/BugReportForm.Designer.cs b/src/Greenshot/Forms/BugReportForm.Designer.cs index 9f4108a58..8d14da185 100644 --- a/src/Greenshot/Forms/BugReportForm.Designer.cs +++ b/src/Greenshot/Forms/BugReportForm.Designer.cs @@ -96,12 +96,12 @@ namespace Greenshot.Forms { this.linkLblBugs.TabStop = true; this.linkLblBugs.Text = "http://getgreenshot.org/tickets/"; this.linkLblBugs.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLblBugsLinkClicked); - // - // BugReportForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnClose; + // + // BugReportForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.CancelButton = this.btnClose; this.ClientSize = new System.Drawing.Size(528, 452); this.Controls.Add(this.linkLblBugs); this.Controls.Add(this.btnClose); diff --git a/src/Greenshot/Forms/CaptureForm.Designer.cs b/src/Greenshot/Forms/CaptureForm.Designer.cs index bc789e43e..fff797bea 100644 --- a/src/Greenshot/Forms/CaptureForm.Designer.cs +++ b/src/Greenshot/Forms/CaptureForm.Designer.cs @@ -52,18 +52,19 @@ namespace Greenshot.Forms { this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown); this.Paint += new System.Windows.Forms.PaintEventHandler(this.OnPaint); this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp); - // - // CaptureForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(0, 0); + // + // CaptureForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(0, 0); this.Cursor = System.Windows.Forms.Cursors.Cross; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "CaptureForm"; this.ShowIcon = true; this.ShowInTaskbar = false; this.TopMost = true; + this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyDown); this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CaptureFormKeyUp); this.Visible = false; diff --git a/src/Greenshot/Forms/LanguageDialog.Designer.cs b/src/Greenshot/Forms/LanguageDialog.Designer.cs index cab787300..674b98560 100644 --- a/src/Greenshot/Forms/LanguageDialog.Designer.cs +++ b/src/Greenshot/Forms/LanguageDialog.Designer.cs @@ -72,9 +72,9 @@ namespace Greenshot.Forms { // LanguageDialog // this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(390, 77); + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(390, 77); this.ControlBox = true; this.Controls.Add(this.btnOK); this.Controls.Add(this.comboBoxLanguage); diff --git a/src/Greenshot/Forms/MainForm.Designer.cs b/src/Greenshot/Forms/MainForm.Designer.cs index 1bef3e884..a8924f63c 100644 --- a/src/Greenshot/Forms/MainForm.Designer.cs +++ b/src/Greenshot/Forms/MainForm.Designer.cs @@ -253,12 +253,12 @@ namespace Greenshot.Forms { this.backgroundWorkerTimer.Enabled = true; this.backgroundWorkerTimer.Interval = 300000; this.backgroundWorkerTimer.Tick += new System.EventHandler(this.BackgroundWorkerTimerTick); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(0, 0); + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(0, 0); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.LanguageKey = "application_title"; this.Name = "MainForm"; diff --git a/src/Greenshot/Forms/PrintOptionsDialog.Designer.cs b/src/Greenshot/Forms/PrintOptionsDialog.Designer.cs index 4c26cc23c..a845e6739 100644 --- a/src/Greenshot/Forms/PrintOptionsDialog.Designer.cs +++ b/src/Greenshot/Forms/PrintOptionsDialog.Designer.cs @@ -71,7 +71,6 @@ namespace Greenshot.Forms // // checkbox_dontaskagain // - this.checkbox_dontaskagain.AutoSize = true; this.checkbox_dontaskagain.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkbox_dontaskagain.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkbox_dontaskagain.LanguageKey = "printoptions_dontaskagain"; @@ -85,7 +84,6 @@ namespace Greenshot.Forms // // checkboxAllowShrink // - this.checkboxAllowShrink.AutoSize = true; this.checkboxAllowShrink.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowShrink.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowShrink.LanguageKey = "printoptions_allowshrink"; @@ -100,7 +98,6 @@ namespace Greenshot.Forms // // checkboxAllowEnlarge // - this.checkboxAllowEnlarge.AutoSize = true; this.checkboxAllowEnlarge.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowEnlarge.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowEnlarge.LanguageKey = "printoptions_allowenlarge"; @@ -115,7 +112,6 @@ namespace Greenshot.Forms // // checkboxAllowCenter // - this.checkboxAllowCenter.AutoSize = true; this.checkboxAllowCenter.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowCenter.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowCenter.LanguageKey = "printoptions_allowcenter"; @@ -130,7 +126,6 @@ namespace Greenshot.Forms // // checkboxAllowRotate // - this.checkboxAllowRotate.AutoSize = true; this.checkboxAllowRotate.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowRotate.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowRotate.LanguageKey = "printoptions_allowrotate"; @@ -158,7 +153,6 @@ namespace Greenshot.Forms // // checkboxDateTime // - this.checkboxDateTime.AutoSize = true; this.checkboxDateTime.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxDateTime.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxDateTime.LanguageKey = "printoptions_timestamp"; @@ -185,7 +179,6 @@ namespace Greenshot.Forms // // checkboxPrintInverted // - this.checkboxPrintInverted.AutoSize = true; this.checkboxPrintInverted.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxPrintInverted.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxPrintInverted.LanguageKey = "printoptions_inverted"; @@ -200,7 +193,6 @@ namespace Greenshot.Forms // // radioBtnGrayScale // - this.radioBtnGrayScale.AutoSize = true; this.radioBtnGrayScale.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnGrayScale.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnGrayScale.LanguageKey = "printoptions_printgrayscale"; @@ -215,7 +207,6 @@ namespace Greenshot.Forms // // radioBtnMonochrome // - this.radioBtnMonochrome.AutoSize = true; this.radioBtnMonochrome.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnMonochrome.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnMonochrome.LanguageKey = "printoptions_printmonochrome"; @@ -230,7 +221,6 @@ namespace Greenshot.Forms // // groupBoxPrintLayout // - this.groupBoxPrintLayout.AutoSize = true; this.groupBoxPrintLayout.Controls.Add(this.checkboxDateTime); this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowShrink); this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowEnlarge); @@ -246,7 +236,6 @@ namespace Greenshot.Forms // // groupBoxColors // - this.groupBoxColors.AutoSize = true; this.groupBoxColors.Controls.Add(this.checkboxPrintInverted); this.groupBoxColors.Controls.Add(this.radioBtnColorPrint); this.groupBoxColors.Controls.Add(this.radioBtnGrayScale); @@ -261,7 +250,6 @@ namespace Greenshot.Forms // // radioBtnColorPrint // - this.radioBtnColorPrint.AutoSize = true; this.radioBtnColorPrint.CheckAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.LanguageKey = "printoptions_printcolor"; @@ -272,12 +260,11 @@ namespace Greenshot.Forms this.radioBtnColorPrint.TabIndex = 11; this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.radioBtnColorPrint.UseVisualStyleBackColor = true; - // - // PrintOptionsDialog - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13.5F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; + // + // PrintOptionsDialog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(355, 390); this.Controls.Add(this.groupBoxColors); this.Controls.Add(this.groupBoxPrintLayout); diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 1fec2a640..020c4d2a5 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -36,14 +36,14 @@ - - + + - + - - + + diff --git a/src/Greenshot/Ui/Configuration/ViewModels/ConfigViewModel.cs b/src/Greenshot/Ui/Configuration/ViewModels/ConfigViewModel.cs index 8fe2cda5c..6778bbbb3 100644 --- a/src/Greenshot/Ui/Configuration/ViewModels/ConfigViewModel.cs +++ b/src/Greenshot/Ui/Configuration/ViewModels/ConfigViewModel.cs @@ -87,7 +87,7 @@ namespace Greenshot.Ui.Configuration.ViewModels /// public Control Icon => new PackIconMaterial { - Kind = PackIconMaterialKind.Settings, + Kind = PackIconMaterialKind.Cog, Margin = new Thickness(10) }; diff --git a/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml b/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml index ef8d0db91..d9ebbd025 100644 --- a/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml +++ b/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml @@ -12,7 +12,7 @@ d:DataContext="{d:DesignInstance viewModels:ConfigViewModel,IsDesignTimeCreatable=False}" ResizeMode="CanResizeWithGrip" SizeToContent="Width" Width="700" MinWidth="700" MaxWidth="1000" Height="500"> - + diff --git a/src/Greenshot/greenshot.manifest b/src/Greenshot/greenshot.manifest index 8ee021539..21caa3d9a 100644 --- a/src/Greenshot/greenshot.manifest +++ b/src/Greenshot/greenshot.manifest @@ -1,41 +1,39 @@  - - - - - - True/PM - - true - true - PerMonitorV2,PerMonitor - true - - - - - - - - - - - - - - - - - - - - + + + True/PM + + true + true + PerMonitorV2,PerMonitor + true + true + + + + + + + + + + + + + + + + + + + + - - - - + + + + \ No newline at end of file