UnityThemeIconProvider: Icons fall back to lower priority themes before checking alternative names
Bug #1324184 reported by
Nick Dedekind
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Ubuntu UI Toolkit |
Fix Released
|
Medium
|
Lars Karlitski | ||
| ubuntu-ui-toolkit (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned | ||
| Vivid |
New
|
Undecided
|
Unassigned | ||
Bug Description
QIcon::fromTheme checks the ingerited/system theme for icons as well as the user theme.
Due to the way we split the icon name and check each icon separately, if we supply "audio-
Related branches
lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Tim Peeters: Needs Resubmitting
- Albert Astals Cid (community): Needs Information
-
Diff: 404 lines (+253/-64) (has conflicts)7 files modifieddebian/control (+1/-1)
modules/Ubuntu/Components/Icon10.qml (+8/-36)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-0)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+224/-25)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.h (+3/-0)
tests/unit_x11/tst_components/tst_components.cpp (+12/-1)
tests/unit_x11/tst_components/tst_icon.qml (+1/-1)
lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup2
- Zsombor Egri: Approve
- PS Jenkins bot: Approve (continuous-integration)
-
Diff: 408 lines (+257/-65)7 files modifieddebian/control (+1/-1)
modules/Ubuntu/Components/Icon10.qml (+10/-36)
modules/Ubuntu/Components/plugin/plugin.pro (+1/-1)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+229/-25)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.h (+3/-0)
tests/unit_x11/tst_components/tst_components.cpp (+12/-1)
tests/unit_x11/tst_components/tst_icon.qml (+1/-1)
- Zsombor Egri: Pending requested
-
Diff: 2501 lines (+874/-584)48 files modifiedcomponents.api (+1/-0)
debian/control (+1/-1)
modules/Ubuntu/Components/AppHeader.qml (+5/-0)
modules/Ubuntu/Components/Icon10.qml (+11/-37)
modules/Ubuntu/Components/ListItems/ThinDivider.qml (+12/-2)
modules/Ubuntu/Components/MainView.qml (+2/-0)
modules/Ubuntu/Components/Page10.qml (+7/-1)
modules/Ubuntu/Components/PageStack.qml (+7/-6)
modules/Ubuntu/Components/PageWrapperUtils.js (+3/-1)
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/DefaultSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/Dialog.qml (+3/-0)
modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+2/-0)
modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+6/-2)
modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+167/-30)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+7/-3)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml (+7/-3)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml (+7/-3)
modules/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@20.sci (+4/-4)
modules/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@30.sci (+4/-4)
modules/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@8.sci (+4/-4)
modules/Ubuntu/Components/Themes/SuruDark/Palette.qml (+3/-3)
modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/SuruGradient/Palette.qml (+4/-4)
modules/Ubuntu/Components/plugin/plugin.pro (+1/-1)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+229/-25)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.h (+3/-0)
po/ubuntu-ui-toolkit.pot (+83/-341)
po/update-pot.sh (+3/-0)
push_to_phone.sh (+1/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+19/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+11/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.qml (+61/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.new_header.qml (+43/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+14/-56)
tests/resources/header/header.qml (+4/-6)
tests/resources/navigation/MyCustomPage.qml (+17/-25)
tests/resources/popover/DialogTest.qml (+44/-0)
tests/unit_x11/tst_components/tst_components.cpp (+12/-1)
tests/unit_x11/tst_components/tst_headActions.qml (+13/-0)
tests/unit_x11/tst_components/tst_icon.qml (+1/-1)
tests/unit_x11/tst_components/tst_pagestack_new_header.qml (+33/-0)
tests/unit_x11/tst_components/tst_textinput_touch.qml (+1/-1)
Revision history for this message
| Michał Sawicz (saviq) wrote | #1 |
Revision history for this message
| Michał Sawicz (saviq) wrote | #2 |
Revision history for this message
| Lars Karlitski (larsu) wrote | #3 |
Revision history for this message
| Tim Peeters (tpeeters) wrote | #4 |
| tags: | added: icon |
| Changed in ubuntu-ui-toolkit: | |
| importance: | Undecided → Medium |
| Changed in ubuntu-ui-toolkit: | |
| status: | New → Confirmed |
| no longer affects: | indicator-sound |
| Changed in ubuntu-ui-toolkit: | |
| status: | Confirmed → In Progress |
| assignee: | nobody → Lars Uebernickel (larsu) |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | #5 |
| Changed in ubuntu-ui-toolkit: | |
| status: | In Progress → Fix Committed |
| Changed in ubuntu-ui-toolkit: | |
| status: | Fix Committed → Fix Released |
| Changed in ubuntu-ui-toolkit (Ubuntu): | |
| status: | New → Fix Released |
To post a comment you must log in.
This affects the sound indicator on the desktop under suru theme, because the icon listed as the first one is present in the ubuntu-mono-dark theme, and that is selected, instead of going breadth-first and checking for other icons first, before falling to another theme.