From 87c37ac89c97ab41e06f9458ab65652cf4704b1c Mon Sep 17 00:00:00 2001 From: Betim Beja <11160171+BetimBeja@users.noreply.github.com> Date: Mon, 4 Jan 2021 21:58:37 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Fix:=20#1=20ComboBoxes=20should?= =?UTF-8?q?=20be=20of=20type=20DropDownList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Properties/Resources.Designer.cs | 9 ++ .../Properties/Resources.resx | 3 + .../SolutionPackagerAbout.resx | 67 ++++---- .../SolutionPackagerControl.cs | 14 +- .../SolutionPackagerControl.designer.cs | 12 +- .../SolutionPackagerControl.resx | 151 +++++++++--------- 6 files changed, 143 insertions(+), 113 deletions(-) diff --git a/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.Designer.cs b/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.Designer.cs index cb114e0..57115d8 100644 --- a/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.Designer.cs +++ b/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.Designer.cs @@ -272,6 +272,15 @@ public static string NO_SOLUTION_SELECTED { } } + /// + /// Looks up a localized string similar to Please specify a valid NuGet feed. + /// + public static string NUGET_FEED_ERROR { + get { + return ResourceManager.GetString("NUGET_FEED_ERROR", resourceCulture); + } + } + /// /// Looks up a localized string similar to Please select the output folder. /// diff --git a/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.resx b/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.resx index 6f55a3e..b30c480 100644 --- a/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.resx +++ b/AlbanianXrm.SolutionPackager.Tool/Properties/Resources.resx @@ -187,6 +187,9 @@ Please select the solution to download + + Please specify a valid NuGet feed + Please select the output folder diff --git a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerAbout.resx b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerAbout.resx index 73a976c..20438e9 100644 --- a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerAbout.resx +++ b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerAbout.resx @@ -124,6 +124,9 @@ System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtDescription + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -152,15 +155,12 @@ Microsoft Sans Serif, 15.75pt, style=Bold - - 0 + + Albanian Solution Packager $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 564, 255 @@ -170,12 +170,18 @@ $this + + Icons used in this tool are offered by https://icons8.com + 0 Albanian Solution Packager + + 51, 15 + 4 @@ -185,9 +191,6 @@ 2 - - imgLogo - 3 @@ -197,22 +200,21 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - StretchImage + + 0 251, 37 - - $this - - - txtDescription + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 4 + + 251, 12 + $this @@ -228,18 +230,19 @@ 2 + + 256, 229 + Version: - - 251, 12 + + + StretchImage This tool facilitates the use of SolutionPackager.exe using a simple GUI to configure the desired output. - - lblTitle - 303, 25 @@ -249,31 +252,25 @@ True - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Icons used in this tool are offered by https://icons8.com + + $this - - 256, 229 + + lblTitle Segoe UI, 9pt - - Albanian Solution Packager + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 251, 55 - - 51, 15 + + imgLogo True - - it - \ No newline at end of file diff --git a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.cs b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.cs index cef3344..437354b 100644 --- a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.cs +++ b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.cs @@ -211,6 +211,7 @@ private void BtnExtractArguments_Click(object sender, EventArgs e) private void BtnExtract_Click(object sender, EventArgs e) { + errorProvider.Clear(); int nrErrors = 0; if (txtOutputExtract.Text.Length == 0) { @@ -324,7 +325,7 @@ private void BtnPackMap_Click(object sender, EventArgs e) } } - private void BtnLogPack_Click(object sender, EventArgs e) + private void BtnPackLog_Click(object sender, EventArgs e) { saveFile.Filter = Resources.FILTER_TEXT; var result = saveFile.ShowDialog(); @@ -352,8 +353,9 @@ private void BtnArgumentsPack_Click(object sender, EventArgs e) } } - private void btnPack_Click(object sender, EventArgs e) + private void BtnPack_Click(object sender, EventArgs e) { + errorProvider.Clear(); int nrErrors = 0; if (txtInputPack.Text.Length == 0) { @@ -409,6 +411,14 @@ public override void UpdateConnection(IOrganizationService newService, Connectio #region Settings private void BtnCoreTools_Click(object sender, EventArgs e) { + errorProvider.Clear(); + + if (txtNuGetFeed.Text == "") + { + errorProvider.SetError(txtNuGetFeed, Resources.NUGET_FEED_ERROR); + return; + } + coreToolsDownloader.DownloadCoreTools(txtNuGetFeed.Text); } diff --git a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.designer.cs b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.designer.cs index 8a532d5..31533c3 100644 --- a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.designer.cs +++ b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.designer.cs @@ -312,7 +312,9 @@ private void InitializeComponent() // cmbCrmSolutions // this.cmbCrmSolutions.DisplayMember = "FriendlyName"; + this.cmbCrmSolutions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCrmSolutions.FormattingEnabled = true; + this.errorProvider.SetIconAlignment(this.cmbCrmSolutions, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cmbCrmSolutions.IconAlignment")))); resources.ApplyResources(this.cmbCrmSolutions, "cmbCrmSolutions"); this.cmbCrmSolutions.Name = "cmbCrmSolutions"; this.cmbCrmSolutions.ValueMember = "SolutionId"; @@ -459,6 +461,7 @@ private void InitializeComponent() // cmbPackageTypeExtract // this.cmbPackageTypeExtract.DisplayMember = "FriendlyName"; + this.cmbPackageTypeExtract.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPackageTypeExtract.FormattingEnabled = true; this.cmbPackageTypeExtract.Items.AddRange(new object[] { resources.GetString("cmbPackageTypeExtract.Items"), @@ -516,6 +519,7 @@ private void InitializeComponent() // cmbErrorLevelExtract // this.cmbErrorLevelExtract.DisplayMember = "FriendlyName"; + this.cmbErrorLevelExtract.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbErrorLevelExtract.FormattingEnabled = true; this.cmbErrorLevelExtract.Items.AddRange(new object[] { resources.GetString("cmbErrorLevelExtract.Items"), @@ -561,6 +565,7 @@ private void InitializeComponent() // cmbSourceLocaleExtract // this.cmbSourceLocaleExtract.DisplayMember = "FriendlyName"; + this.cmbSourceLocaleExtract.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSourceLocaleExtract.FormattingEnabled = true; this.cmbSourceLocaleExtract.Items.AddRange(new object[] { resources.GetString("cmbSourceLocaleExtract.Items"), @@ -701,7 +706,7 @@ private void InitializeComponent() resources.ApplyResources(this.btnPack, "btnPack"); this.btnPack.Name = "btnPack"; this.btnPack.UseVisualStyleBackColor = true; - this.btnPack.Click += new System.EventHandler(this.btnPack_Click); + this.btnPack.Click += new System.EventHandler(this.BtnPack_Click); // // flpPackLabels // @@ -795,6 +800,7 @@ private void InitializeComponent() // cmbPackageTypePack // this.cmbPackageTypePack.DisplayMember = "FriendlyName"; + this.cmbPackageTypePack.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPackageTypePack.FormattingEnabled = true; this.cmbPackageTypePack.Items.AddRange(new object[] { resources.GetString("cmbPackageTypePack.Items"), @@ -808,6 +814,7 @@ private void InitializeComponent() // cmbErrorLevelPack // this.cmbErrorLevelPack.DisplayMember = "FriendlyName"; + this.cmbErrorLevelPack.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbErrorLevelPack.FormattingEnabled = true; this.cmbErrorLevelPack.Items.AddRange(new object[] { resources.GetString("cmbErrorLevelPack.Items"), @@ -896,7 +903,7 @@ private void InitializeComponent() resources.ApplyResources(this.btnLogPack, "btnLogPack"); this.btnLogPack.Name = "btnLogPack"; this.btnLogPack.UseVisualStyleBackColor = true; - this.btnLogPack.Click += new System.EventHandler(this.BtnLogPack_Click); + this.btnLogPack.Click += new System.EventHandler(this.BtnPackLog_Click); // // btnArgumentsPack // @@ -1001,6 +1008,7 @@ private void InitializeComponent() // cmbLanguage // this.cmbLanguage.DisplayMember = "DisplayName"; + this.cmbLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbLanguage.FormattingEnabled = true; resources.ApplyResources(this.cmbLanguage, "cmbLanguage"); this.cmbLanguage.Name = "cmbLanguage"; diff --git a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.resx b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.resx index 990fe45..7ebf7ea 100644 --- a/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.resx +++ b/AlbanianXrm.SolutionPackager.Tool/SolutionPackagerControl.resx @@ -576,6 +576,54 @@ 14 + + 17, 17 + + + True + + + 800, 800 + + + errorProvider + + + System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + selectFolder + + + System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openFile + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolTip + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + saveFile + + + System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SolutionPackagerControl + + + XrmToolBox.Extensibility.PluginControlBase, XrmToolBox.Extensibility, Version=1.2020.12.43, Culture=neutral, PublicKeyToken=null + + + MiddleLeft + 94, 16 @@ -1237,7 +1285,7 @@ 5, 5 - 5, 5, 5, 5 + 5, 5, 15, 5 False @@ -1246,7 +1294,7 @@ None - 270, 24 + 260, 24 0 @@ -1282,10 +1330,10 @@ None - 270, 24 + 260, 24 - 6 + 0 @@ -1324,10 +1372,10 @@ 5, 5, 5, 6 - 270, 23 + 260, 23 - 23 + 4 cmbPackageTypeExtract @@ -1477,7 +1525,7 @@ 0, 0, 0, 0 - 275, 34 + 260, 34 26 @@ -1552,7 +1600,7 @@ 5, 5, 5, 6 - 270, 23 + 260, 23 27 @@ -1582,7 +1630,7 @@ None - 270, 24 + 260, 24 34 @@ -1651,7 +1699,7 @@ None - 270, 24 + 260, 24 35 @@ -1687,7 +1735,7 @@ None - 270, 24 + 260, 24 36 @@ -1858,7 +1906,7 @@ 5, 5, 5, 6 - 270, 23 + 260, 23 37 @@ -1996,7 +2044,7 @@ You can use the short form of the command: /loc. 30, 30 - 7 + 2 btnOpenZip @@ -2023,7 +2071,7 @@ You can use the short form of the command: /loc. 30, 30 - 9 + 3 btnOutputFolder @@ -2671,7 +2719,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 7 @@ -2707,7 +2755,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 8 @@ -2749,7 +2797,7 @@ You can use the short form of the command: /loc. 5, 5, 5, 6 - 270, 23 + 260, 23 24 @@ -2791,7 +2839,7 @@ You can use the short form of the command: /loc. 5, 5, 5, 6 - 270, 23 + 260, 23 28 @@ -2809,7 +2857,7 @@ You can use the short form of the command: /loc. 3 - 5, 141 + 5, 139 5, 5, 5, 5 @@ -2821,7 +2869,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 33 @@ -2848,7 +2896,7 @@ You can use the short form of the command: /loc. True - 5, 180 + 5, 178 5, 10, 5, 10 @@ -2872,7 +2920,7 @@ You can use the short form of the command: /loc. 5 - 5, 209 + 5, 207 5, 5, 5, 5 @@ -2884,7 +2932,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 30 @@ -2908,7 +2956,7 @@ You can use the short form of the command: /loc. 6 - 5, 243 + 5, 241 5, 5, 5, 5 @@ -2920,7 +2968,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 31 @@ -2950,7 +2998,7 @@ You can use the short form of the command: /loc. NoControl - 5, 282 + 5, 280 5, 10, 5, 10 @@ -3526,7 +3574,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 9 @@ -3562,7 +3610,7 @@ You can use the short form of the command: /loc. None - 270, 24 + 260, 24 12 @@ -3592,7 +3640,7 @@ You can use the short form of the command: /loc. 5, 5, 5, 6 - 270, 23 + 260, 23 17 @@ -3798,51 +3846,6 @@ You can use the short form of the command: /loc. 0 - - 17, 17 - - - True - - - 800, 800 - - - errorProvider - - - System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - selectFolder - - - System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openFile - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolTip - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - saveFile - - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SolutionPackagerControl - - - XrmToolBox.Extensibility.PluginControlBase, XrmToolBox.Extensibility, Version=1.2020.12.43, Culture=neutral, PublicKeyToken=null - 140, 17