Viewing all changes in revision 785.
- Committer: Ugo Riboni
- Date: 2011-11-18 16:49:28 UTC
- mfrom: (771.3.57 unity-2d-tv)
- Revision ID: ugo.riboni@canonical.com-20111118164928-6b0zsae7984nym6w
Merge launcher and dash into an unified shell
- files added:
- debian/manpages/unity-2d-shell.1
- shell/artwork/dash
- shell/artwork/launcher
- shell/qml
- shell/qml/dash
- shell/qml/launcher
- files removed:
- debian/manpages/unity-2d-launcher.1
- panel/applets/homebutton
- files renamed:
- launcher/app/gesturehandler.cpp => libunity-2d-private/src/gesturehandler.cpp
- launcher/app/gesturehandler.h => libunity-2d-private/src/gesturehandler.h
- places/ => shell/
- launcher/app/launcher.xml => shell/app/launcher.xml
- launcher/app/launcherdbus.cpp => shell/app/launcherdbus.cpp
- launcher/app/launcherdbus.h => shell/app/launcherdbus.h
- places/app/places.cpp => shell/app/shell.cpp
- places/app/dashdeclarativeview.cpp => shell/app/shelldeclarativeview.cpp
- places/app/dashdeclarativeview.h => shell/app/shelldeclarativeview.h
- launcher/app/unity-2d-launcher.service.in => shell/app/unity-2d-launcher.service.in
- places/app/unity-2d-places.desktop => shell/app/unity-2d-shell.desktop
- places/artwork/arrow.png => shell/artwork/dash/arrow.png
- places/artwork/background_sheen.png => shell/artwork/dash/background_sheen.png
- places/artwork/button_background.png => shell/artwork/dash/button_background.png
- places/artwork/cross.png => shell/artwork/dash/cross.png
- places/artwork/desktop_dash_background.png => shell/artwork/dash/desktop_dash_background.png
- places/artwork/desktop_dash_background.sci => shell/artwork/dash/desktop_dash_background.sci
- places/artwork/desktop_dash_background_no_transparency.png => shell/artwork/dash/desktop_dash_background_no_transparency.png
- places/artwork/desktop_dash_background_no_transparency.sci => shell/artwork/dash/desktop_dash_background_no_transparency.sci
- places/artwork/find_files.png => shell/artwork/dash/find_files.png
- places/artwork/find_internet_apps.png => shell/artwork/dash/find_internet_apps.png
- places/artwork/find_media_apps.png => shell/artwork/dash/find_media_apps.png
- places/artwork/find_more_apps.png => shell/artwork/dash/find_more_apps.png
- places/artwork/fullscreen_button.png => shell/artwork/dash/fullscreen_button.png
- places/artwork/lens-nav-home.svg => shell/artwork/dash/lens-nav-home.svg
- places/artwork/multirange_selection_left.png => shell/artwork/dash/multirange_selection_left.png
- places/artwork/multirange_selection_left_first.png => shell/artwork/dash/multirange_selection_left_first.png
- places/artwork/multirange_selection_middle.png => shell/artwork/dash/multirange_selection_middle.png
- places/artwork/multirange_selection_right.png => shell/artwork/dash/multirange_selection_right.png
- places/artwork/multirange_selection_right_last.png => shell/artwork/dash/multirange_selection_right_last.png
- places/artwork/open_shortcuts.png => shell/artwork/dash/open_shortcuts.png
- places/artwork/scrollbar.png => shell/artwork/dash/scrollbar.png
- places/artwork/scrollbar.sci => shell/artwork/dash/scrollbar.sci
- places/artwork/search_background.png => shell/artwork/dash/search_background.png
- places/artwork/search_background.sci => shell/artwork/dash/search_background.sci
- places/artwork/search_icon.png => shell/artwork/dash/search_icon.png
- places/artwork/star_empty-32.png => shell/artwork/dash/star_empty-32.png
- places/artwork/star_empty.png => shell/artwork/dash/star_empty.png
- places/artwork/star_full-32.png => shell/artwork/dash/star_full-32.png
- places/artwork/star_full.png => shell/artwork/dash/star_full.png
- places/artwork/tick.png => shell/artwork/dash/tick.png
- places/artwork/tick_box.png => shell/artwork/dash/tick_box.png
- launcher/artwork/background.png => shell/artwork/launcher/background.png
- launcher/artwork/devices.png => shell/artwork/launcher/devices.png
- launcher/artwork/gradient_more_items_bottom.png => shell/artwork/launcher/gradient_more_items_bottom.png
- launcher/artwork/gradient_more_items_top.png => shell/artwork/launcher/gradient_more_items_top.png
- launcher/artwork/launcher_arrow_ltr.png => shell/artwork/launcher/launcher_arrow_ltr.png
- launcher/artwork/launcher_arrow_rtl.png => shell/artwork/launcher/launcher_arrow_rtl.png
- launcher/artwork/launcher_pip_ltr.png => shell/artwork/launcher/launcher_pip_ltr.png
- launcher/artwork/progress_bar_fill.png => shell/artwork/launcher/progress_bar_fill.png
- launcher/artwork/progress_bar_trough.png => shell/artwork/launcher/progress_bar_trough.png
- launcher/artwork/round_corner_54x54.png => shell/artwork/launcher/round_corner_54x54.png
- launcher/artwork/round_outline_54x54.png => shell/artwork/launcher/round_outline_54x54.png
- launcher/artwork/round_selected_66x66.png => shell/artwork/launcher/round_selected_66x66.png
- launcher/artwork/round_shine_54x54.png => shell/artwork/launcher/round_shine_54x54.png
- places/AbstractButton.qml => shell/qml/dash/AbstractButton.qml
- places/ButtonBackground.qml => shell/qml/dash/ButtonBackground.qml
- places/CategoryHeader.qml => shell/qml/dash/CategoryHeader.qml
- places/CenteredGridView.qml => shell/qml/dash/CenteredGridView.qml
- places/dash.qml => shell/qml/dash/Dash.qml
- places/Filter.qml => shell/qml/dash/Filter.qml
- places/FilterCheckoption.qml => shell/qml/dash/FilterCheckoption.qml
- places/FilterLoader.qml => shell/qml/dash/FilterLoader.qml
- places/FilterMultirange.qml => shell/qml/dash/FilterMultirange.qml
- places/FilterPane.qml => shell/qml/dash/FilterPane.qml
- places/FilterRadiooption.qml => shell/qml/dash/FilterRadiooption.qml
- places/FilterRatings.qml => shell/qml/dash/FilterRatings.qml
- places/FoldingArrow.qml => shell/qml/dash/FoldingArrow.qml
- places/GridViewWithSpacing.qml => shell/qml/dash/GridViewWithSpacing.qml
- places/Home.qml => shell/qml/dash/Home.qml
- places/HomeButton.qml => shell/qml/dash/HomeButton.qml
- places/HomeButtonApplication.qml => shell/qml/dash/HomeButtonApplication.qml
- places/HomeButtonDefaultApplication.qml => shell/qml/dash/HomeButtonDefaultApplication.qml
- places/HomeShortcuts.qml => shell/qml/dash/HomeShortcuts.qml
- places/LensBar.qml => shell/qml/dash/LensBar.qml
- places/LensButton.qml => shell/qml/dash/LensButton.qml
- places/LensView.qml => shell/qml/dash/LensView.qml
- places/ListViewWithHeaders.qml => shell/qml/dash/ListViewWithHeaders.qml
- places/ListViewWithScrollbar.qml => shell/qml/dash/ListViewWithScrollbar.qml
- places/MultiRangeButton.qml => shell/qml/dash/MultiRangeButton.qml
- places/MultiRangeSelectionBar.qml => shell/qml/dash/MultiRangeSelectionBar.qml
- places/MultiRangeView.qml => shell/qml/dash/MultiRangeView.qml
- places/PageModel.qml => shell/qml/dash/PageModel.qml
- places/RatingStars.qml => shell/qml/dash/RatingStars.qml
- places/Renderer.qml => shell/qml/dash/Renderer.qml
- places/RendererGrid.qml => shell/qml/dash/RendererGrid.qml
- places/Scrollbar.qml => shell/qml/dash/Scrollbar.qml
- places/SearchEntry.qml => shell/qml/dash/SearchEntry.qml
- places/Star.qml => shell/qml/dash/Star.qml
- places/TextCustom.qml => shell/qml/dash/TextCustom.qml
- places/TextMultiLine.qml => shell/qml/dash/TextMultiLine.qml
- places/TickBox.qml => shell/qml/dash/TickBox.qml
- places/TileHorizontal.qml => shell/qml/dash/TileHorizontal.qml
- places/TileVertical.qml => shell/qml/dash/TileVertical.qml
- launcher/AutoScrollingListView.qml => shell/qml/launcher/AutoScrollingListView.qml
- launcher/Launcher.qml => shell/qml/launcher/Launcher.qml
- launcher/LauncherItem.qml => shell/qml/launcher/LauncherItem.qml
- launcher/LauncherList.qml => shell/qml/launcher/LauncherList.qml
- launcher/ListViewDragAndDrop.qml => shell/qml/launcher/ListViewDragAndDrop.qml
- places/utils.js => shell/qml/utils.js
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
