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

FormBrowse: let the user add fetch/pull custom icons in the toolbar #10293

Merged
merged 1 commit into from Nov 16, 2022

Conversation

pmiossec
Copy link
Member

Improvement over #3923

Proposed changes

  • The user is able to add a direct access button for the fetch/pull actions he wants (because split button is painful to use on high resolution screens)
  • By default, the button are not displayed, so nothing changed

Screenshots

Before

After

Configuration:

image

Result (because I want a fetch button distinct of a pull button --like in all the other git GUIs--):

image

Test methodology

  • Manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build b5ec77d
  • Git 2.38.0.windows.1 (recommended: 2.38.1 or later)
  • Microsoft Windows NT 10.0.19042.0
  • .NET 6.0.10
  • 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.

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.

Fine, but tooltips should remove &
image

Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

+0

@@ -12,6 +12,8 @@ partial class FormBrowse
{
// This file is dedicated to init logic for FormBrowse menus and toolbars

public const string PullShortcutsPrefix = "pull_shortcut_";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
public const string PullShortcutsPrefix = "pull_shortcut_";
internal const string PullShortcutsPrefix = "pull_shortcut_";

@RussKie RussKie added this to the vNext milestone Oct 27, 2022
@pmiossec
Copy link
Member Author

Done. Should be merged after #10294 (because the settings save is based on the same code change, because the default value is 'false')

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.

just nitpicks
I don't see a risk why these two PRs for toolbar buttons should not be integrated into v4.0.

GitUI/CommandsDialogs/FormBrowse.InitMenusAndToolbars.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormBrowse.InitMenusAndToolbars.cs Outdated Show resolved Hide resolved
@pmiossec pmiossec force-pushed the fetch_pull_button_in_toolbar branch 2 times, most recently from 756a928 to 438882d Compare October 28, 2022 20:59
@pmiossec
Copy link
Member Author

just nitpicks

Done.

I don't see a risk why these two PRs for toolbar buttons should not be integrated into v4.0.

Yes, that's not very risky PRs. But I think @RussKie was interested to have #10294 or #10235 merged in v4...
I will let you decide what you want to do with them as I won't be able to do code changes during a week (AFKB) . I will just be able to do some commenting...

@RussKie RussKie merged commit 6f9591c into gitextensions:master Nov 16, 2022
@pmiossec pmiossec deleted the fetch_pull_button_in_toolbar branch November 16, 2022 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants