Skip to content

Commit

Permalink
Merge branch 'master' into qta_browser_improve
Browse files Browse the repository at this point in the history
  • Loading branch information
dalthviz authored Nov 23, 2023
2 parents e736f8a + d1371a7 commit fe95a40
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 19 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ spin_icon = qta.icon('mdi.loading', color='red',
spin_widget.setIcon(spin_icon)

# Simple icon widget
simple_widget = qta.IconWidget('mdi.web', color='blue')
simple_widget = qta.IconWidget('mdi.web', color='blue',
size=QtCore.QSize(16, 16))
```

- Screenshot
Expand Down
1 change: 1 addition & 0 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ channels:
dependencies:
- pyqt
- qtpy
- sphinx_rtd_theme
11 changes: 6 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
'sphinx.ext.autosummary',
'sphinx.ext.viewcode',
'sphinx.ext.napoleon',
'sphinx_rtd_theme',
]

autosummary_generate = True
Expand Down Expand Up @@ -72,8 +73,8 @@

# General information about the project.
project = u'qtawesome'
copyright = u'2015, The Spyder Development Team'
author = u'The Spyder Development Team'
copyright = u'2015-, The Spyder Development Team'
author = u'Sylvain Corlay and the Spyder Development Team'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand All @@ -89,7 +90,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
# language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down Expand Up @@ -133,7 +134,7 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
# html_theme = 'alabaster'
html_theme = 'sphinx_rtd_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down Expand Up @@ -310,4 +311,4 @@


# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
5 changes: 3 additions & 2 deletions docs/source/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,15 @@ Examples

.. code:: python
# Spining icon widget
# Spinning icon widget
spin_widget = qta.IconWidget()
spin_icon = qta.icon('mdi.loading', color='red',
animation=qta.Spin(spin_widget))
spin_widget.setIcon(spin_icon)
# simple widget
simple_widget = qta.IconWidget('mdi.web', color='blue')
simple_widget = qta.IconWidget('mdi.web', color='blue',
size=QtCore.QSize(16, 16))
Screenshot
~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion example.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def __init__(self):
lo.addWidget(iconwidget)
lo.addWidget(QtWidgets.QLabel('IconWidget'))
iconwidgetholder.setLayout(lo)
iconwidget2 = qta.IconWidget('mdi.web', color='blue')
iconwidget2 = qta.IconWidget('mdi.web', color='blue', size=QtCore.QSize(16, 16))

# Icon drawn with the `image` option
drawn_image_icon = qta.icon('ri.truck-fill',
Expand Down
18 changes: 11 additions & 7 deletions qtawesome/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,19 +334,23 @@ class IconWidget(QtWidgets.QLabel):
"""
IconWidget gives the ability to display an icon as a widget
if supports the same arguments as icon()
for example
music_icon = qta.IconWidget('fa5s.music',
color='blue',
color_active='orange')
It supports the same arguments as `icon()`,
for example,
it also have setIcon() and setIconSize() functions
music_icon = qta.IconWidget('fa5s.music',
color='blue',
color_active='orange')
The exceptions are `parent` and `size` keyword-only arguments,
which allow setting the widget parent and initial size, correspondingly.
It also has `setIcon()` and `setIconSize()` functions.
"""

def __init__(self, *names, **kwargs):
super().__init__(parent=kwargs.get('parent'))
self._icon = None
self._size = QtCore.QSize(16, 16)
self._size = kwargs.get('size', QtCore.QSize(16, 16))
self.setIcon(icon(*names, **kwargs))

def setIcon(self, _icon):
Expand Down
20 changes: 17 additions & 3 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "mambaforge-22.9"

conda:
file: docs/environment.yml
environment: docs/environment.yml

python:
version: 3
setup_py_install: true
install:
- method: pip
path: .

sphinx:
builder: html
configuration: docs/source/conf.py
fail_on_warning: true

0 comments on commit fe95a40

Please sign in to comment.