From 8443b590c92c25c68e6c14d13ca43f4de176bd70 Mon Sep 17 00:00:00 2001 From: sborate Date: Tue, 17 Sep 2024 14:41:22 +0530 Subject: [PATCH] P4VS 2024.1 Release --- P4VS/P4ScmProvider/P4ScmProvider.cs | 13 + P4VS/P4VS.csproj | 10 + P4VS/Resources.Designer.cs | 45 +++ P4VS/Resources.resx | 15 + P4VS/UI/DlgRenameWorkspace.Designer.cs | 164 ++++++++++ P4VS/UI/DlgRenameWorkspace.cs | 58 ++++ P4VS/UI/DlgRenameWorkspace.resx | 388 +++++++++++++++++++++++ P4VS/UI/WorkspacesWindowControl.cs | 286 ++++++++++------- P4VS/UI/WorkspacesWindowControl.resx | 410 ++++++++++++++++++------- RELEASENOTES.txt | 28 +- 10 files changed, 1194 insertions(+), 223 deletions(-) create mode 100644 P4VS/UI/DlgRenameWorkspace.Designer.cs create mode 100644 P4VS/UI/DlgRenameWorkspace.cs create mode 100644 P4VS/UI/DlgRenameWorkspace.resx diff --git a/P4VS/P4ScmProvider/P4ScmProvider.cs b/P4VS/P4ScmProvider/P4ScmProvider.cs index ad8c4d4..96e99be 100644 --- a/P4VS/P4ScmProvider/P4ScmProvider.cs +++ b/P4VS/P4ScmProvider/P4ScmProvider.cs @@ -4048,6 +4048,19 @@ public P4.Client createClient(P4.Client client, P4.Options options) return value; } + public string RenameClient(string oldClientName, string newClientName) + { + string result ; + if (Offline) + { + return string.Empty; + } + + result = Connection.Repository.RenameClient(oldClientName, newClientName); + + return result; + + } public void deleteClient(P4.Client client, P4.Options options) { if (Offline) diff --git a/P4VS/P4VS.csproj b/P4VS/P4VS.csproj index 369d32e..6d4a19b 100644 --- a/P4VS/P4VS.csproj +++ b/P4VS/P4VS.csproj @@ -542,6 +542,12 @@ + + Form + + + DlgRenameWorkspace.cs + Form @@ -1041,6 +1047,10 @@ Designer + + DlgRenameWorkspace.cs + Designer + HASCheckDlg.cs diff --git a/P4VS/Resources.Designer.cs b/P4VS/Resources.Designer.cs index 28e5537..7760b6f 100644 --- a/P4VS/Resources.Designer.cs +++ b/P4VS/Resources.Designer.cs @@ -4347,6 +4347,42 @@ public static string WorkspacesWindowControl_RefreshWorkspaceMenuItem_Text { } } + /// + /// Looks up a localized string similar to Rename Workspace. + /// + public static string WorkspacesWindowControl_RenameWorkspaceCaption { + get { + return ResourceManager.GetString("WorkspacesWindowControl_RenameWorkspaceCaption", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rename Workspace '{0}'.... + /// + public static string WorkspacesWindowControl_RenameWorkspaceMenuItem_Text { + get { + return ResourceManager.GetString("WorkspacesWindowControl_RenameWorkspaceMenuItem_Text", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New Name: . + /// + public static string WorkspacesWindowControl_RenameWorkspaceNewNameLabel { + get { + return ResourceManager.GetString("WorkspacesWindowControl_RenameWorkspaceNewNameLabel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rename workspace '{0}'. + /// + public static string WorkspacesWindowControl_RenameWorkspaceOldClientPrompt_Text { + get { + return ResourceManager.GetString("WorkspacesWindowControl_RenameWorkspaceOldClientPrompt_Text", resourceCulture); + } + } + /// /// Looks up a localized string similar to Select a workspace for {0} to '{1}'. /// @@ -4364,5 +4400,14 @@ public static string WorkspacesWindowControl_WorkspaceExistsWarning { return ResourceManager.GetString("WorkspacesWindowControl_WorkspaceExistsWarning", resourceCulture); } } + + /// + /// Looks up a localized string similar to Recent Connections and saved Pending Changelist Filters will be updated with the new workspace name.. + /// + public static string WorlspacesWindowControl_RenameWorkspaceWarningInfo { + get { + return ResourceManager.GetString("WorlspacesWindowControl_RenameWorkspaceWarningInfo", resourceCulture); + } + } } } diff --git a/P4VS/Resources.resx b/P4VS/Resources.resx index 6c7ee1e..e1e4ae9 100644 --- a/P4VS/Resources.resx +++ b/P4VS/Resources.resx @@ -1600,4 +1600,19 @@ Download and install it to continue. Unable to URL authorize user '{0}' to the server {1} + + Rename Workspace + + + Rename Workspace '{0}'... + + + New Name: + + + Rename workspace '{0}' + + + Recent Connections and saved Pending Changelist Filters will be updated with the new workspace name. + \ No newline at end of file diff --git a/P4VS/UI/DlgRenameWorkspace.Designer.cs b/P4VS/UI/DlgRenameWorkspace.Designer.cs new file mode 100644 index 0000000..584bbc2 --- /dev/null +++ b/P4VS/UI/DlgRenameWorkspace.Designer.cs @@ -0,0 +1,164 @@ +using System.ComponentModel; + +namespace Perforce.P4VS +{ + partial class DlgRenameWorkspace + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgRenameWorkspace)); + this.newCancelBtn = new Perforce.I18nControls.GridButton(); + this.renameWorkspaceBtn = new Perforce.I18nControls.GridButton(); + this.ValueTB = new Perforce.I18nControls.GridTextBox(); + this.renameWorkspaceLbl = new Perforce.I18nControls.GridLabel(); + this.gridLayoutPanel1 = new Perforce.I18nControls.GridLayoutPanel(); + this.getNewNameLbl = new Perforce.I18nControls.GridLabel(); + this.warningLbl = new Perforce.I18nControls.GridLabel(); + this.gridLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // newCancelBtn + // + resources.ApplyResources(this.newCancelBtn, "newCancelBtn"); + this.newCancelBtn.CellHeight = 42; + this.newCancelBtn.CellWidth = 256; + this.newCancelBtn.Column = 1; + this.newCancelBtn.ColumnsSpanned = 0; + this.newCancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.newCancelBtn.Name = "newCancelBtn"; + this.newCancelBtn.Row = 3; + this.newCancelBtn.RowsSpanned = 0; + this.newCancelBtn.UseVisualStyleBackColor = true; + this.newCancelBtn.YOffset = 0; + // + // renameWorkspaceBtn + // + resources.ApplyResources(this.renameWorkspaceBtn, "renameWorkspaceBtn"); + this.renameWorkspaceBtn.CellHeight = 42; + this.renameWorkspaceBtn.CellWidth = 397; + this.renameWorkspaceBtn.Column = 0; + this.renameWorkspaceBtn.ColumnsSpanned = 1; + this.renameWorkspaceBtn.DialogResult = System.Windows.Forms.DialogResult.OK; + this.renameWorkspaceBtn.Name = "renameWorkspaceBtn"; + this.renameWorkspaceBtn.Row = 3; + this.renameWorkspaceBtn.RowsSpanned = 0; + this.renameWorkspaceBtn.UseVisualStyleBackColor = true; + this.renameWorkspaceBtn.YOffset = 0; + // + // ValueTB + // + resources.ApplyResources(this.ValueTB, "ValueTB"); + this.ValueTB.CellHeight = 49; + this.ValueTB.CellWidth = 256; + this.ValueTB.Column = 1; + this.ValueTB.ColumnsSpanned = 0; + this.ValueTB.Name = "ValueTB"; + this.ValueTB.Row = 1; + this.ValueTB.RowsSpanned = 0; + this.ValueTB.YOffset = 7; + this.ValueTB.TextChanged += new System.EventHandler(this.ValueTB_TextChanged); + this.ValueTB.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ValueTB_KeyDown); + // + // renameWorkspaceLbl + // + resources.ApplyResources(this.renameWorkspaceLbl, "renameWorkspaceLbl"); + this.renameWorkspaceLbl.CellHeight = 35; + this.renameWorkspaceLbl.CellWidth = 397; + this.renameWorkspaceLbl.Column = 0; + this.renameWorkspaceLbl.ColumnsSpanned = 3; + this.renameWorkspaceLbl.Name = "renameWorkspaceLbl"; + this.renameWorkspaceLbl.Row = 0; + this.renameWorkspaceLbl.RowsSpanned = 0; + this.renameWorkspaceLbl.YOffset = 0; + // + // gridLayoutPanel1 + // + this.gridLayoutPanel1.Controls.Add(this.renameWorkspaceLbl); + this.gridLayoutPanel1.Controls.Add(this.newCancelBtn); + this.gridLayoutPanel1.Controls.Add(this.renameWorkspaceBtn); + this.gridLayoutPanel1.Controls.Add(this.getNewNameLbl); + this.gridLayoutPanel1.Controls.Add(this.ValueTB); + this.gridLayoutPanel1.Controls.Add(this.warningLbl); + resources.ApplyResources(this.gridLayoutPanel1, "gridLayoutPanel1"); + this.gridLayoutPanel1.EnableDesignerGrid = true; + this.gridLayoutPanel1.EnableDesignerLayout = true; + this.gridLayoutPanel1.EnableParentResize = false; + this.gridLayoutPanel1.MinimumColumnWidth = 15; + this.gridLayoutPanel1.MinimumRowHeight = 10; + this.gridLayoutPanel1.Name = "gridLayoutPanel1"; + // + // getNewNameLbl + // + resources.ApplyResources(this.getNewNameLbl, "getNewNameLbl"); + this.getNewNameLbl.CellHeight = 49; + this.getNewNameLbl.CellWidth = 141; + this.getNewNameLbl.Column = 0; + this.getNewNameLbl.ColumnsSpanned = 0; + this.getNewNameLbl.Name = "getNewNameLbl"; + this.getNewNameLbl.Row = 1; + this.getNewNameLbl.RowsSpanned = 0; + this.getNewNameLbl.YOffset = 0; + // + // warningLbl + // + resources.ApplyResources(this.warningLbl, "warningLbl"); + this.warningLbl.CellHeight = 49; + this.warningLbl.CellWidth = 397; + this.warningLbl.Column = 0; + this.warningLbl.ColumnsSpanned = 2; + this.warningLbl.Name = "warningLbl"; + this.warningLbl.Row = 2; + this.warningLbl.RowsSpanned = 0; + this.warningLbl.YOffset = 0; + // + // DlgRenameWorkspace + // + this.AcceptButton = this.renameWorkspaceBtn; + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.newCancelBtn; + this.Controls.Add(this.gridLayoutPanel1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "DlgRenameWorkspace"; + this.gridLayoutPanel1.ResumeLayout(false); + this.gridLayoutPanel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private Perforce.I18nControls.GridLabel renameWorkspaceLbl; + private Perforce.I18nControls.GridTextBox ValueTB; + private Perforce.I18nControls.GridButton renameWorkspaceBtn; + private Perforce.I18nControls.GridButton newCancelBtn; + private I18nControls.GridLayoutPanel gridLayoutPanel1; + private I18nControls.GridLabel warningLbl; + private I18nControls.GridLabel getNewNameLbl; + } +} \ No newline at end of file diff --git a/P4VS/UI/DlgRenameWorkspace.cs b/P4VS/UI/DlgRenameWorkspace.cs new file mode 100644 index 0000000..1c90bc4 --- /dev/null +++ b/P4VS/UI/DlgRenameWorkspace.cs @@ -0,0 +1,58 @@ +using System; +using System.Windows.Forms; + +namespace Perforce.P4VS +{ + public partial class DlgRenameWorkspace : AutoSizeForm + { + public DlgRenameWorkspace(string caption, string prompt, string DefaultValue) + { + PreferenceKey = "DlgRenameWorkspace"; + + InitializeComponent(); + + this.Icon = Images.icon_p4vs_16px; + this.Text = caption; + renameWorkspaceLbl.Text = prompt; + getNewNameLbl.Text = Resources.WorkspacesWindowControl_RenameWorkspaceNewNameLabel; + warningLbl.Text = Resources.WorlspacesWindowControl_RenameWorkspaceWarningInfo; + EnableDisableRenameWorkspaceBtn(); + } + + private DlgRenameWorkspace() {} + + public string Value { get { return ValueTB.Text; } } + + public static string Show(string Caption, string prompt, string DefaultValue) + { + DlgRenameWorkspace dlg = new DlgRenameWorkspace(Caption, prompt, DefaultValue); + + if (dlg.ShowDialog() != DialogResult.Cancel) + { + if (dlg.DialogResult == DialogResult.OK) + { + return dlg.Value; + } + } + + return null; + } + + private void ValueTB_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Return) + renameWorkspaceBtn.PerformClick(); + } + + private void ValueTB_TextChanged(object sender, EventArgs e) + { + EnableDisableRenameWorkspaceBtn(); + } + + private void EnableDisableRenameWorkspaceBtn() + { + renameWorkspaceBtn.Enabled = !(string.IsNullOrWhiteSpace(ValueTB.Text)); + } + + } +} diff --git a/P4VS/UI/DlgRenameWorkspace.resx b/P4VS/UI/DlgRenameWorkspace.resx new file mode 100644 index 0000000..814db7d --- /dev/null +++ b/P4VS/UI/DlgRenameWorkspace.resx @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Right + + + + 292, 152 + + + 4, 4, 4, 4 + + + 114, 28 + + + 114, 28 + + + + 2 + + + Cancel + + + newCancelBtn + + + Perforce.I18nControls.GridButton, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 1 + + + None + + + 143, 152 + + + 4, 4, 4, 4 + + + 141, 28 + + + 1 + + + Rename Workspace + + + renameWorkspaceBtn + + + Perforce.I18nControls.GridButton, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 2 + + + Right + + + 160, 60 + + + 4, 0, 4, 0 + + + 140, 22 + + + 246, 22 + + + 0 + + + ValueTB + + + Perforce.I18nControls.GridTextBox, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 4 + + + Left + + + 19, 27 + + + 4, 0, 4, 0 + + + 393, 26 + + + 0 + + + Rename Workspace '' + + + renameWorkspaceLbl + + + Perforce.I18nControls.GridLabel, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 0 + + + Left + + + NoControl + + + 18, 53 + + + 128, 36 + + + 0 + + + New name: + + + MiddleLeft + + + getNewNameLbl + + + Perforce.I18nControls.GridLabel, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 3 + + + Left, Right + + + NoControl + + + 19, 102 + + + 4, 0, 4, 0 + + + 389, 36 + + + 3 + + + Warning Info + + + warningLbl + + + Perforce.I18nControls.GridLabel, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + gridLayoutPanel1 + + + 5 + + + Fill + + + 0, 0 + + + 4, 4, 4, 4 + + + 13, 12, 13, 12 + + + 425, 203 + + + 4 + + + gridLayoutPanel1 + + + Perforce.I18nControls.GridLayoutPanel, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + + $this + + + 0 + + + True + + + 8, 16 + + + 425, 203 + + + + AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAQAMAABMLAAATCwAAAAAAAAAA + AADaoCzYni7WmzDUmDLSljTQlDbOkjjMjzrLjTzIhzivcCSzcyvJiELFhEPAgkXBgUbboirZoCzXnS7V + mzDSmDLRljTPlDbNkTjPjTLAjkyIj5psbm+rcS7MjETBgkPBgkXdpSjboirZoCzXnS7goTHhoTPenjXd + nDjblzLam0XI1OKeqbmeaCjglkPKiUTCg0TfpybepSrcpCzbnymwexamcRKnchSncRenbRelahW6urqq + s79yTiKhZyG4fDjKiUTjqyXkpx7npBPkpB7DytWzu8ixtr+ss7ykq7eboamztbi4uLeZnaSEk6ZxWTvQ + iTnprh3CljORdDSObinO1eTq7fPd3+DR0tHY2tzGy9S7vsWysrS0tbe1wtF7cWXGgTDiowLo1qr7///Q + 1uSrkFzt9f/d4eiJg3mmagDmmx3LqXW6x9uDfna4eiTPk0TKiTziowDr1Z3////W3uuaXADrxGzZ4O/k + 7PhyZk7DeQDdqlK9yuCJjI+rbhbZljvIiz3kpwDq1pr+///m6e2JfGCWfk2FhYSQkJPW4PJuWTXRjxnI + zdaWoa+YaSHbmjnKjTvlqQDr1Zr6///19vb7///p9f/j5eiWlZWZm5vEzt1wTQ/Hv7Cns8eJZSvdmjPM + kDroqgDs1pr////k5+/MuILq0pnb3ufb3N19f4PT1t2goaKjnZe7w9J+aEHZlSjPkznorADt15r////Q + 1N2iZQDplwDSzLnb4vGakoLIxsbIzNe+vb26wcx+cl7Rjx7TljnqrQDt15r////o6O6KfFqfj2bX2tvV + 4PqfhEbosDTJ0uu2uLrAw8eEgXrFhRfYmzfqrgDu3qv////7///8///t+//f6v+7wNDJlBPpoQDgvXG9 + zOy5xNmHlKqueRbeoDTutQTtzGTx3KPs15fm0pXiz5jXwYXWoRzqrRbhqSbhoAnauXTFt5m1pojEjifb + nTDwvhzuuAvrsQfssAfrrgfrrgfsrgjstB3msCfkriniqyripRnhohfkpB7gpTLYoDUAAJAoAAAAAAAA + HR0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + + + 4, 4, 4, 4 + + + 2658, 250 + + + 350, 250 + + + P4VS + + + DlgRenameWorkspace + + + Perforce.P4VS.AutoSizeForm, P4VS_Utils, Version=2011.1.0.0, Culture=neutral, PublicKeyToken=5d747d90f174beb1 + + \ No newline at end of file diff --git a/P4VS/UI/WorkspacesWindowControl.cs b/P4VS/UI/WorkspacesWindowControl.cs index d92784b..976a37a 100644 --- a/P4VS/UI/WorkspacesWindowControl.cs +++ b/P4VS/UI/WorkspacesWindowControl.cs @@ -10,20 +10,14 @@ IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR ***************************************************************************/ +using Perforce.P4; +using Perforce.P4Scm; using System; -using System.Globalization; using System.Collections.Generic; using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; -using System.Runtime.InteropServices; -using System.Threading; using System.Net; -using Perforce.P4; -using IServiceProvider = System.IServiceProvider; -using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider; -using Label = System.Windows.Forms.Label; -using Perforce.P4Scm; +using System.Threading; +using System.Windows.Forms; namespace Perforce.P4VS { @@ -135,6 +129,7 @@ public workspacesTreeListViewItem(TreeListViewItem parentItem, string[] items, n private I18nControls.GridCheckBox compressChk; private I18nControls.GridCheckBox clobberChk; private I18nControls.GridCheckBox allwriteChk; + private ToolStripMenuItem renameWorkspaceToolStripMenuItem; private ImageList imageList1; public WorkspaceToolWindowControl() @@ -380,6 +375,7 @@ protected override bool ProcessDialogChar(char charCode) this.dateModifiedLbl = new Perforce.I18nControls.GridLabel(); this.workspaceLbl = new Perforce.I18nControls.GridLabel(); this.gridLayoutPanel1 = new Perforce.I18nControls.GridLayoutPanel(); + this.renameWorkspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -448,8 +444,8 @@ protected override bool ProcessDialogChar(char charCode) this.workspacesTreeListView.ActionColumn = -1; this.workspacesTreeListView.AllowColumnReorder = true; resources.ApplyResources(this.workspacesTreeListView, "workspacesTreeListView"); - this.workspacesTreeListView.CellHeight = 148; - this.workspacesTreeListView.CellWidth = 576; + this.workspacesTreeListView.CellHeight = 181; + this.workspacesTreeListView.CellWidth = 769; this.workspacesTreeListView.Column = 0; this.workspacesTreeListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.workspace, @@ -530,12 +526,14 @@ protected override bool ProcessDialogChar(char charCode) // // contextMenuStrip1 // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.getRevisionToolStripMenuItem, this.toolStripSeparator1, this.newWorkspaceToolStripMenuItem, this.createWorkspaceFromToolStripMenuItem, this.editWorkspaceToolStripMenuItem, + this.renameWorkspaceToolStripMenuItem, this.deleteWorkspaceToolStripMenuItem, this.toolStripSeparator2, this.refreshWorkspaceListToolStripMenuItem, @@ -599,8 +597,8 @@ protected override bool ProcessDialogChar(char charCode) // ownerCB // resources.ApplyResources(this.ownerCB, "ownerCB"); - this.ownerCB.CellHeight = 29; - this.ownerCB.CellWidth = 137; + this.ownerCB.CellHeight = 36; + this.ownerCB.CellWidth = 191; this.ownerCB.Column = 1; this.ownerCB.ColumnsSpanned = 0; this.ownerCB.FormattingEnabled = true; @@ -614,8 +612,8 @@ protected override bool ProcessDialogChar(char charCode) // dividerGB // resources.ApplyResources(this.dividerGB, "dividerGB"); - this.dividerGB.CellHeight = 65; - this.dividerGB.CellWidth = 10; + this.dividerGB.CellHeight = 81; + this.dividerGB.CellWidth = 12; this.dividerGB.Column = 4; this.dividerGB.ColumnsSpanned = 0; this.dividerGB.Name = "dividerGB"; @@ -627,8 +625,8 @@ protected override bool ProcessDialogChar(char charCode) // nameCaseFilterChk // resources.ApplyResources(this.nameCaseFilterChk, "nameCaseFilterChk"); - this.nameCaseFilterChk.CellHeight = 23; - this.nameCaseFilterChk.CellWidth = 214; + this.nameCaseFilterChk.CellHeight = 29; + this.nameCaseFilterChk.CellWidth = 298; this.nameCaseFilterChk.Column = 3; this.nameCaseFilterChk.ColumnsSpanned = 0; this.nameCaseFilterChk.Name = "nameCaseFilterChk"; @@ -640,8 +638,8 @@ protected override bool ProcessDialogChar(char charCode) // nameContainsCB // resources.ApplyResources(this.nameContainsCB, "nameContainsCB"); - this.nameContainsCB.CellHeight = 29; - this.nameContainsCB.CellWidth = 214; + this.nameContainsCB.CellHeight = 36; + this.nameContainsCB.CellWidth = 298; this.nameContainsCB.Column = 3; this.nameContainsCB.ColumnsSpanned = 0; this.nameContainsCB.FormattingEnabled = true; @@ -655,8 +653,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceHostFilterChk // resources.ApplyResources(this.workspaceHostFilterChk, "workspaceHostFilterChk"); - this.workspaceHostFilterChk.CellHeight = 23; - this.workspaceHostFilterChk.CellWidth = 271; + this.workspaceHostFilterChk.CellHeight = 29; + this.workspaceHostFilterChk.CellWidth = 355; this.workspaceHostFilterChk.Column = 0; this.workspaceHostFilterChk.ColumnsSpanned = 2; this.workspaceHostFilterChk.Name = "workspaceHostFilterChk"; @@ -668,8 +666,8 @@ protected override bool ProcessDialogChar(char charCode) // filterBtn // resources.ApplyResources(this.filterBtn, "filterBtn"); - this.filterBtn.CellHeight = 29; - this.filterBtn.CellWidth = 81; + this.filterBtn.CellHeight = 36; + this.filterBtn.CellWidth = 104; this.filterBtn.Column = 5; this.filterBtn.ColumnsSpanned = 0; this.filterBtn.Name = "filterBtn"; @@ -683,8 +681,8 @@ protected override bool ProcessDialogChar(char charCode) // streamVarLbl // resources.ApplyResources(this.streamVarLbl, "streamVarLbl"); - this.streamVarLbl.CellHeight = 13; - this.streamVarLbl.CellWidth = 214; + this.streamVarLbl.CellHeight = 16; + this.streamVarLbl.CellWidth = 298; this.streamVarLbl.Column = 3; this.streamVarLbl.ColumnsSpanned = 0; this.streamVarLbl.Name = "streamVarLbl"; @@ -695,8 +693,8 @@ protected override bool ProcessDialogChar(char charCode) // ownerCBLbl // resources.ApplyResources(this.ownerCBLbl, "ownerCBLbl"); - this.ownerCBLbl.CellHeight = 29; - this.ownerCBLbl.CellWidth = 47; + this.ownerCBLbl.CellHeight = 36; + this.ownerCBLbl.CellWidth = 56; this.ownerCBLbl.Column = 0; this.ownerCBLbl.ColumnsSpanned = 0; this.ownerCBLbl.Name = "ownerCBLbl"; @@ -708,8 +706,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceMatchesLbl, "workspaceMatchesLbl"); this.workspaceMatchesLbl.AutoEllipsis = true; - this.workspaceMatchesLbl.CellHeight = 23; - this.workspaceMatchesLbl.CellWidth = 81; + this.workspaceMatchesLbl.CellHeight = 29; + this.workspaceMatchesLbl.CellWidth = 104; this.workspaceMatchesLbl.Column = 5; this.workspaceMatchesLbl.ColumnsSpanned = 0; this.workspaceMatchesLbl.Name = "workspaceMatchesLbl"; @@ -720,8 +718,8 @@ protected override bool ProcessDialogChar(char charCode) // nameContainsLbl // resources.ApplyResources(this.nameContainsLbl, "nameContainsLbl"); - this.nameContainsLbl.CellHeight = 29; - this.nameContainsLbl.CellWidth = 87; + this.nameContainsLbl.CellHeight = 36; + this.nameContainsLbl.CellWidth = 108; this.nameContainsLbl.Column = 2; this.nameContainsLbl.ColumnsSpanned = 0; this.nameContainsLbl.Name = "nameContainsLbl"; @@ -774,8 +772,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.panel6, "panel6"); this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel6.CellHeight = 36; - this.panel6.CellWidth = 454; + this.panel6.CellHeight = 44; + this.panel6.CellWidth = 617; this.panel6.Column = 1; this.panel6.ColumnsSpanned = 2; this.panel6.Controls.Add(this.rmdirChk); @@ -797,8 +795,8 @@ protected override bool ProcessDialogChar(char charCode) // rmdirChk // resources.ApplyResources(this.rmdirChk, "rmdirChk"); - this.rmdirChk.CellHeight = 26; - this.rmdirChk.CellWidth = 77; + this.rmdirChk.CellHeight = 32; + this.rmdirChk.CellWidth = 103; this.rmdirChk.Column = 5; this.rmdirChk.ColumnsSpanned = 0; this.rmdirChk.Name = "rmdirChk"; @@ -812,8 +810,8 @@ protected override bool ProcessDialogChar(char charCode) // modtimeChk // resources.ApplyResources(this.modtimeChk, "modtimeChk"); - this.modtimeChk.CellHeight = 26; - this.modtimeChk.CellWidth = 77; + this.modtimeChk.CellHeight = 32; + this.modtimeChk.CellWidth = 103; this.modtimeChk.Column = 4; this.modtimeChk.ColumnsSpanned = 0; this.modtimeChk.Name = "modtimeChk"; @@ -827,8 +825,8 @@ protected override bool ProcessDialogChar(char charCode) // lockedChk // resources.ApplyResources(this.lockedChk, "lockedChk"); - this.lockedChk.CellHeight = 26; - this.lockedChk.CellWidth = 77; + this.lockedChk.CellHeight = 32; + this.lockedChk.CellWidth = 103; this.lockedChk.Column = 3; this.lockedChk.ColumnsSpanned = 0; this.lockedChk.Name = "lockedChk"; @@ -842,8 +840,8 @@ protected override bool ProcessDialogChar(char charCode) // compressChk // resources.ApplyResources(this.compressChk, "compressChk"); - this.compressChk.CellHeight = 26; - this.compressChk.CellWidth = 77; + this.compressChk.CellHeight = 32; + this.compressChk.CellWidth = 103; this.compressChk.Column = 2; this.compressChk.ColumnsSpanned = 0; this.compressChk.Name = "compressChk"; @@ -857,8 +855,8 @@ protected override bool ProcessDialogChar(char charCode) // clobberChk // resources.ApplyResources(this.clobberChk, "clobberChk"); - this.clobberChk.CellHeight = 26; - this.clobberChk.CellWidth = 77; + this.clobberChk.CellHeight = 32; + this.clobberChk.CellWidth = 103; this.clobberChk.Column = 1; this.clobberChk.ColumnsSpanned = 0; this.clobberChk.Name = "clobberChk"; @@ -872,8 +870,8 @@ protected override bool ProcessDialogChar(char charCode) // allwriteChk // resources.ApplyResources(this.allwriteChk, "allwriteChk"); - this.allwriteChk.CellHeight = 26; - this.allwriteChk.CellWidth = 77; + this.allwriteChk.CellHeight = 32; + this.allwriteChk.CellWidth = 103; this.allwriteChk.Column = 0; this.allwriteChk.ColumnsSpanned = 0; this.allwriteChk.Name = "allwriteChk"; @@ -887,8 +885,8 @@ protected override bool ProcessDialogChar(char charCode) // viewTB // resources.ApplyResources(this.viewTB, "viewTB"); - this.viewTB.CellHeight = 210; - this.viewTB.CellWidth = 454; + this.viewTB.CellHeight = 261; + this.viewTB.CellWidth = 617; this.viewTB.Column = 1; this.viewTB.ColumnsSpanned = 2; this.viewTB.Name = "viewTB"; @@ -896,13 +894,13 @@ protected override bool ProcessDialogChar(char charCode) this.viewTB.Row = 11; this.viewTB.RowsSpanned = 0; this.viewTB.TabStop = false; - this.viewTB.YOffset = 9; + this.viewTB.YOffset = 12; // // altRootsTB // resources.ApplyResources(this.altRootsTB, "altRootsTB"); - this.altRootsTB.CellHeight = 45; - this.altRootsTB.CellWidth = 454; + this.altRootsTB.CellHeight = 55; + this.altRootsTB.CellWidth = 617; this.altRootsTB.Column = 1; this.altRootsTB.ColumnsSpanned = 2; this.altRootsTB.Name = "altRootsTB"; @@ -915,8 +913,8 @@ protected override bool ProcessDialogChar(char charCode) // severIDLbl // resources.ApplyResources(this.severIDLbl, "severIDLbl"); - this.severIDLbl.CellHeight = 13; - this.severIDLbl.CellWidth = 102; + this.severIDLbl.CellHeight = 16; + this.severIDLbl.CellWidth = 126; this.severIDLbl.Column = 0; this.severIDLbl.ColumnsSpanned = 0; this.severIDLbl.Name = "severIDLbl"; @@ -927,8 +925,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceSeverIDLbl // resources.ApplyResources(this.workspaceSeverIDLbl, "workspaceSeverIDLbl"); - this.workspaceSeverIDLbl.CellHeight = 13; - this.workspaceSeverIDLbl.CellWidth = 454; + this.workspaceSeverIDLbl.CellHeight = 16; + this.workspaceSeverIDLbl.CellWidth = 617; this.workspaceSeverIDLbl.Column = 1; this.workspaceSeverIDLbl.ColumnsSpanned = 2; this.workspaceSeverIDLbl.Name = "workspaceSeverIDLbl"; @@ -939,8 +937,8 @@ protected override bool ProcessDialogChar(char charCode) // streamAtChangeLbl // resources.ApplyResources(this.streamAtChangeLbl, "streamAtChangeLbl"); - this.streamAtChangeLbl.CellHeight = 13; - this.streamAtChangeLbl.CellWidth = 102; + this.streamAtChangeLbl.CellHeight = 16; + this.streamAtChangeLbl.CellWidth = 126; this.streamAtChangeLbl.Column = 0; this.streamAtChangeLbl.ColumnsSpanned = 0; this.streamAtChangeLbl.Name = "streamAtChangeLbl"; @@ -951,8 +949,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceStreamAtChangeLbl // resources.ApplyResources(this.workspaceStreamAtChangeLbl, "workspaceStreamAtChangeLbl"); - this.workspaceStreamAtChangeLbl.CellHeight = 13; - this.workspaceStreamAtChangeLbl.CellWidth = 454; + this.workspaceStreamAtChangeLbl.CellHeight = 16; + this.workspaceStreamAtChangeLbl.CellWidth = 617; this.workspaceStreamAtChangeLbl.Column = 1; this.workspaceStreamAtChangeLbl.ColumnsSpanned = 2; this.workspaceStreamAtChangeLbl.Name = "workspaceStreamAtChangeLbl"; @@ -963,8 +961,8 @@ protected override bool ProcessDialogChar(char charCode) // descriptionTB // resources.ApplyResources(this.descriptionTB, "descriptionTB"); - this.descriptionTB.CellHeight = 42; - this.descriptionTB.CellWidth = 454; + this.descriptionTB.CellHeight = 51; + this.descriptionTB.CellWidth = 617; this.descriptionTB.Column = 1; this.descriptionTB.ColumnsSpanned = 2; this.descriptionTB.Name = "descriptionTB"; @@ -977,8 +975,8 @@ protected override bool ProcessDialogChar(char charCode) // streamLbl // resources.ApplyResources(this.streamLbl, "streamLbl"); - this.streamLbl.CellHeight = 13; - this.streamLbl.CellWidth = 102; + this.streamLbl.CellHeight = 16; + this.streamLbl.CellWidth = 126; this.streamLbl.Column = 0; this.streamLbl.ColumnsSpanned = 0; this.streamLbl.Name = "streamLbl"; @@ -989,8 +987,8 @@ protected override bool ProcessDialogChar(char charCode) // altRootsLbl // resources.ApplyResources(this.altRootsLbl, "altRootsLbl"); - this.altRootsLbl.CellHeight = 45; - this.altRootsLbl.CellWidth = 102; + this.altRootsLbl.CellHeight = 55; + this.altRootsLbl.CellWidth = 126; this.altRootsLbl.Column = 0; this.altRootsLbl.ColumnsSpanned = 0; this.altRootsLbl.Name = "altRootsLbl"; @@ -1001,8 +999,8 @@ protected override bool ProcessDialogChar(char charCode) // optionsLbl // resources.ApplyResources(this.optionsLbl, "optionsLbl"); - this.optionsLbl.CellHeight = 36; - this.optionsLbl.CellWidth = 102; + this.optionsLbl.CellHeight = 44; + this.optionsLbl.CellWidth = 126; this.optionsLbl.Column = 0; this.optionsLbl.ColumnsSpanned = 0; this.optionsLbl.Name = "optionsLbl"; @@ -1013,8 +1011,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceRootLbl // resources.ApplyResources(this.workspaceRootLbl, "workspaceRootLbl"); - this.workspaceRootLbl.CellHeight = 13; - this.workspaceRootLbl.CellWidth = 454; + this.workspaceRootLbl.CellHeight = 16; + this.workspaceRootLbl.CellWidth = 617; this.workspaceRootLbl.Column = 1; this.workspaceRootLbl.ColumnsSpanned = 2; this.workspaceRootLbl.Name = "workspaceRootLbl"; @@ -1025,8 +1023,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceStreamRootLbl // resources.ApplyResources(this.workspaceStreamRootLbl, "workspaceStreamRootLbl"); - this.workspaceStreamRootLbl.CellHeight = 13; - this.workspaceStreamRootLbl.CellWidth = 185; + this.workspaceStreamRootLbl.CellHeight = 16; + this.workspaceStreamRootLbl.CellWidth = 256; this.workspaceStreamRootLbl.Column = 1; this.workspaceStreamRootLbl.ColumnsSpanned = 0; this.workspaceStreamRootLbl.Name = "workspaceStreamRootLbl"; @@ -1037,8 +1035,8 @@ protected override bool ProcessDialogChar(char charCode) // rootLbl // resources.ApplyResources(this.rootLbl, "rootLbl"); - this.rootLbl.CellHeight = 13; - this.rootLbl.CellWidth = 102; + this.rootLbl.CellHeight = 16; + this.rootLbl.CellWidth = 126; this.rootLbl.Column = 0; this.rootLbl.ColumnsSpanned = 0; this.rootLbl.Name = "rootLbl"; @@ -1050,8 +1048,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceHostNameLbl, "workspaceHostNameLbl"); this.workspaceHostNameLbl.AutoEllipsis = true; - this.workspaceHostNameLbl.CellHeight = 13; - this.workspaceHostNameLbl.CellWidth = 185; + this.workspaceHostNameLbl.CellHeight = 16; + this.workspaceHostNameLbl.CellWidth = 256; this.workspaceHostNameLbl.Column = 3; this.workspaceHostNameLbl.ColumnsSpanned = 0; this.workspaceHostNameLbl.Name = "workspaceHostNameLbl"; @@ -1062,8 +1060,8 @@ protected override bool ProcessDialogChar(char charCode) // viewLbl // resources.ApplyResources(this.viewLbl, "viewLbl"); - this.viewLbl.CellHeight = 210; - this.viewLbl.CellWidth = 102; + this.viewLbl.CellHeight = 261; + this.viewLbl.CellWidth = 126; this.viewLbl.Column = 0; this.viewLbl.ColumnsSpanned = 0; this.viewLbl.Name = "viewLbl"; @@ -1075,8 +1073,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceSubmitOptionsLbl, "workspaceSubmitOptionsLbl"); this.workspaceSubmitOptionsLbl.AutoEllipsis = true; - this.workspaceSubmitOptionsLbl.CellHeight = 13; - this.workspaceSubmitOptionsLbl.CellWidth = 185; + this.workspaceSubmitOptionsLbl.CellHeight = 16; + this.workspaceSubmitOptionsLbl.CellWidth = 256; this.workspaceSubmitOptionsLbl.Column = 3; this.workspaceSubmitOptionsLbl.ColumnsSpanned = 0; this.workspaceSubmitOptionsLbl.Name = "workspaceSubmitOptionsLbl"; @@ -1088,8 +1086,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceLastAccessedLbl, "workspaceLastAccessedLbl"); this.workspaceLastAccessedLbl.AutoEllipsis = true; - this.workspaceLastAccessedLbl.CellHeight = 13; - this.workspaceLastAccessedLbl.CellWidth = 185; + this.workspaceLastAccessedLbl.CellHeight = 16; + this.workspaceLastAccessedLbl.CellWidth = 256; this.workspaceLastAccessedLbl.Column = 1; this.workspaceLastAccessedLbl.ColumnsSpanned = 0; this.workspaceLastAccessedLbl.Name = "workspaceLastAccessedLbl"; @@ -1100,8 +1098,8 @@ protected override bool ProcessDialogChar(char charCode) // OwnerLbl // resources.ApplyResources(this.OwnerLbl, "OwnerLbl"); - this.OwnerLbl.CellHeight = 13; - this.OwnerLbl.CellWidth = 102; + this.OwnerLbl.CellHeight = 16; + this.OwnerLbl.CellWidth = 126; this.OwnerLbl.Column = 0; this.OwnerLbl.ColumnsSpanned = 0; this.OwnerLbl.Name = "OwnerLbl"; @@ -1113,8 +1111,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceNameLbl, "workspaceNameLbl"); this.workspaceNameLbl.AutoEllipsis = true; - this.workspaceNameLbl.CellHeight = 13; - this.workspaceNameLbl.CellWidth = 185; + this.workspaceNameLbl.CellHeight = 16; + this.workspaceNameLbl.CellWidth = 256; this.workspaceNameLbl.Column = 1; this.workspaceNameLbl.ColumnsSpanned = 0; this.workspaceNameLbl.Name = "workspaceNameLbl"; @@ -1125,8 +1123,8 @@ protected override bool ProcessDialogChar(char charCode) // hostLbl // resources.ApplyResources(this.hostLbl, "hostLbl"); - this.hostLbl.CellHeight = 13; - this.hostLbl.CellWidth = 84; + this.hostLbl.CellHeight = 16; + this.hostLbl.CellWidth = 105; this.hostLbl.Column = 2; this.hostLbl.ColumnsSpanned = 0; this.hostLbl.Name = "hostLbl"; @@ -1137,8 +1135,8 @@ protected override bool ProcessDialogChar(char charCode) // descriptionLbl // resources.ApplyResources(this.descriptionLbl, "descriptionLbl"); - this.descriptionLbl.CellHeight = 42; - this.descriptionLbl.CellWidth = 102; + this.descriptionLbl.CellHeight = 51; + this.descriptionLbl.CellWidth = 126; this.descriptionLbl.Column = 0; this.descriptionLbl.ColumnsSpanned = 0; this.descriptionLbl.Name = "descriptionLbl"; @@ -1149,8 +1147,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceLineEndingsLbl // resources.ApplyResources(this.workspaceLineEndingsLbl, "workspaceLineEndingsLbl"); - this.workspaceLineEndingsLbl.CellHeight = 13; - this.workspaceLineEndingsLbl.CellWidth = 185; + this.workspaceLineEndingsLbl.CellHeight = 16; + this.workspaceLineEndingsLbl.CellWidth = 256; this.workspaceLineEndingsLbl.Column = 3; this.workspaceLineEndingsLbl.ColumnsSpanned = 0; this.workspaceLineEndingsLbl.Name = "workspaceLineEndingsLbl"; @@ -1161,8 +1159,8 @@ protected override bool ProcessDialogChar(char charCode) // lineEndingsLbl // resources.ApplyResources(this.lineEndingsLbl, "lineEndingsLbl"); - this.lineEndingsLbl.CellHeight = 13; - this.lineEndingsLbl.CellWidth = 84; + this.lineEndingsLbl.CellHeight = 16; + this.lineEndingsLbl.CellWidth = 105; this.lineEndingsLbl.Column = 2; this.lineEndingsLbl.ColumnsSpanned = 0; this.lineEndingsLbl.Name = "lineEndingsLbl"; @@ -1173,8 +1171,8 @@ protected override bool ProcessDialogChar(char charCode) // submitOptionsLbl // resources.ApplyResources(this.submitOptionsLbl, "submitOptionsLbl"); - this.submitOptionsLbl.CellHeight = 13; - this.submitOptionsLbl.CellWidth = 84; + this.submitOptionsLbl.CellHeight = 16; + this.submitOptionsLbl.CellWidth = 105; this.submitOptionsLbl.Column = 2; this.submitOptionsLbl.ColumnsSpanned = 0; this.submitOptionsLbl.Name = "submitOptionsLbl"; @@ -1186,8 +1184,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceOwnerNameLbl, "workspaceOwnerNameLbl"); this.workspaceOwnerNameLbl.AutoEllipsis = true; - this.workspaceOwnerNameLbl.CellHeight = 13; - this.workspaceOwnerNameLbl.CellWidth = 185; + this.workspaceOwnerNameLbl.CellHeight = 16; + this.workspaceOwnerNameLbl.CellWidth = 256; this.workspaceOwnerNameLbl.Column = 1; this.workspaceOwnerNameLbl.ColumnsSpanned = 0; this.workspaceOwnerNameLbl.Name = "workspaceOwnerNameLbl"; @@ -1199,8 +1197,8 @@ protected override bool ProcessDialogChar(char charCode) // resources.ApplyResources(this.workspaceUpdatedLbl, "workspaceUpdatedLbl"); this.workspaceUpdatedLbl.AutoEllipsis = true; - this.workspaceUpdatedLbl.CellHeight = 13; - this.workspaceUpdatedLbl.CellWidth = 185; + this.workspaceUpdatedLbl.CellHeight = 16; + this.workspaceUpdatedLbl.CellWidth = 256; this.workspaceUpdatedLbl.Column = 1; this.workspaceUpdatedLbl.ColumnsSpanned = 0; this.workspaceUpdatedLbl.Name = "workspaceUpdatedLbl"; @@ -1211,8 +1209,8 @@ protected override bool ProcessDialogChar(char charCode) // lastAccessedLbl // resources.ApplyResources(this.lastAccessedLbl, "lastAccessedLbl"); - this.lastAccessedLbl.CellHeight = 13; - this.lastAccessedLbl.CellWidth = 102; + this.lastAccessedLbl.CellHeight = 16; + this.lastAccessedLbl.CellWidth = 126; this.lastAccessedLbl.Column = 0; this.lastAccessedLbl.ColumnsSpanned = 0; this.lastAccessedLbl.Name = "lastAccessedLbl"; @@ -1223,8 +1221,8 @@ protected override bool ProcessDialogChar(char charCode) // dateModifiedLbl // resources.ApplyResources(this.dateModifiedLbl, "dateModifiedLbl"); - this.dateModifiedLbl.CellHeight = 13; - this.dateModifiedLbl.CellWidth = 102; + this.dateModifiedLbl.CellHeight = 16; + this.dateModifiedLbl.CellWidth = 126; this.dateModifiedLbl.Column = 0; this.dateModifiedLbl.ColumnsSpanned = 0; this.dateModifiedLbl.Name = "dateModifiedLbl"; @@ -1235,8 +1233,8 @@ protected override bool ProcessDialogChar(char charCode) // workspaceLbl // resources.ApplyResources(this.workspaceLbl, "workspaceLbl"); - this.workspaceLbl.CellHeight = 13; - this.workspaceLbl.CellWidth = 102; + this.workspaceLbl.CellHeight = 16; + this.workspaceLbl.CellWidth = 126; this.workspaceLbl.Column = 0; this.workspaceLbl.ColumnsSpanned = 0; this.workspaceLbl.Name = "workspaceLbl"; @@ -1254,6 +1252,12 @@ protected override bool ProcessDialogChar(char charCode) this.gridLayoutPanel1.MinimumRowHeight = 10; this.gridLayoutPanel1.Name = "gridLayoutPanel1"; // + // renameWorkspaceToolStripMenuItem + // + this.renameWorkspaceToolStripMenuItem.Name = "renameWorkspaceToolStripMenuItem"; + resources.ApplyResources(this.renameWorkspaceToolStripMenuItem, "renameWorkspaceToolStripMenuItem"); + this.renameWorkspaceToolStripMenuItem.Click += new System.EventHandler(this.renameWorkspaceToolStripMenuItem_Click); + // // WorkspaceToolWindowControl // resources.ApplyResources(this, "$this"); @@ -1637,6 +1641,8 @@ private void workspacesTreeListView_SelectedIndexChanged(object sender, EventArg } editWorkspaceToolStripMenuItem.Text = String.Format( Resources.WorkspacesWindowControl_EditWorkspaceMenuItem_Text, client.Name); + renameWorkspaceToolStripMenuItem.Text = String.Format( + Resources.WorkspacesWindowControl_RenameWorkspaceMenuItem_Text, client.Name); deleteWorkspaceToolStripMenuItem.Text = String.Format( Resources.WorkspacesWindowControl_DeleteWorkspaceMenuItem_Text, client.Name); refreshWorkspaceToolStripMenuItem.Text = String.Format( @@ -2336,7 +2342,6 @@ private void checkConnection() filterBtn.Enabled = true; contextMenuStrip1.Enabled = true; } - private void filterBtn_EnabledChanged(object sender, EventArgs e) { if ((filterBtn.Enabled == false) && ((Scm == null) || @@ -2608,5 +2613,74 @@ private void rmdirChk_CheckedChanged(object sender, EventArgs e) in_rmdirChk_CheckedChanged = false; } } + + //Rename Workspace ''... context menu click + private void renameWorkspaceToolStripMenuItem_Click(object sender, EventArgs e) + { + P4.Client client = (P4.Client)workspacesTreeListView.SelectedItems[0].Tag; + + string newName = DlgRenameWorkspace.Show("Rename Workspace", + String.Format("Rename Workspace '{0}'",client.Name),null); + + if (Scm == null) + { + P4VsProviderService P4VSService = (P4VsProviderService)GetService(typeof(P4VsProviderService)); + if (P4VSService != null) + { + Scm = P4VSService.ScmProvider; + } + } + + if (Scm == null) + { + return; + } + + try + { + if (!string.IsNullOrWhiteSpace(newName)) + { + string result = Scm.RenameClient(client.Name, newName); + + if (Scm.Connection.Workspace == client.Name) + { + ConnectionData connectionData = new ConnectionData() + { + ServerPort = Scm.Connection.Port, + UserName = Scm.Connection.User, + Workspace = newName + }; + Scm.Connection.Connect(connectionData); + P4VsProvider.Instance.currentConnectionDropDownComboChoice = connectionData.ToString(); + } + } + } + catch (P4Exception ex) + { + string message = ex.Message; + string old_workspace_name = client.Name; + string new_workspace_name = newName; + + // Check if either old_workspace_name or new_workspace_name exists in the message + if (message.Contains(old_workspace_name) || message.Contains(new_workspace_name)) + { + if (old_workspace_name != new_workspace_name) + { + // Replace occurrences of old_workspace_name and new_workspace_name with quoted versions + message = message.Replace(old_workspace_name, $"'{old_workspace_name}'") + .Replace(new_workspace_name, $"'{new_workspace_name}'"); + } + else + { + message = message.Replace(old_workspace_name, $"'{old_workspace_name}'"); + } + } + + MessageBox.Show(message, Resources.P4VS, MessageBoxButtons.OK, MessageBoxIcon.Error); + + } + + refreshWorkspacesList(); + } } } \ No newline at end of file diff --git a/P4VS/UI/WorkspacesWindowControl.resx b/P4VS/UI/WorkspacesWindowControl.resx index de25f75..51ed265 100644 --- a/P4VS/UI/WorkspacesWindowControl.resx +++ b/P4VS/UI/WorkspacesWindowControl.resx @@ -125,14 +125,20 @@ 0, 0 + + 4, 4, 4, 4 + Horizontal - 109, 101 + 145, 124 + + + 5, 5, 5, 5 - 373, 46 + 497, 56 @@ -195,62 +201,71 @@ Description + + 239 + 17, 17 - 219, 22 + 256, 24 Get Revision... - 216, 6 + 253, 6 Ctrl+N - 219, 22 + 256, 24 New Workspace... - 219, 22 + 256, 24 Create Workspace from ' '... - 219, 22 + 256, 24 Edit Workspace ' ' + + 256, 24 + + + Rename Workspace ' ' + - 219, 22 + 256, 24 Delete Workspace ' ' - 216, 6 + 253, 6 - 219, 22 + 256, 24 Refresh Workspace List - 219, 22 + 256, 24 Refresh Workspace ' ' - 220, 170 + 257, 236 contextMenuStrip1 @@ -259,10 +274,13 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 3, 68 + 4, 85 + + + 4, 4, 4, 4 - 570, 142 + 761, 173 0 @@ -283,10 +301,13 @@ Left, Right - 50, 4 + 60, 6 + + + 4, 4, 4, 4 - 131, 21 + 183, 24 1 @@ -307,10 +328,16 @@ Top, Bottom - 488, 3 + 657, 4 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 3, 59 + 4, 73 0 @@ -337,10 +364,13 @@ NoControl - 400, 32 + 540, 40 + + + 4, 4, 4, 4 - 82, 17 + 109, 21 4 @@ -364,10 +394,13 @@ Left, Right - 274, 4 + 359, 6 + + + 4, 4, 4, 4 - 208, 21 + 290, 24 2 @@ -394,10 +427,13 @@ NoControl - 3, 32 + 4, 40 + + + 4, 4, 4, 4 - 296, 17 + 395, 21 3 @@ -427,10 +463,13 @@ NoControl - 501, 3 + 669, 4 + + + 4, 4, 4, 4 - 72, 23 + 96, 28 5 @@ -460,10 +499,13 @@ NoControl - 274, 52 + 359, 65 + + + 4, 0, 4, 0 - 23, 13 + 27, 16 37 @@ -496,10 +538,13 @@ NoControl - 3, 8 + 4, 10 + + + 4, 0, 4, 0 - 41, 13 + 48, 16 34 @@ -529,10 +574,13 @@ NoControl - 498, 29 + 675, 36 + + + 4, 0, 4, 0 - 75, 13 + 90, 16 39 @@ -565,10 +613,13 @@ NoControl - 187, 8 + 251, 10 + + + 4, 0, 4, 0 - 81, 13 + 100, 16 32 @@ -594,8 +645,11 @@ 0, 0 + + 4, 4, 4, 4 + - 576, 213 + 769, 262 44 @@ -649,10 +703,13 @@ NoControl - 388, 7 + 519, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 21 @@ -682,10 +739,13 @@ NoControl - 311, 7 + 416, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 20 @@ -715,10 +775,13 @@ NoControl - 234, 7 + 313, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 19 @@ -748,10 +811,13 @@ NoControl - 157, 7 + 210, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 18 @@ -781,10 +847,13 @@ NoControl - 80, 7 + 107, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 17 @@ -815,10 +884,13 @@ NoControl - 3, 7 + 4, 8 + + + 4, 4, 4, 4 - 71, 17 + 95, 21 16 @@ -839,10 +911,13 @@ 5 - 115, 165 + 143, 202 + + + 4, 4, 4, 4 - 448, 30 + 609, 36 55 @@ -863,7 +938,10 @@ Top, Bottom, Left, Right - 115, 249 + 143, 306 + + + 4, 4, 4, 4 True @@ -872,7 +950,7 @@ Both - 448, 204 + 609, 253 54 @@ -893,13 +971,16 @@ Left, Right - 115, 120 + 143, 147 + + + 4, 4, 4, 4 True - 448, 39 + 609, 47 53 @@ -926,10 +1007,13 @@ NoControl - 13, 224 + 17, 274 + + + 4, 0, 4, 0 - 55, 13 + 66, 16 52 @@ -956,10 +1040,13 @@ NoControl - 115, 224 + 143, 274 + + + 4, 0, 4, 0 - 448, 13 + 609, 16 51 @@ -989,10 +1076,13 @@ NoControl - 13, 211 + 17, 258 + + + 4, 0, 4, 0 - 96, 13 + 118, 16 50 @@ -1019,10 +1109,13 @@ NoControl - 115, 211 + 143, 258 + + + 4, 0, 4, 0 - 448, 13 + 609, 16 49 @@ -1049,7 +1142,10 @@ False - 115, 65 + 143, 80 + + + 4, 4, 4, 4 True @@ -1058,7 +1154,7 @@ Horizontal - 448, 36 + 609, 43 13 @@ -1085,10 +1181,13 @@ NoControl - 13, 198 + 17, 242 + + + 4, 0, 4, 0 - 69, 13 + 85, 16 48 @@ -1115,10 +1214,13 @@ NoControl - 13, 117 + 17, 143 + + + 4, 0, 4, 0 - 53, 13 + 64, 16 47 @@ -1148,10 +1250,13 @@ NoControl - 13, 173 + 17, 212 + + + 4, 0, 4, 0 - 46, 13 + 56, 16 46 @@ -1178,10 +1283,13 @@ NoControl - 115, 104 + 143, 127 + + + 4, 0, 4, 0 - 448, 13 + 609, 16 14 @@ -1208,10 +1316,13 @@ NoControl - 115, 198 + 143, 242 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 22 @@ -1241,10 +1352,13 @@ NoControl - 13, 104 + 17, 127 + + + 4, 0, 4, 0 - 33, 13 + 39, 16 43 @@ -1271,10 +1385,13 @@ NoControl - 384, 10 + 504, 12 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 10 @@ -1301,10 +1418,13 @@ NoControl - 13, 237 + 17, 290 + + + 4, 0, 4, 0 - 33, 13 + 39, 16 41 @@ -1331,10 +1451,13 @@ NoControl - 384, 23 + 504, 28 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 11 @@ -1361,10 +1484,13 @@ NoControl - 115, 36 + 143, 44 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 8 @@ -1394,10 +1520,13 @@ NoControl - 13, 49 + 17, 60 + + + 4, 0, 4, 0 - 41, 13 + 48, 16 38 @@ -1424,10 +1553,13 @@ NoControl - 115, 10 + 143, 12 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 6 @@ -1457,10 +1589,13 @@ NoControl - 300, 10 + 399, 12 + + + 4, 0, 4, 0 - 32, 13 + 38, 16 36 @@ -1487,10 +1622,13 @@ NoControl - 13, 62 + 17, 76 + + + 4, 0, 4, 0 - 63, 13 + 78, 16 35 @@ -1517,10 +1655,13 @@ NoControl - 384, 36 + 504, 44 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 12 @@ -1550,10 +1691,13 @@ NoControl - 300, 36 + 399, 44 + + + 4, 0, 4, 0 - 71, 13 + 87, 16 33 @@ -1583,10 +1727,13 @@ NoControl - 300, 23 + 399, 28 + + + 4, 0, 4, 0 - 78, 13 + 97, 16 32 @@ -1613,10 +1760,13 @@ NoControl - 115, 49 + 143, 60 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 9 @@ -1643,10 +1793,13 @@ NoControl - 115, 23 + 143, 28 + + + 4, 0, 4, 0 - 179, 13 + 248, 16 7 @@ -1676,10 +1829,13 @@ NoControl - 13, 36 + 17, 44 + + + 4, 0, 4, 0 - 71, 13 + 89, 16 29 @@ -1709,10 +1865,13 @@ NoControl - 13, 23 + 17, 28 + + + 4, 0, 4, 0 - 71, 13 + 89, 16 28 @@ -1742,10 +1901,13 @@ NoControl - 13, 10 + 17, 12 + + + 4, 0, 4, 0 - 65, 13 + 80, 16 27 @@ -1771,11 +1933,14 @@ 0, 0 + + 4, 4, 4, 4 + - 10, 10, 10, 10 + 13, 12, 13, 12 - 576, 457 + 769, 563 6 @@ -1805,10 +1970,13 @@ 1 - 578, 678 + 771, 834 - 215 + 264 + + + 5 0 @@ -1831,8 +1999,11 @@ 0, 0 + + 4, 4, 4, 4 + - 578, 678 + 771, 834 44 @@ -1856,7 +2027,7 @@ 101 - 6, 13 + 8, 16 True @@ -1864,11 +2035,14 @@ 0, 496 + + 4, 4, 4, 4 + - 580, 680 + 773, 836 - 578, 678 + 771, 834 workspace @@ -1984,6 +2158,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + renameWorkspaceToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + WorkspaceToolWindowControl diff --git a/RELEASENOTES.txt b/RELEASENOTES.txt index a9a4fe3..28d45cc 100644 --- a/RELEASENOTES.txt +++ b/RELEASENOTES.txt @@ -1,7 +1,7 @@ Release Notes for P4VS, the Helix Plugin for Visual Studio - Version 2023.2 + Version 2024.1 Introduction @@ -145,12 +145,36 @@ Compatibility Statements can be accessed via the License link in the vsix installer. --------------------------------------------------------------------------- +Important End-of-Life Notice + + This major release of P4VS would be the last to support Windows 7. + This is part of our commitment to focus on supported technology platforms. + +-------------------------------------------------------------------------- Key to symbols used in change notes below. * -- requires new P4VS ** -- requires new p4d server program +-------------------------------------------------------------------------- +New Functionality in 2024.1 (2024.1/2633622) (2024/08/05) + + #2625688,2626203 (Job #120815) *,** + User now has an option to Rename Workspace using P4VS. + + (Job #120349) * + Resolved responsiveness issue in Visual Studio + in case of very large command being executed with large + number of arguments. + + (Job #120814) * + P4VS now uses latest P4API.NET 2024.1. + + #2631065 (Job #121295) * + This version addresses vulnerabilities in Newtonsoft.json + (CVE-2024-21907). + -------------------------------------------------------------------------- Bugs fixed in 2023.2 Patch 1 (2023.2/2600533) (2024/05/21) @@ -161,7 +185,7 @@ Bugs fixed in 2023.2 Patch 1 (2023.2/2600533) (2024/05/21) #2590799,2589188,2589189 (Job #119483) * Added changes to make launch of P4V via P4VS to be compatible with latest P4V release. - + -------------------------------------------------------------------------- New Functionality in 2023.2 (2023.2/2562238) (2024/02/26)