← Back to branch summary

~smspillaz/unity/unity.extract_switcher_interface

~smspillaz/unity/unity.extract_switcher_interface

Viewing all changes in revision 2953.

Committer: Sam Spilsbury
Date: 2012-12-18 11:24:35 UTC
mfrom: (2948.1.50 trunk)
Revision ID: sam.spilsbury@canonical.com-20121218112435-ynrj3tnkx23teikx

Merge lp:unity

files added:
panel/WindowButtonPriv.h

resources/information_icon.svg

resources/searchingthedashlegalnotice.html

tests/data/applications/kde4

tests/data/applications/kde4/afile.desktop

tests/mock-base-window.h

tests/test_dash_controller.cpp

tests/test_launcher_options.cpp

tests/test_launcher_tooltip.cpp

tests/test_lensview.cpp

tests/test_panel_indicators_view.cpp

tests/test_result_renderer.cpp

tests/test_window_buttons.cpp

unity-shared/ResizingBaseWindow.cpp

files removed:
resources/refine_gradient.png

resources/refine_gradient_dash_no_refine.png

resources/refine_gradient_no_refine_dash.png

resources/refine_gradient_panel_no_refine.png

tests/test_animator.cpp

unity-shared/Animator.cpp

unity-shared/Animator.h

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/Category.cpp

UnityCore/ModelRowAdaptor-inl.h

UnityCore/ModelRowAdaptor.cpp

UnityCore/ModelRowAdaptor.h

UnityCore/Result.cpp

UnityCore/Result.h

config.h.cmake

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/FilterAllButton.cpp

dash/FilterBar.cpp

dash/FilterBasicButton.cpp

dash/FilterExpanderLabel.cpp

dash/FilterExpanderLabel.h

dash/FilterGenreWidget.cpp

dash/FilterGenreWidget.h

dash/FilterMultiRangeButton.cpp

dash/FilterMultiRangeWidget.cpp

dash/FilterMultiRangeWidget.h

dash/FilterRatingsButton.cpp

dash/FilterRatingsWidget.cpp

dash/FilterRatingsWidget.h

dash/LensBar.cpp

dash/LensBar.h

dash/LensBarIcon.cpp

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/ResultRenderer.cpp

dash/ResultRenderer.h

dash/ResultRendererHorizontalTile.cpp

dash/ResultRendererHorizontalTile.h

dash/ResultRendererTile.cpp

dash/ResultRendererTile.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/ActionButton.cpp

dash/previews/ActionButton.h

dash/previews/ActionLink.cpp

dash/previews/ActionLink.h

dash/previews/ApplicationPreview.cpp

dash/previews/ApplicationPreview.h

dash/previews/CMakeLists.txt

dash/previews/GenericPreview.cpp

dash/previews/GenericPreview.h

dash/previews/MoviePreview.cpp

dash/previews/MoviePreview.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/PreviewContainer.cpp

dash/previews/PreviewContainer.h

dash/previews/PreviewInfoHintWidget.cpp

dash/previews/PreviewInfoHintWidget.h

dash/previews/PreviewNavigator.cpp

dash/previews/PreviewRatingsWidget.cpp

dash/previews/PreviewRatingsWidget.h

dash/previews/SocialPreview.cpp

dash/previews/SocialPreview.h

dash/previews/SocialPreviewComments.cpp

dash/previews/SocialPreviewComments.h

dash/previews/SocialPreviewContent.cpp

dash/previews/SocialPreviewContent.h

dash/previews/Track.cpp

dash/previews/Track.h

debian/changelog

debian/control

hud/CMakeLists.txt

hud/HudButton.cpp

hud/HudController.cpp

hud/HudController.h

hud/HudView.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/EdgeBarrierController.cpp

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherOptions.cpp

launcher/LauncherOptions.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SoftwareCenterLauncherIcon.h

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/Tooltip.cpp

launcher/Tooltip.h

panel/CMakeLists.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelIndicatorsView.cpp

panel/PanelIndicatorsView.h

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelView.cpp

panel/PanelView.h

panel/StandalonePanel.cpp

panel/WindowButtons.cpp

panel/WindowButtons.h

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/src/unity-places-group-accessible.cpp

plugins/unityshell/src/unity-rvgrid-accessible.cpp

plugins/unityshell/src/unity-sctext-accessible.cpp

plugins/unityshell/src/unitya11y.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

po/unity.pot

resources/category_gradient.png

resources/category_gradient_no_refine.png

resources/lens-nav-app.svg

resources/lens-nav-file.svg

resources/lens-nav-gwibber.svg

resources/lens-nav-home.svg

resources/lens-nav-music.svg

resources/lens-nav-people.svg

resources/lens-nav-photo.svg

resources/lens-nav-video.svg

resources/refine_gradient_corner.png

resources/refine_gradient_dash.png

services/CMakeLists.txt

shortcuts/CMakeLists.txt

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

shortcuts/StandaloneShortcuts.cpp

tests/CMakeLists.txt

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/xim/test_gcin.py

tests/test-gestures/CMakeLists.txt

tests/test-get-transients/CMakeLists.txt

tests/test-input-remover/CMakeLists.txt

tests/test-minimize-window-handler/CMakeLists.txt

tests/test_action_link.cpp

tests/test_glib_source.cpp

tests/test_hud_button.cpp

tests/test_hud_controller.cpp

tests/test_launcher_controller.cpp

tests/test_main.cpp

tests/test_overlay_scrollbar.cpp

tests/test_panel_menu_view.cpp

tests/test_places_group.cpp

tests/test_shortcut_controller.cpp

tests/test_software_center_launcher_icon.cpp

tests/test_static_cairo_text.cpp

tests/test_switcher_model.cpp

tests/test_text_input.cpp

tests/test_utils.h

tests/unit/TestStaticCairoText.cpp

unity-shared/CMakeLists.txt

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/DashStyleInterface.h

unity-shared/DebugDBusInterface.cpp

unity-shared/GraphicsUtils.cpp

unity-shared/GraphicsUtils.h

unity-shared/IconTexture.cpp

unity-shared/OverlayRenderer.cpp

unity-shared/OverlayRenderer.h

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PlacesOverlayVScrollBar.h

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/PreviewStyle.cpp

unity-shared/PreviewStyle.h

unity-shared/ResizingBaseWindow.h

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/SearchBarSpinner.cpp

unity-shared/StandaloneWindowManager.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/UBusMessages.h

unity-shared/VScrollBarOverlayWindow.cpp

unity-shared/VScrollBarOverlayWindow.h

unity-standalone/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/Category.cpp

UnityCore/ModelRowAdaptor-inl.h

UnityCore/ModelRowAdaptor.cpp

UnityCore/ModelRowAdaptor.h

UnityCore/Result.cpp

UnityCore/Result.h

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/FilterAllButton.cpp

dash/FilterBar.cpp

dash/FilterBasicButton.cpp

dash/FilterExpanderLabel.cpp

dash/FilterExpanderLabel.h

dash/FilterGenreWidget.cpp

dash/FilterGenreWidget.h

dash/FilterMultiRangeButton.cpp

dash/FilterMultiRangeWidget.cpp

dash/FilterMultiRangeWidget.h

dash/FilterRatingsButton.cpp

dash/FilterRatingsWidget.cpp

dash/FilterRatingsWidget.h

dash/LensBar.cpp

dash/LensBarIcon.cpp

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/ResultRenderer.cpp

dash/ResultRenderer.h

dash/ResultRendererHorizontalTile.cpp

dash/ResultRendererHorizontalTile.h

dash/ResultRendererTile.cpp

dash/ResultRendererTile.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/ActionButton.cpp

dash/previews/ActionButton.h

dash/previews/ActionLink.cpp

dash/previews/ActionLink.h

dash/previews/ApplicationPreview.cpp

dash/previews/ApplicationPreview.h

dash/previews/CMakeLists.txt

dash/previews/GenericPreview.cpp

dash/previews/GenericPreview.h

dash/previews/MoviePreview.cpp

dash/previews/MoviePreview.h

dash/previews/MusicPreview.cpp

dash/previews/MusicPreview.h

dash/previews/PreviewContainer.cpp

dash/previews/PreviewContainer.h

dash/previews/PreviewInfoHintWidget.cpp

dash/previews/PreviewInfoHintWidget.h

dash/previews/PreviewNavigator.cpp

dash/previews/PreviewRatingsWidget.cpp

dash/previews/PreviewRatingsWidget.h

dash/previews/SocialPreview.cpp

dash/previews/SocialPreview.h

dash/previews/SocialPreviewComments.cpp

dash/previews/SocialPreviewComments.h

dash/previews/SocialPreviewContent.cpp

dash/previews/SocialPreviewContent.h

dash/previews/Track.cpp

dash/previews/Track.h

debian/changelog

hud/CMakeLists.txt

hud/HudButton.cpp

hud/HudController.cpp

hud/HudController.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/EdgeBarrierController.cpp

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherOptions.cpp

launcher/LauncherOptions.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SoftwareCenterLauncherIcon.h

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/Tooltip.cpp

launcher/Tooltip.h

panel/CMakeLists.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelIndicatorsView.cpp

panel/PanelIndicatorsView.h

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelView.cpp

panel/PanelView.h

panel/StandalonePanel.cpp

panel/WindowButtonPriv.h

panel/WindowButtons.cpp

panel/WindowButtons.h

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/src/unity-places-group-accessible.cpp

plugins/unityshell/src/unity-rvgrid-accessible.cpp

plugins/unityshell/src/unity-sctext-accessible.cpp

plugins/unityshell/src/unitya11y.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

resources/category_gradient.png

resources/category_gradient_no_refine.png

resources/information_icon.svg

resources/lens-nav-app.svg

resources/lens-nav-file.svg

resources/lens-nav-gwibber.svg

resources/lens-nav-home.svg

resources/lens-nav-music.svg

resources/lens-nav-people.svg

resources/lens-nav-photo.svg

resources/lens-nav-video.svg

resources/refine_gradient.png

resources/refine_gradient_corner.png

resources/refine_gradient_dash.png

resources/refine_gradient_dash_no_refine.png

resources/refine_gradient_no_refine_dash.png

resources/refine_gradient_panel_no_refine.png

resources/searchingthedashlegalnotice.html

services/CMakeLists.txt

shortcuts/CMakeLists.txt

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

shortcuts/StandaloneShortcuts.cpp

tests/CMakeLists.txt

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/xim/test_gcin.py

tests/data/applications/kde4/

tests/data/applications/kde4/afile.desktop

tests/mock-base-window.h

tests/test-gestures/CMakeLists.txt

tests/test-get-transients/CMakeLists.txt

tests/test-input-remover/CMakeLists.txt

tests/test-minimize-window-handler/CMakeLists.txt

tests/test_action_link.cpp

tests/test_animator.cpp

tests/test_dash_controller.cpp

tests/test_glib_source.cpp

tests/test_hud_button.cpp

tests/test_hud_controller.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_options.cpp

tests/test_launcher_tooltip.cpp

tests/test_lensview.cpp

tests/test_main.cpp

tests/test_overlay_scrollbar.cpp

tests/test_panel_indicators_view.cpp

tests/test_panel_menu_view.cpp

tests/test_places_group.cpp

tests/test_result_renderer.cpp

tests/test_shortcut_controller.cpp

tests/test_software_center_launcher_icon.cpp

tests/test_static_cairo_text.cpp

tests/test_switcher_model.cpp

tests/test_text_input.cpp

tests/test_utils.h

tests/test_window_buttons.cpp

tests/unit/TestStaticCairoText.cpp

unity-shared/Animator.cpp

unity-shared/Animator.h

unity-shared/CMakeLists.txt

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/DashStyleInterface.h

unity-shared/DebugDBusInterface.cpp

unity-shared/GraphicsUtils.cpp

unity-shared/GraphicsUtils.h

unity-shared/IconTexture.cpp

unity-shared/OverlayRenderer.cpp

unity-shared/OverlayRenderer.h

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PlacesOverlayVScrollBar.h

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/PreviewStyle.cpp

unity-shared/PreviewStyle.h

unity-shared/ResizingBaseWindow.cpp

unity-shared/ResizingBaseWindow.h

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/SearchBarSpinner.cpp

unity-shared/StandaloneWindowManager.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/UBusMessages.h

unity-shared/VScrollBarOverlayWindow.cpp

unity-shared/VScrollBarOverlayWindow.h

unity-standalone/CMakeLists.txt

Older »