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

Fix/script without icon #8111

Merged
merged 3 commits into from May 17, 2020
Merged

Conversation

mstv
Copy link
Member

@mstv mstv commented May 15, 2020

Proposed changes

  • It is allowed to not assign an icon to a user script.
    So avoid regarding exceptions.
  • Display the shortcuts assigned to the user scripts.
  • Fixup the condition for showing the user scripts arguments cheat sheet again after closing it.

Before

NBug exceptions unless icons are defined

grafik

After

grafik
grafik

Test methodology

  • manual

Test environment(s)

  • Git Extensions 3.3.0
  • Build 3486ba0
  • Git 2.26.0.windows.1
  • Microsoft Windows NT 6.2.9200.0
  • .NET Framework 4.8.4180.0
  • DPI 96dpi (no scaling)

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

@mstv mstv self-assigned this May 15, 2020
@mstv
Copy link
Member Author

mstv commented May 15, 2020

Should be integrated into 3.4, too. Will we merge the master into release/3.4?
Only the version number must be reverted on merge.

@codecov
Copy link

codecov bot commented May 15, 2020

Codecov Report

Merging #8111 into master will increase coverage by 0.00%.
The diff coverage is 12.50%.

@@           Coverage Diff           @@
##           master    #8111   +/-   ##
=======================================
  Coverage   49.54%   49.55%           
=======================================
  Files         847      847           
  Lines       60916    60921    +5     
  Branches    10924    10932    +8     
=======================================
+ Hits        30182    30187    +5     
- Misses      28497    28502    +5     
+ Partials     2237     2232    -5     
Flag Coverage Δ
#production 37.37% <12.50%> (+<0.01%) ⬆️
#tests 94.85% <ø> (-0.01%) ⬇️

@gerhardol gerhardol added this to the 3.4 milestone May 16, 2020
@RussKie
Copy link
Member

RussKie commented May 17, 2020

Merge at will. Please port to 3.4 as well.

@mstv mstv merged commit cbb24e5 into gitextensions:master May 17, 2020
@ghost ghost modified the milestones: 3.4, 4.0 May 17, 2020
@RussKie
Copy link
Member

RussKie commented May 17, 2020

We should avoid merging fixup commits.

@mstv
Copy link
Member Author

mstv commented May 17, 2020

We should avoid merging fixup commits.

Maybe I chose the wrong wording: These commits fix up / resolve issues. They are no "fixup!" to previous commits.

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

3 participants