Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FormManageWorktree layout #10244

Merged
merged 1 commit into from Oct 11, 2022

Conversation

RussKie
Copy link
Member

@RussKie RussKie commented Oct 10, 2022

Contributes to #6183

Proposed changes

  • Inherit the dialog from GitExtensionsDialog
  • Remove FormManageWorktree_Load handler and invoke Initialize in OnRuntimeLoad
  • Mechanical update of layout in the designer

Screenshots

Before

image

After

image

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.

Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seem ok, but why have Create on separate "line"?

Comment on lines 63 to 65
<metadata name="Branch.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate, also 66-68

Copy link
Member Author

@RussKie RussKie Oct 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@merriemcgaw @KlausLoeffelmann this happened again, but I can't really replicate it. Version 17.4.0 Preview 2.1

@RussKie
Copy link
Member Author

RussKie commented Oct 10, 2022

but why have Create on separate "line"?

"Create" is an contextless operation - i.e., it applies to the whole dialog, where as "Open selected" and "Delete selected" apply to the selection - i.e., these are context-aware. I wasn't sure about the "Prune" button, so placed it in the "context aware" section, but I'm not sure if it's appropriate.

@gerhardol
Copy link
Member

but why have Create on separate "line"?

"Create" is an contextless operation - i.e., it applies to the whole dialog, where as "Open selected" and "Delete selected" apply to the selection - i.e., these are context-aware. I wasn't sure about the "Prune" button, so placed it in the "context aware" section, but I'm not sure if it's appropriate.

OK
Prune is context less too
https://git-scm.com/docs/git-worktree

@RussKie
Copy link
Member Author

RussKie commented Oct 11, 2022

Updated

@RussKie
Copy link
Member Author

RussKie commented Oct 11, 2022

Thank you

@RussKie RussKie merged commit 923851b into gitextensions:master Oct 11, 2022
@ghost ghost added this to the vNext milestone Oct 11, 2022
@RussKie RussKie deleted the update_worktree_layout branch October 11, 2022 11:15
RussKie added a commit that referenced this pull request Oct 11, 2022
@RussKie RussKie modified the milestones: vNext, 4.0.0 Oct 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants