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.

Sign up for GitHub

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

Jump to bottom

Feature/action manager qicon import #3

Open
wants to merge 11 commits into
base: 5.0.x_dev
Choose a base branch
from
Open

Feature/action manager qicon import #3

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60c8c6b
Permit to use Qt library icon with action manager
Ashwolaa Oct 5, 2024
2d54de7
Can now only use propername of Qt to import icons.
Ashwolaa Oct 8, 2024
7f8a04d
Merge branch 'PyMoDAQ:5.0.x_dev' into feature/action_manager_QIconImport
Ashwolaa Oct 29, 2024
05dad18
Merge branch 'PyMoDAQ:5.0.x_dev' into feature/action_manager_QIconImport
Ashwolaa Oct 29, 2024
f94cb06
Adding some icons
Ashwolaa Oct 29, 2024
33e1b2e
Adding some icons!
Ashwolaa Oct 29, 2024
0771e63
Merge branch 'feature/action_manager_QIconImport' of https://github.c…
Ashwolaa Oct 29, 2024
225f1c3
Polishing and adding conditional statement for Qt<6.7
Ashwolaa Nov 3, 2024
b37799d
Adding test
Ashwolaa Nov 8, 2024
d5fc60d
fixed pymodaq icon name
Ashwolaa Nov 8, 2024
d6565b9
Merge branch 'PyMoDAQ:5.0.x_dev' into feature/action_manager_QIconImport
Ashwolaa Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/pymodaq_gui/managers/action_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,17 @@

def create_icon(icon_name: str):
icon = QtGui.QIcon()
if Path(icon_name).is_file():
if Path(icon_name).is_file(): # Test if icon is in path
icon.addPixmap(QtGui.QPixmap(icon_name), QtGui.QIcon.Normal,
QtGui.QIcon.Off)
else:
icon.addPixmap(QtGui.QPixmap(f":/icons/Icon_Library/{icon_name}.png"), QtGui.QIcon.Normal,
QtGui.QIcon.Off)
pixmap = QtGui.QPixmap(f":/icons/Icon_Library/{icon_name}.png") # Test if icon is in pymodaq's library
if pixmap.isNull():
if hasattr(QtGui.QIcon.ThemeIcon,icon_name): # Test if icon is in Qt's library
Ashwolaa marked this conversation as resolved.
Show resolved Hide resolved
icon = QtGui.QIcon.fromTheme(getattr(QtGui.QIcon.ThemeIcon,icon_name))
else:
icon.addPixmap(QtGui.QPixmap(pixmap), QtGui.QIcon.Normal,
QtGui.QIcon.Off)
return icon


Expand Down