Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Version 1.6.0-dev (development of upcoming release)
* Removed: UI translation in Bosnian, Thai, and Occidental/Interlingue (#1914)
* Removed: LICENSE file in favor of LICENSES directory and LICENSES.md file
* Removed: SSH Cipher configuration in Manage profiles dialog (#2143)
* Fixed: Crash in Compare snapshots dialog (aka Snapshots dialog) when comparing/diff two backups (#2327 Michael Neese @madic-creates)
* Fixed: File view and Compare Backups dialog now open the clicked item correctly even with multiple selection or single-click-to-open enabled (#2330)
* Fixed: Crash in Compare snapshots dialog (aka Snapshots dialog) whhen comparing/diff two backups (#2327 Michael Neese @madic-creates)
* Fixed: Enforce UTF-8 encoding in takesnapshot.log and some other files (#2298)
Expand Down
15 changes: 9 additions & 6 deletions qt/icon.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'adwaita',
'adwaita-dark',
'yaru',
'oxygen'
'oxygen',
)
ICON_NAME_TO_CHECK = 'document-save'

Expand All @@ -37,8 +37,9 @@
# (not fully compliant to the freedesktop.org spec)
# and is not recommended as main theme (it is meant as fallback only).
if not QIcon.fromTheme(ICON_NAME_TO_CHECK).isNull():
logger.debug(f'Icon "{ICON_NAME_TO_CHECK}" found in '
'installed theme: {QIcon.themeName()}')
logger.debug(
f'Icon "{ICON_NAME_TO_CHECK}" found in theme: {QIcon.themeName()}'
)
break

# try next theme (activate it)...
Expand All @@ -47,9 +48,11 @@
f'(activated as "{QIcon.themeName()}")')

if QIcon.fromTheme(ICON_NAME_TO_CHECK).isNull():
logger.error('No supported theme installed (missing icons). '
'Please consult the project web site for instructions '
'how to fix this.')
logger.error(
f'Icon theme missing or not supported. Icon "{ICON_NAME_TO_CHECK}" '
'not found. An icon theme should be installed. '
'For example: tango-icon-theme, oxygen-icon-theme'
)

# Dev note: Please prefer choosing icons from the freedesktop.org spec
# to improve the chance that the icon is available and
Expand Down