lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup2
- Get this branch:
- bzr branch lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup2
Branch merges
- 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)
Related source package recipes
Related bugs
| Bug #1324184: UnityThemeIconProvider: Icons fall back to lower priority themes before checking alternative names | Medium | Fix Released |
|
| Bug #1325772: Wrong icon size selected for image://theme/ uris | Undecided | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 1228. By Lars Karlitski
-
unitythemeiconp
rovider: manually load icons Previously, UnityThemeIconP
rovider used QIcon::fromTheme() to lookup and load
icons. That function uses fdo's default icon lookup algorithm: it looks at the
current theme and all parent themes for each icon in turn. We'd prefer a
breadth-first search, where all icon names are looked up in the current theme
before falling back to the parent themes (see lp: #1324184). This patch
implements fdo's FindBestIcon() algorithm, which behaves like that.It also now properly support rectangular icons and always returns an icon with
the requested size (adjusted for preserving the aspect ratio).As a result, the Icon component is much simpler and only requires height to be
set for rectangular icons. - 1227. By Cris Dywan
-
Fix wrong sheet labels and pick up dtr strings
. Fixes: https://bugs.launchpad .net/bugs/ 1354485. Approved by Zsombor Egri, PS Jenkins bot.
- 1226. By Zsombor Egri
-
Dialog title is wrapped into maximum two lines, then elides. Fixes: https:/
/bugs.launchpad .net/bugs/ 1354376. Approved by PS Jenkins bot, Tim Peeters.
- 1222. By Florian Boucault
-
Page: only compile and load ToolbarItems if strictly necessary.
Approved by Zsombor Egri, PS Jenkins bot.
- 1221. By Ugo Riboni
-
Disable the mousearea on top of the content when using the new header, as it is useless and it interferes with other input elements in the content area. Fixes: https:/
/bugs.launchpad .net/bugs/ 1358327. Approved by PS Jenkins bot.
- 1220. By Florian Boucault
-
Fixed usage of images across the board:
* Made images as small as possible:
- ListItemDivider6px.png
- bubble_shadow*.png
- header_overflow_ dropshadow. png
* Removed direct references to @GU in OptionSelector.
* Button's stroke_button.png now loaded only when necessary, asynchronously and not cached.
* Removed unused ListItemDivider24px.png. Approved by PS Jenkins bot, Zsombor Egri.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-ui-toolkit
