lp://qastaging/~unity-2d-team/unity-2d/filter-option-compact-shell

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/unity-2d at revision 938

Gerry Boland (community): Approve on 2012-02-27

Michał Sawicz: Pending requested 2012-02-16

Diff: 252 lines (+178/-2)

7 files modified

shell/dash/FilterCheckoption.qml (+4/-2)
shell/dash/FilterCheckoptionCompact.qml (+22/-0)
shell/dash/FilterLoader.qml (+2/-0)
shell/dash/FilterPane.qml (+1/-0)
shell/dash/FilterRadiooption.qml (+13/-0)
shell/dash/LensBar.qml (+1/-0)
tests/dash/test-renderer-filter-check-option-compact.rb (+135/-0)

api

Superseded for merging into lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell

Gerry Boland (community): Needs Fixing on 2012-01-24

Michał Sawicz: Needs Fixing on 2012-01-24

Diff: 1375 lines (+564/-220)

29 files modified

data/com.canonical.Unity2d.gschema.xml (+1/-1)
debian/control (+1/-1)
libunity-2d-private/src/lens.cpp (+15/-3)
libunity-2d-private/src/lenses.cpp (+8/-5)
libunity-2d-private/src/lenses.h (+2/-0)
shell/Shell.qml (+1/-1)
shell/app/shelldeclarativeview.cpp (+7/-0)
shell/app/shelldeclarativeview.h (+2/-0)
shell/common/Background.qml (+111/-0)
shell/common/IconTile.qml (+97/-0)
shell/common/SearchEntry.qml (+25/-33)
shell/dash/Dash.qml (+41/-64)
shell/dash/FilterCheckoption.qml (+4/-2)
shell/dash/FilterCheckoptionCompact.qml (+22/-0)
shell/dash/FilterLoader.qml (+2/-0)
shell/dash/FilterPane.qml (+1/-0)
shell/dash/Home.qml (+1/-1)
shell/dash/LensBar.qml (+21/-19)
shell/dash/LensView.qml (+7/-6)
shell/dash/RendererGrid.qml (+6/-14)
shell/launcher/LauncherItem.qml (+17/-67)
shell/launcher/LauncherList.qml (+1/-1)
tests/dash/dash-tests.rb (+3/-1)
tests/dash/test-renderer-filter-check-option-compact.rb (+135/-0)
tests/launcher/autohide_show_tests.rb (+7/-0)
tests/launcher/autohide_show_tests_rtl.rb (+7/-0)
tests/shell/input_shaping.rb (+7/-0)
tests/shell/input_shaping_rtl.rb (+7/-0)
tests/spread/spread-tests.rb (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #841902: Dash - Genre filter category in the Music Lens should use a 3 column layout

Low

Fix Released

Link a bug report

Related blueprints

938. By Lohith D Shivamurthy on 2012-02-17

merge lp:~dyams/unity-2d/fix-modifed-filter-3-columns

937. By Lohith D Shivamurthy on 2012-02-17

nerge lp:unity-2d

936. By Lohith D Shivamurthy on 2012-02-16

merge

935. By Lohith D Shivamurthy on 2012-01-26

[places] replace 'system' i teardown too

934. By Lohith D Shivamurthy on 2012-01-26

[places][tests] Use the global and remove the local @sut

933. By Lohith D Shivamurthy on 2012-01-26

[places][tests] replace sysytem with .execute_shell_command

932. By Lohith D Shivamurthy on 2012-01-25

[shell][dash] Review comments fixed

931. By Lohith D Shivamurthy on 2012-01-24

[shell] Have a separate QML for new renderer filter-checkoption-compact

930. By Lohith D Shivamurthy on 2012-01-24

[shell] Add comments to test cases

929. By Lohith D Shivamurthy on 2012-01-24

[shell] Tests added to verify the new renderer