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.

Sign up for GitHub

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

Jump to bottom

FormCommit: Clearer button labels #10587

Merged
merged 4 commits into from Jan 16, 2023
Merged

FormCommit: Clearer button labels #10587

merged 4 commits into from Jan 16, 2023

Conversation

mstv
Copy link
Member

@mstv mstv commented Dec 28, 2022

Fixes #2260 (comment) amongst others

Proposed changes

  • Add button text "Commit & force push" if amending and force push enabled in settings
    image
  • Fixup capitalization of Amend commit and Reset author
  • Make mnemonic Alt+T unique: Stash staged changes vs. Commit templates
  • Support Tab for buttons

Screenshots

Before After
image image
image image
image image

Test methodology

  • manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build 42e29f4
  • Git 2.39.0.windows.1
  • Microsoft Windows NT 10.0.19045.0
  • .NET 6.0.12
  • DPI 96dpi (no scaling)
  • Microsoft.WindowsDesktop.App Versions
    Microsoft.WindowsDesktop.App 6.0.12 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

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 mstv added this to the vNext milestone Dec 28, 2022
@mstv mstv self-assigned this Dec 28, 2022
mstv
mstv commented Dec 28, 2022
View reviewed changes
GitUI/CommandsDialogs/FormCommit.Designer.cs
this.StashStaged.TabIndex = 14;
this.StashStaged.TabStop = false;
this.StashStaged.Text = "S&tash staged changes";
this.StashStaged.TabIndex = 107;
Copy link
Member Author

Choose a reason for hiding this comment

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

TabIndex 106 omitted on purpose in preparation of #2260

Copy link
Member

Choose a reason for hiding this comment

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

As well as indent Reset author checkbox?

Copy link
Member Author

Choose a reason for hiding this comment

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

A new panel with indent will be inserted for #2260.

gerhardol
gerhardol approved these changes Dec 28, 2022
View reviewed changes
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.

Have not run

@mstv mstv requested a review from RussKie January 15, 2023 14:33
@mstv mstv merged commit 4cb3e5d into gitextensions:master Jan 16, 2023
@mstv mstv deleted the fix/formcommit branch January 16, 2023 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RussKie RussKie RussKie approved these changes

@gerhardol gerhardol gerhardol approved these changes

Assignees

@mstv mstv

Labels
area: user experience type: translation changed
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

amend should show files of amended commit
3 participants
@mstv @RussKie @gerhardol