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

Add support for widgets in toolbars #359

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Conversation

corranwebster
Copy link
Contributor

Proper Pyface-level support for Actions which contain widgets. Support is very basic, but works.

screen shot 2019-03-08 at 2 56 21 pm

@codecov-io
Copy link

codecov-io commented Mar 8, 2019

Codecov Report

Merging #359 into master will increase coverage by 0.02%.
The diff coverage is 58.97%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #359      +/-   ##
==========================================
+ Coverage   35.16%   35.19%   +0.02%     
==========================================
  Files         463      463              
  Lines       25772    25799      +27     
  Branches     3830     3834       +4     
==========================================
+ Hits         9064     9079      +15     
- Misses      16326    16336      +10     
- Partials      382      384       +2
Impacted Files Coverage Δ
pyface/ui/qt4/action/action_item.py 41.07% <47.36%> (+0.18%) ⬆️
pyface/action/action.py 90% <66.66%> (-6%) ⬇️
pyface/ui/wx/action/action_item.py 36.65% <71.42%> (+1.14%) ⬆️
pyface/qt/QtWebKit.py 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e047d8b...92feba6. Read the comment docs.

Copy link
Member

@jwiggins jwiggins left a comment

Choose a reason for hiding this comment

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

Overall looks good. Just some questions and a small nit

@@ -245,6 +263,9 @@ class _Tool(HasTraits):
# The toolkit control.
control = Any()

# The toolkit control id.
control_id = None
Copy link
Member

Choose a reason for hiding this comment

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

Is this not purely a Wx-ism as stated in the previous comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep - I'd like to get rid of it, but it was already implicitly there. This is drive-by clean-up to make it explicit (then we can work out how to get rid of it in a separate PR at a later time).

Copy link
Member

Choose a reason for hiding this comment

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

Okie dokie.

pyface/action/action.py Outdated Show resolved Hide resolved
pyface/action/action.py Outdated Show resolved Hide resolved
Copy link
Member

@jwiggins jwiggins left a comment

Choose a reason for hiding this comment

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

LGTM

@corranwebster corranwebster merged commit 48a3499 into master Mar 11, 2019
@jwiggins jwiggins deleted the feature/toolbar-widgets branch March 11, 2019 10:56
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