Worktree: redesign 'Manage worktree' form #10224

pmiossec · 2022-10-05T16:39:16Z

Proposed changes

Add "Open" and "Delete" buttons instead of having it in the grid
Strike line when a worktree is deleted (and so remove "Deleted" column)
Change font of Sha1 column & last column fill the remaining width
name of branch displayed more user friendly (without '/refs/heads' prefix)

Screenshots

Before

After

Test methodology

manual

Test environment(s)

Git Extensions 33.33.33
Build b9e701c (Dirty)
Git 2.35.1.windows.2 (recommended: 2.37.1 or later)
Microsoft Windows NT 10.0.19042.0
.NET 6.0.8
DPI 96dpi (no scaling)

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).

✒️ I contribute this code under The Developer Certificate of Origin.

mstv

LGTM, just nitpicks
A Create button would be useful, too.

mstv · 2022-10-05T20:36:15Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.cs

+                                if (branch == null || !branch.StartsWith("refs/heads/"))
+                                {
+                                    return branch;
+                                }
+
+                                return branch.Substring(11);


Suggested change

if (branch == null || !branch.StartsWith("refs/heads/"))

{

return branch;

}

return branch.Substring(11);

if (branch is not null && branch.StartsWith(GitRefName.RefsHeadsPrefix))

{

return branch.SubString(GitRefName.RefsHeadsPrefix.Length);

}

return branch;

mstv · 2022-10-05T20:37:45Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.cs

@@ -112,53 +117,21 @@ private void Initialize()
            }

            Worktrees.DataSource = _worktrees;
+
+            Font font = Worktrees.DefaultCellStyle.Font;
+            var deletedFont = new Font(font.FontFamily, font.Size, font.Style | FontStyle.Strikeout);


Suggested change

var deletedFont = new Font(font.FontFamily, font.Size, font.Style | FontStyle.Strikeout);

Font deletedFont = new(font.FontFamily, font.Size, font.Style | FontStyle.Strikeout);

mstv · 2022-10-05T20:41:23Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs

+            this.buttonPruneWorktrees.Name = "buttonPruneWorktrees";
+            this.buttonPruneWorktrees.Size = new System.Drawing.Size(189, 23);
+            this.buttonPruneWorktrees.TabIndex = 1;
+            this.buttonPruneWorktrees.Text = "Prune deleted worktrees";


Suggested change

this.buttonPruneWorktrees.Text = "Prune deleted worktrees";

this.buttonPruneWorktrees.Text = "&Prune deleted worktrees";

mstv · 2022-10-05T20:41:35Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs

+            this.buttonDeleteSelectedWorktree.Name = "buttonDeleteSelectedWorktree";
+            this.buttonDeleteSelectedWorktree.Size = new System.Drawing.Size(189, 23);
+            this.buttonDeleteSelectedWorktree.TabIndex = 1;
+            this.buttonDeleteSelectedWorktree.Text = "Delete selected worktree";


Suggested change

this.buttonDeleteSelectedWorktree.Text = "Delete selected worktree";

this.buttonDeleteSelectedWorktree.Text = "&Delete selected worktree";

mstv · 2022-10-05T20:41:50Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs

+            this.buttonOpenSelectedWorktree.Name = "buttonOpenSelectedWorktree";
+            this.buttonOpenSelectedWorktree.Size = new System.Drawing.Size(189, 23);
+            this.buttonOpenSelectedWorktree.TabIndex = 1;
+            this.buttonOpenSelectedWorktree.Text = "Open selected worktree";


Suggested change

this.buttonOpenSelectedWorktree.Text = "Open selected worktree";

this.buttonOpenSelectedWorktree.Text = "&Open selected worktree";

gerhardol

Better, now it looks like a normal form.
have not run

A Create button would be useful, too.

Suggest that is only accessibly in the Manage form, so only one menu item in File menu

This affects translations, so I do not know if it is possible to include in 4.0
(This is not a high profile form though)

pmiossec · 2022-10-05T23:31:55Z

Suggest that is only accessibly in the Manage form, so only one menu item in File menu

In fact this commit was a first step toward "merging" the manage and create forms because I noticed that nearly 100% of the times I want to see the existing worktrees before creating one. And as a consequence having only one menu item.

But my first attempt was not working and I don't really get why...

I will try to find some room for the create button and update the menu.

pmiossec · 2022-10-06T08:34:11Z

Done. (and screenshot updated)

gerhardol

Should be included in 4.0, even if translations are changed

mstv

Thank you for eliminating the submenu!
I have further wishes:

mstv · 2022-10-06T20:53:42Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs

+            // buttonDeleteSelectedWorktree
+            // 
+            this.buttonDeleteSelectedWorktree.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonDeleteSelectedWorktree.Image = global::GitUI.Properties.Images.DeleteFile;
+            this.buttonDeleteSelectedWorktree.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.buttonDeleteSelectedWorktree.Location = new System.Drawing.Point(165, 226);
+            this.buttonDeleteSelectedWorktree.Name = "buttonDeleteSelectedWorktree";
+            this.buttonDeleteSelectedWorktree.Size = new System.Drawing.Size(151, 23);
+            this.buttonDeleteSelectedWorktree.TabIndex = 1;
+            this.buttonDeleteSelectedWorktree.Text = "&Delete selected";
+            this.buttonDeleteSelectedWorktree.UseVisualStyleBackColor = true;
+            this.buttonDeleteSelectedWorktree.Click += new System.EventHandler(this.buttonDeleteSelectedWorktree_Click);
+            // 
+            // buttonOpenSelectedWorktree
+            // 
+            this.buttonOpenSelectedWorktree.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonOpenSelectedWorktree.Image = global::GitUI.Properties.Images.BrowseFileExplorer;
+            this.buttonOpenSelectedWorktree.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.buttonOpenSelectedWorktree.Location = new System.Drawing.Point(8, 226);
+            this.buttonOpenSelectedWorktree.Name = "buttonOpenSelectedWorktree";
+            this.buttonOpenSelectedWorktree.Size = new System.Drawing.Size(151, 23);
+            this.buttonOpenSelectedWorktree.TabIndex = 1;
+            this.buttonOpenSelectedWorktree.Text = "&Open selected";
+            this.buttonOpenSelectedWorktree.UseVisualStyleBackColor = true;
+            this.buttonOpenSelectedWorktree.Click += new System.EventHandler(this.buttonOpenSelectedWorktree_Click);
+            // 
+            // buttonCreateNewWorktree
+            // 
+            this.buttonCreateNewWorktree.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreateNewWorktree.Image = global::GitUI.Properties.Images.FileStatusAdded;
+            this.buttonCreateNewWorktree.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.buttonCreateNewWorktree.Location = new System.Drawing.Point(322, 226);
+            this.buttonCreateNewWorktree.Name = "buttonCreateNewWorktree";
+            this.buttonCreateNewWorktree.Size = new System.Drawing.Size(151, 23);
+            this.buttonCreateNewWorktree.TabIndex = 1;
+            this.buttonCreateNewWorktree.Text = "&Create...";
+            this.buttonCreateNewWorktree.UseVisualStyleBackColor = true;
+            this.buttonCreateNewWorktree.Click += new System.EventHandler(this.buttonCreateNewWorktree_Click);
+            // 


I would move these up in order to get a clear Tab order.

mstv · 2022-10-06T21:05:19Z

GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.cs

+        private void buttonCreateNewWorktree_Click(object sender, EventArgs e)
+        {
+            SwitchToCreateWorktreeForm = true;
+            DialogResult = DialogResult.Cancel;


I would rather keep this dialog open and open the FormCreateWorktree directly.
The reaction to Open the new worktree after creation can reuse buttonOpenSelectedWorktree.

pmiossec · 2022-10-08T19:30:29Z

@mstv Changes done.

mstv

👍

* Add "Open" and "Delete" buttons instead of having it in the grid * Strike line when a worktree is deleted (and so remove "Deleted" column) * Change font of Sha1 column & column width set to fill the remaining space * branch name displayed more user friendly (without '/refs/heads' prefix) * Leave only "Manage worktree..." entry from FormBrowse menu * Add a "Create..." button to open formCreateWorktree from the "Manage worktree" form & Refresh list of worktrees if user select to not open the newly worktree created

pmiossec · 2022-10-10T07:17:50Z

Squashed and rebased. I think that's ready to be merge...

* Add "Open" and "Delete" buttons instead of having it in the grid * Strike line when a worktree is deleted (and so remove "Deleted" column) * Change font of Sha1 column & column width set to fill the remaining space * branch name displayed more user friendly (without '/refs/heads' prefix) * Leave only "Manage worktree..." entry from FormBrowse menu * Add a "Create..." button to open formCreateWorktree from the "Manage worktree" form & Refresh list of worktrees if user select to not open the newly worktree created (cherry picked from commit 5f2071f)

ghost assigned pmiossec Oct 5, 2022

pmiossec requested a review from gerhardol October 5, 2022 16:39

mstv reviewed Oct 5, 2022

View reviewed changes

gerhardol approved these changes Oct 5, 2022

View reviewed changes

pmiossec force-pushed the worktree_redesign branch from 47543f4 to 5b380b8 Compare October 6, 2022 08:31

gerhardol approved these changes Oct 6, 2022

View reviewed changes

mstv reviewed Oct 6, 2022

View reviewed changes

pmiossec force-pushed the worktree_redesign branch from 5b380b8 to 15061cf Compare October 8, 2022 19:29

pmiossec added the area: worktree label Oct 8, 2022

pmiossec force-pushed the worktree_redesign branch from 15061cf to 114cd52 Compare October 8, 2022 19:32

mstv approved these changes Oct 8, 2022

View reviewed changes

pmiossec force-pushed the worktree_redesign branch from 114cd52 to f53fb6f Compare October 10, 2022 07:16

pmiossec mentioned this pull request Oct 10, 2022

Worktree form management improvements #10218

Merged

RussKie merged commit 5f2071f into gitextensions:master Oct 10, 2022

ghost added this to the vNext milestone Oct 10, 2022

pmiossec deleted the worktree_redesign branch October 10, 2022 09:47

RussKie modified the milestones: vNext, 4.0.0 Oct 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Worktree: redesign 'Manage worktree' form #10224

Worktree: redesign 'Manage worktree' form #10224

pmiossec commented Oct 5, 2022 •

edited

mstv left a comment

mstv Oct 5, 2022

mstv Oct 5, 2022

mstv Oct 5, 2022

mstv Oct 5, 2022

mstv Oct 5, 2022

gerhardol left a comment

pmiossec commented Oct 5, 2022

pmiossec commented Oct 6, 2022

gerhardol left a comment

mstv left a comment

mstv Oct 6, 2022

mstv Oct 6, 2022

pmiossec commented Oct 8, 2022

mstv left a comment

pmiossec commented Oct 10, 2022 •

edited

	var deletedFont = new Font(font.FontFamily, font.Size, font.Style \| FontStyle.Strikeout);
	Font deletedFont = new(font.FontFamily, font.Size, font.Style \| FontStyle.Strikeout);

	this.buttonPruneWorktrees.Text = "Prune deleted worktrees";
	this.buttonPruneWorktrees.Text = "&Prune deleted worktrees";

	this.buttonDeleteSelectedWorktree.Text = "Delete selected worktree";
	this.buttonDeleteSelectedWorktree.Text = "&Delete selected worktree";

	this.buttonOpenSelectedWorktree.Text = "Open selected worktree";
	this.buttonOpenSelectedWorktree.Text = "&Open selected worktree";

Worktree: redesign 'Manage worktree' form #10224

Worktree: redesign 'Manage worktree' form #10224

Conversation

pmiossec commented Oct 5, 2022 • edited

Proposed changes

Screenshots

Before

After

Test methodology

Test environment(s)

Merge strategy

mstv left a comment

Choose a reason for hiding this comment

mstv Oct 5, 2022

Choose a reason for hiding this comment

mstv Oct 5, 2022

Choose a reason for hiding this comment

mstv Oct 5, 2022

Choose a reason for hiding this comment

mstv Oct 5, 2022

Choose a reason for hiding this comment

mstv Oct 5, 2022

Choose a reason for hiding this comment

gerhardol left a comment

Choose a reason for hiding this comment

pmiossec commented Oct 5, 2022

pmiossec commented Oct 6, 2022

gerhardol left a comment

Choose a reason for hiding this comment

mstv left a comment

Choose a reason for hiding this comment

mstv Oct 6, 2022

Choose a reason for hiding this comment

mstv Oct 6, 2022

Choose a reason for hiding this comment

pmiossec commented Oct 8, 2022

mstv left a comment

Choose a reason for hiding this comment

pmiossec commented Oct 10, 2022 • edited

pmiossec commented Oct 5, 2022 •

edited

pmiossec commented Oct 10, 2022 •

edited