feat: Change icon used in Collapsible widget #140

ppwadhwa · 2022-11-17T15:14:09Z

This PR adds the ability to change the icon on the toggle QPushButton. Currently, the icon is a part of the text string. This PR will change it so that an icon is set on the button. The original icon is still used if there isn't one set, however, the default string is used to create an icon.

You can now instantiate a collapsible widget while also declaring an expandedIcon and/or collapsedIcon. These icons can be a QIcon or a text string.

icon1 = icon(FA5S.smile, color='white')
icon2 = icon(FA5S.frown, color='white')
collapsible = QCollapsible("Advanced analysis", expandedIcon=icon1, collapsedIcon=icon2)

collapsible = QCollapsible("Advanced analysis", expandedIcon='-', collapsedIcon="+")

src/superqt/collapsible/_collapsible.py

goanpeca · 2022-11-17T16:28:51Z

src/superqt/collapsible/_collapsible.py

@@ -11,16 +20,16 @@ class QCollapsible(QFrame):
    Based on https://stackoverflow.com/a/68141638
    """

-    _EXPANDED = "▼  "
-    _COLLAPSED = "▲  "
-
    def __init__(self, title: str = "", parent: Optional[QWidget] = None):


This should maybe also expose the collapsedIcon and the expandedIcon as Optional arguments (as some buttons allow in Qt)?

What do you think @tlambert03 ?

I added this.

src/superqt/collapsible/_collapsible.py

tests/test_collapsible.py

goanpeca

Hi @ppwadhwa thanks for working on this! Great work 🚀

Added some comments to clean up the code a bit :)

codecov · 2022-11-17T16:37:59Z

Codecov Report

Base: 85.30% // Head: 85.43% // Increases project coverage by +0.13% 🎉

Coverage data is based on head (cbe4cdc) compared to base (ad2f05d).
Patch coverage: 98.00% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #140      +/-   ##
==========================================
+ Coverage   85.30%   85.43%   +0.13%     
==========================================
  Files          31       31              
  Lines        2573     2603      +30     
==========================================
+ Hits         2195     2224      +29     
- Misses        378      379       +1

Impacted Files	Coverage Δ
src/superqt/collapsible/_collapsible.py	`94.78% <98.00%> (+0.66%)`	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

ppwadhwa · 2022-11-21T22:34:49Z

OK. I see I need to fix the tests. Will get to this....

tests/test_fonticon/test_collapsible.py

src/superqt/collapsible/_collapsible.py

…ation of QCollapsible widget

src/superqt/collapsible/_collapsible.py

goanpeca

Thanks for working on this @ppwadhwa, works great 🚀

goanpeca · 2022-11-29T20:01:04Z

🤔

tox: py310-macos-pyqt5
  py310-macos-pyqt5 inst: /tmp/.tox/.tmp/package/1/superqt-0.1.dev1+g1a34dcc.tar.gz
  Error: The action has timed out.

This one is ready for review @tlambert03 :) Thanks!

tlambert03 · 2022-12-01T01:44:33Z

good stuff. thanks both!

goanpeca · 2022-12-01T03:14:08Z

Thanks for the quick review 🤭

@tlambert03 do you think you could make a new release with the latest changes sometime soon :) ?

Thanks for the awesome project!

tlambert03 · 2022-12-01T03:36:48Z

Yep 👍 will do tomorrow

ppwadhwa · 2022-12-01T05:01:25Z

thanks @tlambert03 !!!

tlambert03 · 2022-12-01T13:26:33Z

v0.4.1 building now... should be up soon

ppwadhwa marked this pull request as draft November 17, 2022 15:27

goanpeca reviewed Nov 17, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Outdated Show resolved Hide resolved

goanpeca reviewed Nov 17, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Outdated Show resolved Hide resolved

goanpeca reviewed Nov 17, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Outdated Show resolved Hide resolved

goanpeca reviewed Nov 17, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Outdated Show resolved Hide resolved

goanpeca reviewed Nov 17, 2022

View reviewed changes

tests/test_collapsible.py Show resolved Hide resolved

goanpeca suggested changes Nov 17, 2022

View reviewed changes

ppwadhwa force-pushed the collapsible_change_icon branch from b2e66b7 to dc2866d Compare November 23, 2022 19:43

tlambert03 reviewed Nov 24, 2022

View reviewed changes

tests/test_fonticon/test_collapsible.py Outdated Show resolved Hide resolved

ppwadhwa marked this pull request as ready for review November 26, 2022 08:55

goanpeca suggested changes Nov 27, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Show resolved Hide resolved

src/superqt/collapsible/_collapsible.py Show resolved Hide resolved

ppwadhwa added 14 commits November 28, 2022 05:56

add ability to change icon

3d41a4f

fix icon setting so it will load properly on start up

680fef6

remove check on icon length. not necessary anymore

c6e5617

fix test

7455fe2

reduce duplicate code. expose _COLLAPSED and _EXPANDED to user on cre…

734ec08

…ation of QCollapsible widget

add ability to set icon with string or icon.

7d5a9c6

add tests for adding, setting icons

3e24fa1

fix test.

0e68d70

fix test for icons

80e57d4

move file

9a7fb6f

fix test

309d5f1

remove hardcoded size. Use font size

e7d25fa

add test docstring

2f5a5eb

fix test. chnage expanded/collapsed names

d451e58

ppwadhwa force-pushed the collapsible_change_icon branch from 9ce54d2 to d451e58 Compare November 28, 2022 21:57

goanpeca reviewed Nov 28, 2022

View reviewed changes

src/superqt/collapsible/_collapsible.py Outdated Show resolved Hide resolved

ppwadhwa added 4 commits November 29, 2022 00:16

remove unnecessary strings

72d3848

update example. add getter functions. remove lines. change function name

0936ade

put default string in init. add getter tests

25fe6f1

update test

8a27848

goanpeca approved these changes Nov 29, 2022

View reviewed changes

ppwadhwa requested a review from tlambert03 November 29, 2022 19:33

tlambert03 added 2 commits November 30, 2022 20:36

cleanup typing and fix set setCollapsedIcon

8a4b7fc

Merge branch 'main' into collapsible_change_icon

cbe4cdc

tlambert03 approved these changes Dec 1, 2022

View reviewed changes

tlambert03 changed the title ~~Change icon used in Collapsible widget~~ feat: Change icon used in Collapsible widget Dec 1, 2022

tlambert03 added the enhancement New feature or request label Dec 1, 2022

tlambert03 merged commit 7b2d8bf into pyapp-kit:main Dec 1, 2022

tlambert03 mentioned this pull request Mar 10, 2023

Update plugin dialog design & functionality to add conda install napari/napari#5198

Merged

12 tasks

This was referenced Sep 23, 2023

fix: don't reuse text in qcollapsible #204

Merged

Setting Text in Collapsible Adds to text instead of replacing #203

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Change icon used in Collapsible widget #140

feat: Change icon used in Collapsible widget #140

ppwadhwa commented Nov 17, 2022 •

edited

Loading

goanpeca Nov 17, 2022

ppwadhwa Nov 21, 2022

goanpeca left a comment

codecov bot commented Nov 17, 2022 •

edited

Loading

ppwadhwa commented Nov 21, 2022

goanpeca left a comment

goanpeca commented Nov 29, 2022 •

edited

Loading

tlambert03 commented Dec 1, 2022

goanpeca commented Dec 1, 2022

tlambert03 commented Dec 1, 2022

ppwadhwa commented Dec 1, 2022

tlambert03 commented Dec 1, 2022

feat: Change icon used in Collapsible widget #140

feat: Change icon used in Collapsible widget #140

Conversation

ppwadhwa commented Nov 17, 2022 • edited Loading

goanpeca Nov 17, 2022

Choose a reason for hiding this comment

ppwadhwa Nov 21, 2022

Choose a reason for hiding this comment

goanpeca left a comment

Choose a reason for hiding this comment

codecov bot commented Nov 17, 2022 • edited Loading

Codecov Report

ppwadhwa commented Nov 21, 2022

goanpeca left a comment

Choose a reason for hiding this comment

goanpeca commented Nov 29, 2022 • edited Loading

tlambert03 commented Dec 1, 2022

goanpeca commented Dec 1, 2022

tlambert03 commented Dec 1, 2022

ppwadhwa commented Dec 1, 2022

tlambert03 commented Dec 1, 2022

ppwadhwa commented Nov 17, 2022 •

edited

Loading

codecov bot commented Nov 17, 2022 •

edited

Loading

goanpeca commented Nov 29, 2022 •

edited

Loading