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

Consistent icons and text for shell extension menu #5124

Merged
merged 1 commit into from
Sep 2, 2018

Conversation

mstv
Copy link
Member

@mstv mstv commented Jun 28, 2018

Fixes #5117.

Changes proposed in this pull request:

  • Use the dashboard's icon for the item GitExt Open repository (ranamed from GitExt Browse) in the Explorer context menu, too.
    grafik
    old:
    grafik
    new:
    grafik grafik

  • Converted GitUI\Resources\Icons\DashboardFolderGit.png
    and GitUI\Resources\Icons\PatchApply.png to .ico files
    and replaced GitExtensionsShellEx/Resources/IconBrowseFileExplorer.ico

  • Replaced GitExtensionsShellEx\Resources\IconBrowseFileExplorer.ico with Logo\git-extensions-logo.ico

  • Added IconPatchApply.ico to the menu item Apply patch...

What did I do to test the code and ensure quality:

  • Checked the .ico files with a few graphics viewers including the Explorer.
  • Built the installer, installed GE and used the shell extension menu.

Has been tested on:

  • GIT: (2.17.1.w.2-x64)
  • OS: Windows 7
  • .net: (4.7)

@codecov
Copy link

codecov bot commented Jun 28, 2018

Codecov Report

Merging #5124 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #5124      +/-   ##
==========================================
- Coverage   35.43%   35.43%   -0.01%     
==========================================
  Files         600      600              
  Lines       45774    45774              
  Branches     6256     6256              
==========================================
- Hits        16220    16218       -2     
  Misses      28809    28809              
- Partials      745      747       +2

@RussKie
Copy link
Member

RussKie commented Jul 2, 2018

Could you please post a screenshot with the fix?
I've also updated #5117 with one more inconsistency

@drewnoakes
Copy link
Member

This change is also present in #5087.

@RussKie
Copy link
Member

RussKie commented Jul 24, 2018

@mstv could you pull down the latest master and check whether your proposed change is still relevant.
Thank you

@gerhardol
Copy link
Member

This could be merged as is, but #5368 is related

IDI_ICONVIEWCHANGES ICON "Resources\\IconDiff.ico"
IDI_ICONSTASH ICON "Resources\\IconStash.ico"
IDI_ICONCREATEREPOSITORY ICON "Resources\\IconRepoCreate.ico"
IDI_GITEXTENSIONS ICON "..\\Logo\\git-extensions-logo.ico"
Copy link
Member

Choose a reason for hiding this comment

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

Could you please copy it to Resources folder as well

Copy link
Member Author

Choose a reason for hiding this comment

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

No problem, if you really want to have a copy of it.
I'm afraid, this will make this issue reoccur when the icons will be changed again.

@RussKie
Copy link
Member

RussKie commented Aug 30, 2018

Let's merge it as is, and deal with #5368 separately

@RussKie
Copy link
Member

RussKie commented Aug 31, 2018 via email

@mstv mstv changed the title "GitExt Browse" icon from GitUI/Resources/Icons/x_with_arrow_32.png Consistent icons and text for shell extension menu Aug 31, 2018
@RussKie RussKie merged commit b4a8148 into gitextensions:master Sep 2, 2018
@RussKie
Copy link
Member

RussKie commented Sep 2, 2018

Thank you

@mstv mstv deleted the gitext_browse_icon branch September 2, 2018 10:17
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.

4 participants