Merge lp://qastaging/~sethj/ubuntu/wily/unity/fix-for-1445595 into lp://qastaging/ubuntu/wily/unity

Proposed by Seth Johnson
Status: Superseded
Proposed branch: lp://qastaging/~sethj/ubuntu/wily/unity/fix-for-1445595
Merge into: lp://qastaging/ubuntu/wily/unity
Diff against target: 250493 lines (+159322/-43857) (has conflicts)
1082 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+7/-0)
AUTHORS (+67/-3)
CMakeLists.txt (+220/-54)
ChangeLog (+40142/-56)
UnityCore/ActionHandle.h (+57/-0)
UnityCore/AppmenuIndicator.cpp (+69/-5)
UnityCore/AppmenuIndicator.h (+17/-6)
UnityCore/CMakeLists.txt (+45/-30)
UnityCore/Categories.cpp (+7/-24)
UnityCore/Categories.h (+0/-5)
UnityCore/Category.cpp (+31/-3)
UnityCore/Category.h (+4/-1)
UnityCore/CheckOptionFilter.cpp (+18/-9)
UnityCore/CheckOptionFilter.h (+3/-0)
UnityCore/ConnectionManager.cpp (+100/-0)
UnityCore/ConnectionManager.h (+84/-0)
UnityCore/DBusIndicators.cpp (+239/-167)
UnityCore/DBusIndicators.h (+13/-11)
UnityCore/DesktopUtilities.cpp (+41/-0)
UnityCore/DesktopUtilities.h (+3/-0)
UnityCore/FilesystemLenses.cpp (+0/-504)
UnityCore/FilesystemLenses.h (+0/-102)
UnityCore/Filter.cpp (+32/-41)
UnityCore/Filter.h (+2/-0)
UnityCore/Filters.cpp (+149/-20)
UnityCore/Filters.h (+19/-3)
UnityCore/GLibDBusNameWatcher.cpp (+44/-0)
UnityCore/GLibDBusNameWatcher.h (+54/-0)
UnityCore/GLibDBusProxy.cpp (+462/-76)
UnityCore/GLibDBusProxy.h (+32/-5)
UnityCore/GLibDBusServer.cpp (+755/-0)
UnityCore/GLibDBusServer.h (+118/-0)
UnityCore/GLibSignal-inl.h (+5/-1)
UnityCore/GLibSource.cpp (+7/-4)
UnityCore/GLibSource.h (+3/-2)
UnityCore/GLibWrapper-inl.h (+12/-0)
UnityCore/GLibWrapper.cpp (+87/-7)
UnityCore/GLibWrapper.h (+38/-0)
UnityCore/GSettingsScopes.cpp (+171/-0)
UnityCore/GSettingsScopes.h (+56/-0)
UnityCore/GnomeSessionManager.cpp (+711/-0)
UnityCore/GnomeSessionManager.h (+70/-0)
UnityCore/GnomeSessionManagerImpl.h (+88/-0)
UnityCore/HomeLens.cpp (+0/-1251)
UnityCore/HomeLens.h (+0/-93)
UnityCore/Hud.cpp (+5/-2)
UnityCore/Hud.h (+5/-11)
UnityCore/Indicator.cpp (+41/-79)
UnityCore/Indicator.h (+10/-13)
UnityCore/IndicatorEntry.cpp (+83/-22)
UnityCore/IndicatorEntry.h (+25/-14)
UnityCore/Indicators.cpp (+17/-17)
UnityCore/Indicators.h (+19/-52)
UnityCore/Lens.cpp (+0/-933)
UnityCore/Lens.h (+0/-141)
UnityCore/Lenses.h (+0/-57)
UnityCore/MiscUtils.h (+116/-0)
UnityCore/Model-inl.h (+79/-41)
UnityCore/Model.h (+20/-13)
UnityCore/ModelIterator-inl.h (+36/-27)
UnityCore/ModelIterator.h (+31/-30)
UnityCore/ModelRowAdaptor-inl.h (+3/-3)
UnityCore/ModelRowAdaptor.cpp (+21/-0)
UnityCore/ModelRowAdaptor.h (+15/-6)
UnityCore/MultiRangeFilter.cpp (+62/-63)
UnityCore/MultiRangeFilter.h (+3/-0)
UnityCore/MusicPreview.cpp (+5/-44)
UnityCore/MusicPreview.h (+0/-3)
UnityCore/PaymentPreview.cpp (+122/-0)
UnityCore/PaymentPreview.h (+62/-0)
UnityCore/Preview.cpp (+68/-85)
UnityCore/Preview.h (+20/-14)
UnityCore/PreviewPlayer.cpp (+166/-0)
UnityCore/PreviewPlayer.h (+76/-0)
UnityCore/RadioOptionFilter.cpp (+18/-9)
UnityCore/RadioOptionFilter.h (+3/-0)
UnityCore/RatingsFilter.cpp (+19/-7)
UnityCore/RatingsFilter.h (+4/-0)
UnityCore/Result.cpp (+190/-7)
UnityCore/Result.h (+46/-1)
UnityCore/Results.cpp (+7/-24)
UnityCore/Results.h (+3/-6)
UnityCore/Scope.cpp (+306/-0)
UnityCore/Scope.h (+115/-0)
UnityCore/ScopeData.cpp (+92/-0)
UnityCore/ScopeData.h (+61/-0)
UnityCore/ScopeProxy.cpp (+825/-0)
UnityCore/ScopeProxy.h (+55/-0)
UnityCore/ScopeProxyInterface.h (+106/-0)
UnityCore/Scopes.cpp (+286/-0)
UnityCore/Scopes.h (+97/-0)
UnityCore/SeriesPreview.cpp (+0/-149)
UnityCore/SeriesPreview.h (+0/-73)
UnityCore/SessionManager.h (+87/-0)
UnityCore/Track.cpp (+8/-8)
UnityCore/Track.h (+2/-10)
UnityCore/Tracks.cpp (+2/-1)
UnityCore/UWeakPtr.h (+52/-0)
UnityCore/Variant.cpp (+310/-122)
UnityCore/Variant.h (+73/-35)
UnityCore/pch/unitycore_pch.hh (+39/-0)
UnityCore/unity-core.pc.cmake (+1/-1)
cmake/isclang.cc (+26/-0)
cmake/pch.cmake (+103/-0)
com.canonical.Unity.gschema.xml (+129/-14)
config.h.cmake (+12/-1)
dash/AbstractPlacesGroup.cpp (+0/-44)
dash/AbstractPlacesGroup.h (+0/-51)
dash/ApplicationStarter.h (+42/-0)
dash/ApplicationStarterImp.cpp (+72/-0)
dash/ApplicationStarterImp.h (+34/-0)
dash/CMakeLists.txt (+15/-27)
dash/CoverflowResultView.cpp (+45/-61)
dash/CoverflowResultView.h (+9/-6)
dash/DashController.cpp (+194/-185)
dash/DashController.h (+25/-25)
dash/DashView.cpp (+1135/-767)
dash/DashView.h (+81/-57)
dash/DashViewPrivate.cpp (+2/-2)
dash/DashViewPrivate.h (+2/-2)
dash/FilterAllButton.cpp (+3/-11)
dash/FilterAllButton.h (+3/-2)
dash/FilterBar.cpp (+48/-33)
dash/FilterBar.h (+5/-3)
dash/FilterBasicButton.cpp (+53/-54)
dash/FilterBasicButton.h (+9/-4)
dash/FilterExpanderLabel.cpp (+110/-165)
dash/FilterExpanderLabel.h (+12/-14)
dash/FilterFactory.cpp (+3/-3)
dash/FilterGenreButton.cpp (+5/-3)
dash/FilterGenreButton.h (+1/-0)
dash/FilterGenreWidget.cpp (+59/-18)
dash/FilterGenreWidget.h (+3/-1)
dash/FilterMultiRangeButton.cpp (+41/-51)
dash/FilterMultiRangeButton.h (+5/-4)
dash/FilterMultiRangeWidget.cpp (+271/-29)
dash/FilterMultiRangeWidget.h (+26/-5)
dash/FilterRatingsButton.cpp (+32/-229)
dash/FilterRatingsButton.h (+8/-20)
dash/FilterRatingsWidget.cpp (+43/-16)
dash/FilterRatingsWidget.h (+5/-1)
dash/LensViewPrivate.cpp (+0/-48)
dash/LensViewPrivate.h (+0/-40)
dash/PlacesGroup.cpp (+327/-195)
dash/PlacesGroup.h (+51/-32)
dash/PreviewStateMachine.cpp (+11/-13)
dash/PreviewStateMachine.h (+2/-2)
dash/ResultRenderer.cpp (+102/-13)
dash/ResultRenderer.h (+18/-13)
dash/ResultRendererHorizontalTile.cpp (+168/-104)
dash/ResultRendererHorizontalTile.h (+10/-10)
dash/ResultRendererTile.cpp (+234/-134)
dash/ResultRendererTile.h (+24/-25)
dash/ResultView.cpp (+198/-73)
dash/ResultView.h (+59/-19)
dash/ResultViewGrid.cpp (+491/-321)
dash/ResultViewGrid.h (+29/-13)
dash/ScopeBar.cpp (+129/-198)
dash/ScopeBar.h (+23/-30)
dash/ScopeBarIcon.cpp (+63/-52)
dash/ScopeBarIcon.h (+10/-8)
dash/ScopeView.cpp (+931/-494)
dash/ScopeView.h (+109/-46)
dash/StandaloneDash.cpp (+54/-29)
dash/pch/dash_pch.hh (+29/-0)
dash/previews/ActionButton.cpp (+56/-34)
dash/previews/ActionButton.h (+8/-4)
dash/previews/ActionLink.cpp (+260/-0)
dash/previews/ActionLink.h (+100/-0)
dash/previews/ApplicationPreview.cpp (+184/-109)
dash/previews/ApplicationPreview.h (+15/-25)
dash/previews/CMakeLists.txt (+32/-27)
dash/previews/DBusTestRunner.h (+3/-7)
dash/previews/ErrorPreview.cpp (+308/-0)
dash/previews/ErrorPreview.h (+126/-0)
dash/previews/GenericPreview.cpp (+104/-83)
dash/previews/GenericPreview.h (+11/-26)
dash/previews/LensDBusTestRunner.h (+22/-25)
dash/previews/MoviePreview.cpp (+104/-79)
dash/previews/MoviePreview.h (+9/-23)
dash/previews/MusicPaymentPreview.cpp (+528/-0)
dash/previews/MusicPaymentPreview.h (+135/-0)
dash/previews/MusicPreview.cpp (+183/-109)
dash/previews/MusicPreview.h (+16/-25)
dash/previews/PaymentPreview.cpp (+404/-0)
dash/previews/PaymentPreview.h (+135/-0)
dash/previews/Preview.cpp (+112/-166)
dash/previews/Preview.h (+41/-8)
dash/previews/PreviewContainer.cpp (+145/-79)
dash/previews/PreviewContainer.h (+15/-7)
dash/previews/PreviewInfoHintWidget.cpp (+83/-82)
dash/previews/PreviewInfoHintWidget.h (+18/-11)
dash/previews/PreviewNavigator.cpp (+32/-19)
dash/previews/PreviewNavigator.h (+9/-5)
dash/previews/PreviewRatingsWidget.cpp (+42/-16)
dash/previews/PreviewRatingsWidget.h (+14/-4)
dash/previews/SocialPreview.cpp (+159/-108)
dash/previews/SocialPreview.h (+15/-22)
dash/previews/SocialPreviewComments.cpp (+34/-35)
dash/previews/SocialPreviewComments.h (+7/-6)
dash/previews/SocialPreviewContent.cpp (+76/-70)
dash/previews/SocialPreviewContent.h (+14/-6)
dash/previews/StandaloneApplicationPreview.cpp (+38/-17)
dash/previews/StandaloneErrorPreview.cpp (+236/-0)
dash/previews/StandaloneMoviePreview.cpp (+20/-4)
dash/previews/StandaloneMusicPaymentPreview.cpp (+238/-0)
dash/previews/StandaloneMusicPreview.cpp (+8/-10)
dash/previews/StandaloneSocialPreview.cpp (+24/-9)
dash/previews/TabIterator.cpp (+172/-0)
dash/previews/TabIterator.h (+99/-0)
dash/previews/Track.cpp (+102/-67)
dash/previews/Track.h (+20/-12)
dash/previews/Tracks.cpp (+40/-22)
dash/previews/Tracks.h (+10/-12)
dash/previews/pch/previews_pch.hh (+28/-0)
data/CMakeLists.txt (+1/-0)
data/pam/CMakeLists.txt (+1/-0)
data/pam/unity (+2/-0)
debian/changelog (+3685/-0)
debian/control (+99/-65)
debian/libunity-core-6.0-9.install (+8/-0)
debian/libunity-core-6.0-9.links (+1/-0)
debian/libunity-core-6.0-9.lintian-overrides (+1/-1)
debian/rules (+24/-14)
debian/scopes-recommends-generator (+27/-0)
debian/unity-common.install (+0/-8)
debian/unity-schemas.install (+1/-0)
debian/unity-services.install (+1/-1)
debian/unity.install (+1/-0)
debian/unity.migrations (+2/-0)
debian/unity7.conf (+22/-0)
debian/watch (+2/-1)
decorations/CMakeLists.txt (+43/-0)
decorations/DecoratedWindow.cpp (+950/-0)
decorations/DecoratedWindow.h (+76/-0)
decorations/DecorationsDataPool.cpp (+215/-0)
decorations/DecorationsDataPool.h (+65/-0)
decorations/DecorationsEdge.cpp (+142/-0)
decorations/DecorationsEdge.h (+66/-0)
decorations/DecorationsEdgeBorders.cpp (+118/-0)
decorations/DecorationsEdgeBorders.h (+46/-0)
decorations/DecorationsForceQuitDialog.cpp (+492/-0)
decorations/DecorationsForceQuitDialog.h (+53/-0)
decorations/DecorationsGrabEdge.cpp (+178/-0)
decorations/DecorationsGrabEdge.h (+60/-0)
decorations/DecorationsInputMixer.cpp (+197/-0)
decorations/DecorationsInputMixer.h (+70/-0)
decorations/DecorationsManager.cpp (+459/-0)
decorations/DecorationsManager.h (+75/-0)
decorations/DecorationsMenuDropdown.cpp (+149/-0)
decorations/DecorationsMenuDropdown.h (+61/-0)
decorations/DecorationsMenuEntry.cpp (+207/-0)
decorations/DecorationsMenuEntry.h (+76/-0)
decorations/DecorationsMenuLayout.cpp (+264/-0)
decorations/DecorationsMenuLayout.h (+67/-0)
decorations/DecorationsPriv.h (+210/-0)
decorations/DecorationsSlidingLayout.cpp (+167/-0)
decorations/DecorationsSlidingLayout.h (+59/-0)
decorations/DecorationsTitle.cpp (+135/-0)
decorations/DecorationsTitle.h (+59/-0)
decorations/DecorationsWidgets.cpp (+525/-0)
decorations/DecorationsWidgets.h (+202/-0)
decorations/DecorationsWindowButton.cpp (+220/-0)
decorations/DecorationsWindowButton.h (+58/-0)
decorations/glow_texture.h (+204/-0)
decorations/pch/decorations_pch.hh (+39/-0)
doc/unity.1 (+35/-10)
hud/CMakeLists.txt (+9/-21)
hud/HudAbstractView.h (+3/-1)
hud/HudButton.cpp (+55/-52)
hud/HudButton.h (+7/-6)
hud/HudController.cpp (+167/-153)
hud/HudController.h (+24/-16)
hud/HudIcon.cpp (+4/-9)
hud/HudIconTextureSource.cpp (+1/-10)
hud/HudIconTextureSource.h (+1/-2)
hud/HudView.cpp (+132/-88)
hud/HudView.h (+10/-5)
hud/StandaloneHud.cpp (+35/-24)
hud/pch/hud_pch.hh (+31/-0)
launcher/AbstractLauncherIcon.cpp (+5/-1)
launcher/AbstractLauncherIcon.h (+61/-45)
launcher/ApplicationLauncherIcon.cpp (+956/-980)
launcher/ApplicationLauncherIcon.h (+53/-40)
launcher/BFBLauncherIcon.cpp (+36/-27)
launcher/BFBLauncherIcon.h (+4/-3)
launcher/CMakeLists.txt (+34/-30)
launcher/CairoBaseWindow.cpp (+46/-15)
launcher/CairoBaseWindow.h (+15/-6)
launcher/DNDCollectionWindow.cpp (+0/-97)
launcher/DNDCollectionWindow.h (+0/-63)
launcher/Decaymulator.h (+1/-1)
launcher/DeltaTracker.cpp (+80/-0)
launcher/DeltaTracker.h (+53/-0)
launcher/DesktopLauncherIcon.cpp (+17/-6)
launcher/DesktopLauncherIcon.h (+3/-1)
launcher/DeviceLauncherSection.cpp (+13/-11)
launcher/DeviceLauncherSection.h (+6/-5)
launcher/DeviceNotificationDisplayImp.cpp (+6/-2)
launcher/DevicesSettingsImp.cpp (+2/-4)
launcher/DndData.h (+4/-4)
launcher/EdgeBarrierController.cpp (+401/-138)
launcher/EdgeBarrierController.h (+23/-9)
launcher/EdgeBarrierControllerPrivate.h (+80/-0)
launcher/ExpoLauncherIcon.cpp (+55/-16)
launcher/ExpoLauncherIcon.h (+8/-1)
launcher/FavoriteStore.cpp (+1/-1)
launcher/FavoriteStoreGSettings.cpp (+2/-2)
launcher/HudLauncherIcon.cpp (+34/-22)
launcher/HudLauncherIcon.h (+4/-0)
launcher/Launcher.cpp (+1298/-1181)
launcher/Launcher.h (+151/-162)
launcher/LauncherController.cpp (+383/-294)
launcher/LauncherController.h (+7/-7)
launcher/LauncherControllerPrivate.h (+33/-31)
launcher/LauncherDragWindow.cpp (+46/-25)
launcher/LauncherDragWindow.h (+15/-8)
launcher/LauncherEntryRemote.cpp (+5/-9)
launcher/LauncherEntryRemote.h (+4/-4)
launcher/LauncherEntryRemoteModel.cpp (+1/-5)
launcher/LauncherEntryRemoteModel.h (+2/-2)
launcher/LauncherHideMachine.cpp (+7/-9)
launcher/LauncherHideMachine.h (+2/-2)
launcher/LauncherHoverMachine.cpp (+5/-7)
launcher/LauncherHoverMachine.h (+4/-5)
launcher/LauncherIcon.cpp (+574/-494)
launcher/LauncherIcon.h (+97/-79)
launcher/LauncherModel.cpp (+12/-8)
launcher/LauncherModel.h (+3/-4)
launcher/LauncherOptions.cpp (+30/-17)
launcher/LauncherOptions.h (+9/-2)
launcher/MockLauncherIcon.h (+126/-58)
launcher/PointerBarrier.cpp (+102/-88)
launcher/PointerBarrier.h (+26/-8)
launcher/QuicklistManager.cpp (+20/-24)
launcher/QuicklistManager.h (+16/-8)
launcher/QuicklistMenuItem.cpp (+115/-41)
launcher/QuicklistMenuItem.h (+23/-4)
launcher/QuicklistMenuItemCheckmark.cpp (+2/-7)
launcher/QuicklistMenuItemCheckmark.h (+1/-1)
launcher/QuicklistMenuItemLabel.cpp (+2/-7)
launcher/QuicklistMenuItemLabel.h (+1/-1)
launcher/QuicklistMenuItemRadio.cpp (+2/-7)
launcher/QuicklistMenuItemRadio.h (+1/-1)
launcher/QuicklistMenuItemSeparator.cpp (+19/-11)
launcher/QuicklistMenuItemSeparator.h (+2/-1)
launcher/QuicklistView.cpp (+206/-277)
launcher/QuicklistView.h (+22/-26)
launcher/SimpleLauncherIcon.cpp (+27/-83)
launcher/SimpleLauncherIcon.h (+5/-18)
launcher/SingleMonitorLauncherIcon.cpp (+6/-14)
launcher/SingleMonitorLauncherIcon.h (+3/-4)
launcher/SoftwareCenterLauncherIcon.cpp (+171/-65)
launcher/SoftwareCenterLauncherIcon.h (+14/-16)
launcher/SpacerLauncherIcon.cpp (+1/-2)
launcher/StandaloneLauncher.cpp (+71/-30)
launcher/StandaloneSwitcher.cpp (+69/-65)
launcher/SwitcherController.cpp (+502/-279)
launcher/SwitcherController.h (+75/-76)
launcher/SwitcherControllerImpl.h (+113/-0)
launcher/SwitcherModel.cpp (+240/-143)
launcher/SwitcherModel.h (+58/-38)
launcher/SwitcherView.cpp (+651/-204)
launcher/SwitcherView.h (+90/-49)
launcher/Tooltip.cpp (+145/-154)
launcher/Tooltip.h (+18/-14)
launcher/TooltipManager.cpp (+102/-0)
launcher/TooltipManager.h (+56/-0)
launcher/TrashLauncherIcon.cpp (+44/-52)
launcher/TrashLauncherIcon.h (+7/-8)
launcher/Volume.h (+14/-5)
launcher/VolumeImp.cpp (+50/-85)
launcher/VolumeImp.h (+4/-6)
launcher/VolumeLauncherIcon.cpp (+133/-44)
launcher/VolumeLauncherIcon.h (+12/-5)
launcher/XdndCollectionWindow.h (+52/-0)
launcher/XdndCollectionWindowImp.cpp (+130/-0)
launcher/XdndCollectionWindowImp.h (+45/-0)
launcher/XdndManager.h (+45/-0)
launcher/XdndManagerImp.cpp (+107/-0)
launcher/XdndManagerImp.h (+57/-0)
launcher/XdndStartStopNotifier.cpp (+27/-0)
launcher/XdndStartStopNotifier.h (+41/-0)
launcher/XdndStartStopNotifierImp.cpp (+77/-0)
launcher/XdndStartStopNotifierImp.h (+47/-0)
launcher/pch/launcher_pch.hh (+33/-0)
lockscreen/BackgroundSettings.cpp (+155/-0)
lockscreen/BackgroundSettings.h (+54/-0)
lockscreen/CMakeLists.txt (+39/-0)
lockscreen/CofView.cpp (+54/-0)
lockscreen/CofView.h (+44/-0)
lockscreen/LockScreenAbstractShield.h (+79/-0)
lockscreen/LockScreenAcceleratorController.cpp (+190/-0)
lockscreen/LockScreenAcceleratorController.h (+47/-0)
lockscreen/LockScreenAccelerators.cpp (+528/-0)
lockscreen/LockScreenAccelerators.h (+94/-0)
lockscreen/LockScreenController.cpp (+526/-0)
lockscreen/LockScreenController.h (+114/-0)
lockscreen/LockScreenPanel.cpp (+260/-0)
lockscreen/LockScreenPanel.h (+77/-0)
lockscreen/LockScreenSettings.cpp (+142/-0)
lockscreen/LockScreenSettings.h (+62/-0)
lockscreen/LockScreenShield.cpp (+289/-0)
lockscreen/LockScreenShield.h (+79/-0)
lockscreen/LockScreenShieldFactory.cpp (+39/-0)
lockscreen/LockScreenShieldFactory.h (+61/-0)
lockscreen/ScreenSaverDBusManager.cpp (+149/-0)
lockscreen/ScreenSaverDBusManager.h (+58/-0)
lockscreen/ScreenSaverDBusManagerImpl.h (+50/-0)
lockscreen/ShutdownNotifier.cpp (+152/-0)
lockscreen/ShutdownNotifier.h (+51/-0)
lockscreen/SuspendNotifier.cpp (+153/-0)
lockscreen/SuspendNotifier.h (+51/-0)
lockscreen/UserAuthenticator.h (+56/-0)
lockscreen/UserAuthenticatorPam.cpp (+176/-0)
lockscreen/UserAuthenticatorPam.h (+66/-0)
lockscreen/UserPromptView.cpp (+383/-0)
lockscreen/UserPromptView.h (+85/-0)
lockscreen/pch/lockscreen_pch.hh (+32/-0)
manual-tests/Dash.txt (+2/-2)
manual-tests/MultiMonitor.txt (+16/-0)
manual-tests/Panel.txt (+14/-0)
manual-tests/PanelService.txt (+17/-0)
manual-tests/Preview.txt (+33/-0)
manual-tests/WindowManagement.txt (+2/-2)
panel/CMakeLists.txt (+12/-23)
panel/PanelController.cpp (+156/-270)
panel/PanelController.h (+15/-13)
panel/PanelIndicatorEntryDropdownView.cpp (+172/-0)
panel/PanelIndicatorEntryDropdownView.h (+66/-0)
panel/PanelIndicatorEntryView.cpp (+233/-264)
panel/PanelIndicatorEntryView.h (+27/-20)
panel/PanelIndicatorsView.cpp (+242/-185)
panel/PanelIndicatorsView.h (+32/-21)
panel/PanelMenuView.cpp (+1239/-1122)
panel/PanelMenuView.h (+111/-94)
panel/PanelTitlebarGrabAreaView.cpp (+27/-26)
panel/PanelTitlebarGrabAreaView.h (+5/-4)
panel/PanelTray.cpp (+23/-45)
panel/PanelTray.h (+6/-4)
panel/PanelView.cpp (+487/-473)
panel/PanelView.h (+74/-58)
panel/StandalonePanel.cpp (+79/-21)
panel/pch/panel_pch.hh (+31/-0)
plugins/networkarearegion/CMakeLists.txt (+11/-0)
plugins/networkarearegion/networkarearegion.xml.in (+1/-0)
plugins/unity-mt-grab-handles/CMakeLists.txt (+12/-1)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.cpp (+1/-1)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.h (+4/-6)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp (+2/-2)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.h (+3/-5)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-window.h (+1/-1)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.cpp (+3/-3)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.h (+6/-8)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+9/-8)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h (+6/-8)
plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp (+2/-2)
plugins/unity-mt-grab-handles/src/unity-mt-texture.h (+3/-4)
plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in (+1/-4)
plugins/unitydialog/CMakeLists.txt (+0/-6)
plugins/unitydialog/src/unitydialog.cpp (+0/-1535)
plugins/unitydialog/src/unitydialog.h (+0/-367)
plugins/unitydialog/unitydialog.xml.in (+0/-38)
plugins/unityshell/CMakeLists.txt (+43/-8)
plugins/unityshell/resources/flow-view.svg (+0/-16)
plugins/unityshell/resources/grid-view.svg (+0/-21)
plugins/unityshell/src/AggregateMonitor.cpp (+0/-63)
plugins/unityshell/src/AggregateMonitor.h (+0/-50)
plugins/unityshell/src/CompoundGestureRecognizer.cpp (+1/-4)
plugins/unityshell/src/ElapsedTimeMonitor.h (+0/-47)
plugins/unityshell/src/GesturalWindowSwitcher.cpp (+23/-29)
plugins/unityshell/src/GesturalWindowSwitcher.h (+2/-2)
plugins/unityshell/src/Monitor.h (+2/-0)
plugins/unityshell/src/MultiMonitor.h (+7/-1)
plugins/unityshell/src/ScreenIntrospection.h (+1/-1)
plugins/unityshell/src/StartupNotifyService.cpp (+0/-71)
plugins/unityshell/src/StartupNotifyService.h (+0/-54)
plugins/unityshell/src/UnityGestureBroker.cpp (+1/-1)
plugins/unityshell/src/UnityGestureTarget.cpp (+6/-4)
plugins/unityshell/src/UnityGestureTarget.h (+1/-0)
plugins/unityshell/src/UnityShowdesktopHandler.cpp (+7/-6)
plugins/unityshell/src/UnityshellPrivate.cpp (+2/-2)
plugins/unityshell/src/UnityshellPrivate.h (+4/-3)
plugins/unityshell/src/WindowGestureTarget.cpp (+4/-5)
plugins/unityshell/src/WindowGestureTarget.h (+2/-1)
plugins/unityshell/src/WindowMinimizeSpeedController.cpp (+5/-7)
plugins/unityshell/src/XPathQueryPart.cpp (+0/-189)
plugins/unityshell/src/XPathQueryPart.h (+0/-45)
plugins/unityshell/src/inputremover.cpp (+359/-120)
plugins/unityshell/src/inputremover.h (+33/-4)
plugins/unityshell/src/minimizedwindowhandler.cpp (+1/-1)
plugins/unityshell/src/nux-area-accessible.cpp (+17/-5)
plugins/unityshell/src/nux-base-window-accessible.cpp (+1/-1)
plugins/unityshell/src/nux-layout-accessible.cpp (+7/-0)
plugins/unityshell/src/nux-text-entry-accessible.cpp (+8/-19)
plugins/unityshell/src/nux-view-accessible.cpp (+6/-0)
plugins/unityshell/src/unity-expander-view-accessible.cpp (+207/-0)
plugins/unityshell/src/unity-expander-view-accessible.h (+60/-0)
plugins/unityshell/src/unity-filter-basic-button-accessible.cpp (+282/-0)
plugins/unityshell/src/unity-filter-basic-button-accessible.h (+53/-0)
plugins/unityshell/src/unity-launcher-accessible.cpp (+13/-20)
plugins/unityshell/src/unity-launcher-icon-accessible.cpp (+60/-8)
plugins/unityshell/src/unity-panel-view-accessible.cpp (+1/-1)
plugins/unityshell/src/unity-places-group-accessible.cpp (+9/-9)
plugins/unityshell/src/unity-quicklist-menu-accessible.cpp (+1/-1)
plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp (+21/-7)
plugins/unityshell/src/unity-root-accessible.cpp (+6/-48)
plugins/unityshell/src/unity-rvgrid-accessible.cpp (+3/-3)
plugins/unityshell/src/unity-scope-bar-icon-accessible.cpp (+191/-0)
plugins/unityshell/src/unity-scope-bar-icon-accessible.h (+57/-0)
plugins/unityshell/src/unity-sctext-accessible.cpp (+6/-6)
plugins/unityshell/src/unity-search-bar-accessible.cpp (+1/-1)
plugins/unityshell/src/unity-session-button-accessible.cpp (+289/-0)
plugins/unityshell/src/unity-session-button-accessible.h (+56/-0)
plugins/unityshell/src/unity-switcher-accessible.cpp (+6/-12)
plugins/unityshell/src/unity-text-input-accessible.cpp (+90/-0)
plugins/unityshell/src/unity-text-input-accessible.h (+57/-0)
plugins/unityshell/src/unity-util-accessible.cpp (+45/-0)
plugins/unityshell/src/unity-util-accessible.h (+1/-0)
plugins/unityshell/src/unitya11y.cpp (+27/-1)
plugins/unityshell/src/unitya11ytests.cpp (+3/-3)
plugins/unityshell/src/unityshell.cpp (+2188/-1513)
plugins/unityshell/src/unityshell.h (+157/-52)
plugins/unityshell/src/unityshell_glow.cpp (+391/-0)
plugins/unityshell/src/unityshell_glow.h (+71/-0)
plugins/unityshell/unityshell.xml.in (+433/-287)
po/POTFILES.in (+20/-3)
po/POTFILES.skip (+9/-1)
po/ar.po (+276/-50)
po/bg.po (+276/-50)
po/cs.po (+276/-50)
po/da.po (+276/-50)
po/de.po (+276/-50)
po/el.po (+276/-50)
po/es.po (+276/-50)
po/fi.po (+276/-50)
po/fr.po (+276/-50)
po/he.po (+276/-50)
po/hi.po (+276/-50)
po/hr.po (+276/-50)
po/hu.po (+276/-50)
po/it.po (+276/-50)
po/ja.po (+276/-50)
po/ko.po (+276/-50)
po/nb.po (+276/-50)
po/nl.po (+276/-50)
po/pl.po (+276/-50)
po/pt.po (+276/-50)
po/pt_BR.po (+276/-50)
po/ro.po (+276/-50)
po/ru.po (+276/-50)
po/sk.po (+276/-50)
po/sl.po (+276/-50)
po/sr.po (+276/-50)
po/sv.po (+276/-50)
po/th.po (+276/-50)
po/tr.po (+276/-50)
po/unity.pot (+287/-78)
po/zh_CN.po (+276/-50)
po/zh_TW.po (+276/-50)
resources/close_dash.svg (+74/-0)
resources/close_dash_disabled.svg (+74/-0)
resources/close_dash_prelight.svg (+94/-0)
resources/close_dash_pressed.svg (+74/-0)
resources/launcher_arrow_ltr_19.svg (+105/-0)
resources/launcher_arrow_ltr_37.svg (+113/-0)
resources/launcher_arrow_outline_ltr_19.svg (+122/-0)
resources/launcher_arrow_outline_ltr_37.svg (+109/-0)
resources/launcher_arrow_outline_rtl_19.svg (+103/-0)
resources/launcher_arrow_outline_rtl_37.svg (+109/-0)
resources/launcher_arrow_rtl_19.svg (+105/-0)
resources/launcher_arrow_rtl_37.svg (+113/-0)
resources/launcher_icon_back_150.svg (+113/-0)
resources/launcher_icon_back_54.svg (+79/-0)
resources/launcher_icon_edge_150.svg (+249/-0)
resources/launcher_icon_edge_54.svg (+230/-0)
resources/launcher_icon_glow_200.svg (+132/-0)
resources/launcher_icon_glow_62.svg.save (+100/-0)
resources/launcher_icon_selected_back_150.svg (+79/-0)
resources/launcher_icon_selected_back_54.svg (+79/-0)
resources/launcher_icon_shadow_200.svg (+100/-0)
resources/launcher_icon_shadow_62.svg (+104/-0)
resources/launcher_icon_shine_150.svg (+101/-0)
resources/launcher_icon_shine_54.svg (+101/-0)
resources/launcher_pip_ltr_19.svg (+105/-0)
resources/launcher_pip_ltr_37.svg (+111/-0)
resources/launcher_pip_rtl_19.svg (+104/-0)
resources/launcher_pip_rtl_37.svg (+108/-0)
resources/lens-nav-app.svg (+83/-17)
resources/lens-nav-file.svg (+87/-8)
resources/lens-nav-gwibber.svg (+80/-12)
resources/lens-nav-home.svg (+84/-9)
resources/lens-nav-music.svg (+119/-11)
resources/lens-nav-people.svg (+97/-21)
resources/lens-nav-photo.svg (+105/-11)
resources/lens-nav-video.svg (+83/-13)
resources/maximize_dash.svg (+73/-0)
resources/maximize_dash_disabled.svg (+73/-0)
resources/maximize_dash_prelight.svg (+92/-0)
resources/maximize_dash_pressed.svg (+73/-0)
resources/minimize_dash.svg (+74/-0)
resources/minimize_dash_disabled.svg (+74/-0)
resources/minimize_dash_prelight.svg (+94/-0)
resources/minimize_dash_pressed.svg (+74/-0)
resources/progress_bar_fill.svg (+141/-0)
resources/progress_bar_trough.svg (+179/-0)
resources/search_magnify.svg (+155/-0)
resources/sheet_style_close_focused.svg (+177/-0)
resources/sheet_style_close_focused_prelight.svg (+177/-0)
resources/sheet_style_close_focused_pressed.svg (+168/-0)
resources/unmaximize_dash.svg (+74/-0)
resources/unmaximize_dash_disabled.svg (+74/-0)
resources/unmaximize_dash_prelight.svg (+94/-0)
resources/unmaximize_dash_pressed.svg (+74/-0)
services/CMakeLists.txt (+29/-26)
services/com.canonical.Unity.Panel.Service.service.cmake (+0/-3)
services/panel-indicator-entry-accessible.c (+1/-1)
services/panel-main.c (+142/-103)
services/panel-marshal.list (+0/-3)
services/panel-service-private.h (+60/-0)
services/panel-service.c (+1260/-472)
services/panel-service.h (+36/-35)
services/unity-panel-service-lockscreen.conf.in (+8/-0)
services/unity-panel-service.conf.in (+18/-0)
shortcuts/AbstractShortcutHint.h (+7/-7)
shortcuts/AbstractShortcutModeller.h (+46/-0)
shortcuts/CMakeLists.txt (+11/-21)
shortcuts/CompizShortcutModeller.cpp (+373/-0)
shortcuts/CompizShortcutModeller.h (+52/-0)
shortcuts/MockShortcutHint.h (+9/-9)
shortcuts/ShortcutController.cpp (+112/-90)
shortcuts/ShortcutController.h (+17/-16)
shortcuts/ShortcutHint.cpp (+7/-9)
shortcuts/ShortcutHintPrivate.cpp (+3/-4)
shortcuts/ShortcutModel.cpp (+12/-4)
shortcuts/ShortcutModel.h (+5/-4)
shortcuts/ShortcutView.cpp (+191/-155)
shortcuts/ShortcutView.h (+12/-18)
shortcuts/StandaloneShortcuts.cpp (+329/-208)
shortcuts/pch/shortcuts_pch.hh (+32/-0)
shutdown/CMakeLists.txt (+34/-0)
shutdown/SessionButton.cpp (+169/-0)
shutdown/SessionButton.h (+86/-0)
shutdown/SessionController.cpp (+221/-0)
shutdown/SessionController.h (+80/-0)
shutdown/SessionDBusManager.cpp (+212/-0)
shutdown/SessionDBusManager.h (+50/-0)
shutdown/SessionView.cpp (+400/-0)
shutdown/SessionView.h (+96/-0)
shutdown/StandaloneSession.cpp (+105/-0)
shutdown/pch/shutdown_pch.hh (+29/-0)
tests/CMakeLists.txt (+282/-252)
tests/MockCategories.h (+56/-0)
tests/MockResults.h (+44/-0)
tests/MockSwitcherController.h (+60/-0)
tests/MockWindowManager.cpp (+31/-0)
tests/MockWindowManager.h (+109/-0)
tests/autopilot/unity/emulators/X11.py (+117/-0)
tests/autopilot/unity/emulators/__init__.py (+42/-6)
tests/autopilot/unity/emulators/compiz.py (+63/-0)
tests/autopilot/unity/emulators/dash.py (+189/-188)
tests/autopilot/unity/emulators/hud.py (+32/-38)
tests/autopilot/unity/emulators/ibus.py (+113/-0)
tests/autopilot/unity/emulators/icons.py (+9/-12)
tests/autopilot/unity/emulators/launcher.py (+132/-111)
tests/autopilot/unity/emulators/panel.py (+49/-50)
tests/autopilot/unity/emulators/quicklist.py (+9/-12)
tests/autopilot/unity/emulators/screen.py (+38/-4)
tests/autopilot/unity/emulators/switcher.py (+113/-57)
tests/autopilot/unity/emulators/unity.py (+47/-3)
tests/autopilot/unity/emulators/window_manager.py (+11/-2)
tests/autopilot/unity/emulators/workspace.py (+15/-9)
tests/autopilot/unity/tests/__init__.py (+175/-82)
tests/autopilot/unity/tests/launcher/__init__.py (+13/-9)
tests/autopilot/unity/tests/launcher/test_capture.py (+13/-12)
tests/autopilot/unity/tests/launcher/test_icon_behavior.py (+240/-90)
tests/autopilot/unity/tests/launcher/test_keynav.py (+62/-38)
tests/autopilot/unity/tests/launcher/test_reveal.py (+14/-13)
tests/autopilot/unity/tests/launcher/test_scroll.py (+101/-0)
tests/autopilot/unity/tests/launcher/test_shortcut.py (+7/-1)
tests/autopilot/unity/tests/launcher/test_switcher.py (+20/-20)
tests/autopilot/unity/tests/launcher/test_tooltips.py (+93/-0)
tests/autopilot/unity/tests/launcher/test_visual.py (+30/-24)
tests/autopilot/unity/tests/test_command_lens.py (+42/-32)
tests/autopilot/unity/tests/test_dash.py (+689/-383)
tests/autopilot/unity/tests/test_gnome_key_grabber.py (+165/-0)
tests/autopilot/unity/tests/test_gobject_introspection.py (+66/-0)
tests/autopilot/unity/tests/test_home_lens.py (+12/-12)
tests/autopilot/unity/tests/test_hud.py (+387/-265)
tests/autopilot/unity/tests/test_ibus.py (+180/-148)
tests/autopilot/unity/tests/test_panel.py (+570/-422)
tests/autopilot/unity/tests/test_quicklist.py (+91/-64)
tests/autopilot/unity/tests/test_search.py (+196/-0)
tests/autopilot/unity/tests/test_shopping_lens.py (+0/-112)
tests/autopilot/unity/tests/test_shortcut_hint.py (+69/-50)
tests/autopilot/unity/tests/test_showdesktop.py (+44/-21)
tests/autopilot/unity/tests/test_spread.py (+173/-42)
tests/autopilot/unity/tests/test_switcher.py (+408/-134)
tests/autopilot/unity/tests/test_wm_keybindings.py (+166/-0)
tests/autopilot/unity/tests/xim/test_gcin.py (+7/-11)
tests/bamf-mock-application.c (+16/-2)
tests/bamf-mock-window.c (+239/-0)
tests/bamf-mock-window.h (+80/-0)
tests/data/applications/bzr-handle-patch.desktop (+1/-1)
tests/data/applications/kde4/afile.desktop (+37/-0)
tests/data/applications/no-icon.desktop (+1/-1)
tests/data/applications/ubuntu-software-center.desktop (+12/-1)
tests/data/applications/ubuntuone-installer.desktop (+1/-1)
tests/data/applications/update-manager.desktop (+7/-1)
tests/data/external.gschema.xml (+145/-0)
tests/data/icons/go-down-symbolic.svg (+17/-0)
tests/data/unity/scopes/commands.scope (+8/-0)
tests/data/unity/scopes/testscope1.scope (+13/-0)
tests/data/unity/scopes/testscope2.scope (+13/-0)
tests/data/unity/scopes/testscope3.scope (+13/-0)
tests/data/unity/scopes/testscope4.scope (+13/-0)
tests/decoration_mock_item.h (+88/-0)
tests/dummy-xorg-test-runner.sh (+87/-0)
tests/gmockvolume.c (+6/-6)
tests/logger_helper.cpp (+100/-0)
tests/logger_helper.h (+50/-0)
tests/mock-application.cpp (+32/-0)
tests/mock-application.h (+393/-0)
tests/mock-base-window.h (+54/-0)
tests/mock_indicator_object.h (+160/-0)
tests/mock_indicators.h (+56/-0)
tests/mock_key_grabber.h (+51/-0)
tests/mock_menu_manager.h (+48/-0)
tests/mock_results.cpp (+43/-0)
tests/pch/test-gtest_pch.hh (+46/-0)
tests/test-gestures/CMakeLists.txt (+15/-30)
tests/test-gestures/GesturalWindowSwitcherMock.h (+1/-0)
tests/test-gestures/LockScreenControllerMock.h (+43/-0)
tests/test-gestures/PluginAdapterMock.cpp (+2/-2)
tests/test-gestures/PluginAdapterMock.h (+2/-1)
tests/test-gestures/SwitcherControllerMock.h (+5/-0)
tests/test-gestures/UnityGestureTargetMock.h (+1/-0)
tests/test-gestures/compiz_mock/core/window.h (+0/-2)
tests/test-gestures/modify_test_gestures_files.sh (+47/-0)
tests/test-gestures/sed_script_switcher (+3/-0)
tests/test-gestures/test_gestural_window_switcher.cpp (+1/-0)
tests/test-gestures/test_gesture_broker.cpp (+7/-12)
tests/test-gestures/test_window_gesture_target.cpp (+3/-0)
tests/test-gestures/unityshell_mock.h (+8/-1)
tests/test-get-transients/CMakeLists.txt (+0/-2)
tests/test-input-remover/CMakeLists.txt (+0/-2)
tests/test-input-remover/test-input-remover.cpp (+1/-1)
tests/test-minimize-window-handler/CMakeLists.txt (+0/-2)
tests/test-minimize-window-handler/test-minimize-handler.cpp (+13/-12)
tests/test_abstract_interface_generator.cpp (+176/-0)
tests/test_action_handle.cpp (+109/-0)
tests/test_action_link.cpp (+194/-0)
tests/test_animation_utils.cpp (+342/-0)
tests/test_animator.cpp (+0/-295)
tests/test_application_launcher_icon.cpp (+1290/-119)
tests/test_bamf_application.cpp (+81/-0)
tests/test_categories.cpp (+136/-29)
tests/test_connection_manager.cpp (+401/-0)
tests/test_dash_controller.cpp (+101/-0)
tests/test_dashview.cpp (+127/-0)
tests/test_dashview_impl.cpp (+12/-12)
tests/test_dbus_indicators.cpp (+7/-8)
tests/test_decorations_input_mixer.cpp (+508/-0)
tests/test_decorations_widgets.cpp (+542/-0)
tests/test_delta_tracker.cpp (+83/-0)
tests/test_desktop_application_subject.cpp (+283/-0)
tests/test_desktop_launcher_icon.cpp (+11/-11)
tests/test_desktop_utilities.cpp (+67/-55)
tests/test_device_launcher_section.cpp (+6/-4)
tests/test_edge_barrier_controller.cpp (+569/-170)
tests/test_em_converter.cpp (+88/-0)
tests/test_error_preview.cpp (+109/-0)
tests/test_expo_launcher_icon.cpp (+77/-11)
tests/test_favorite_store_gsettings.cpp (+2/-12)
tests/test_filesystem_lenses.cpp (+0/-107)
tests/test_filter.cpp (+67/-35)
tests/test_filter_multirange.h (+71/-0)
tests/test_filter_widgets.cpp (+185/-0)
tests/test_glib_cancellable.cpp (+120/-0)
tests/test_glib_dbus_object.cpp (+135/-0)
tests/test_glib_dbus_proxy.cpp (+380/-94)
tests/test_glib_dbus_server.cpp (+518/-0)
tests/test_glib_object.cpp (+31/-8)
tests/test_glib_signals.cpp (+3/-4)
tests/test_glib_signals_utils.cpp (+7/-15)
tests/test_glib_signals_utils_marshal.list (+0/-6)
tests/test_glib_source.cpp (+67/-38)
tests/test_glib_variant.cpp (+576/-20)
tests/test_gnome_session_manager.cpp (+1143/-0)
tests/test_grabhandle.cpp (+11/-13)
tests/test_gsettings_scopes.cpp (+230/-0)
tests/test_gtk_icon_info.cpp (+55/-0)
tests/test_home_lens.cpp (+0/-780)
tests/test_hud.cpp (+41/-92)
tests/test_hud_button.cpp (+3/-5)
tests/test_hud_controller.cpp (+96/-35)
tests/test_hud_launcher_icon.cpp (+1/-0)
tests/test_hud_view.cpp (+3/-2)
tests/test_icon_loader.cpp (+119/-164)
tests/test_im_text_entry.cpp (+73/-78)
tests/test_indicator.cpp (+119/-116)
tests/test_indicator_appmenu.cpp (+183/-25)
tests/test_indicator_entry.cpp (+294/-183)
tests/test_indicators.cpp (+104/-321)
tests/test_introspection.cpp (+0/-356)
tests/test_introspection_data.cpp (+318/-0)
tests/test_keyboard_util.cpp (+60/-58)
tests/test_launcher.cpp (+650/-128)
tests/test_launcher_controller.cpp (+643/-188)
tests/test_launcher_drag_window.cpp (+59/-17)
tests/test_launcher_entry_remote.cpp (+35/-34)
tests/test_launcher_hide_machine.cpp (+80/-0)
tests/test_launcher_hover_machine.cpp (+120/-0)
tests/test_launcher_icon.cpp (+406/-7)
tests/test_launcher_minimize_speed.cpp (+3/-14)
tests/test_launcher_model.cpp (+2/-2)
tests/test_launcher_options.cpp (+61/-0)
tests/test_launcher_tooltip.cpp (+113/-0)
tests/test_layout_system.cpp (+209/-0)
tests/test_lens.cpp (+0/-610)
tests/test_lensview_impl.cpp (+0/-125)
tests/test_lockscreen_controller.cpp (+262/-0)
tests/test_main.cpp (+19/-9)
tests/test_main_dbus.cpp (+59/-33)
tests/test_main_xless.cpp (+8/-1)
tests/test_mock_devices.h (+22/-7)
tests/test_mock_filemanager.h (+48/-0)
tests/test_mock_scope.h (+183/-0)
tests/test_mock_session_manager.h (+55/-0)
tests/test_model.cpp (+20/-34)
tests/test_model_iterator.cpp (+109/-17)
tests/test_overlay_scrollbar.cpp (+478/-0)
tests/test_panel_controller.cpp (+188/-0)
tests/test_panel_indicator_entry_dropdown_view.cpp (+336/-0)
tests/test_panel_indicators_view.cpp (+105/-0)
tests/test_panel_menu_view.cpp (+0/-174)
tests/test_panel_service.cpp (+556/-0)
tests/test_panel_style.cpp (+18/-10)
tests/test_panel_tray.cpp (+65/-0)
tests/test_panel_view.cpp (+140/-0)
tests/test_places_group.cpp (+41/-23)
tests/test_pointer_barrier.cpp (+121/-59)
tests/test_preview_player.cpp (+230/-0)
tests/test_previews.cpp (+7/-48)
tests/test_previews_application.cpp (+2/-4)
tests/test_previews_generic.cpp (+2/-4)
tests/test_previews_movie.cpp (+17/-6)
tests/test_previews_music.cpp (+2/-4)
tests/test_previews_music_payment.cpp (+150/-0)
tests/test_previews_payment.cpp (+183/-0)
tests/test_previews_social.cpp (+2/-5)
tests/test_quicklist_manager.cpp (+66/-0)
tests/test_quicklist_menu_item.cpp (+54/-4)
tests/test_raw_pixel.cpp (+79/-0)
tests/test_result_renderer.cpp (+99/-0)
tests/test_results.cpp (+188/-27)
tests/test_resultviewgrid.cpp (+18/-3)
tests/test_scope.cpp (+296/-0)
tests/test_scope_bar.cpp (+129/-0)
tests/test_scope_data.cpp (+67/-0)
tests/test_scope_filter.cpp (+336/-0)
tests/test_scope_impl.c (+78/-0)
tests/test_scope_impl.h (+36/-0)
tests/test_scope_proxy.cpp (+293/-0)
tests/test_scope_view.cpp (+287/-0)
tests/test_screensaver_dbus_manager.cpp (+206/-0)
tests/test_searchbar.cpp (+61/-0)
tests/test_service_gdbus_wrapper.cpp (+93/-183)
tests/test_service_gdbus_wrapper.h (+21/-41)
tests/test_service_hud.cpp (+57/-195)
tests/test_service_hud.h (+24/-41)
tests/test_service_lens.c (+0/-213)
tests/test_service_lens.h (+24/-42)
tests/test_service_main.cpp (+59/-81)
tests/test_service_model.cpp (+236/-96)
tests/test_service_model.h (+36/-42)
tests/test_service_panel.cpp (+104/-223)
tests/test_service_panel.h (+23/-41)
tests/test_service_scope.cpp (+262/-0)
tests/test_service_scope.h (+49/-0)
tests/test_session_button.cpp (+174/-0)
tests/test_session_controller.cpp (+190/-0)
tests/test_session_view.cpp (+317/-0)
tests/test_shortcut_controller.cpp (+182/-9)
tests/test_shortcut_model.cpp (+52/-27)
tests/test_shortcut_modeller_compiz.cpp (+132/-0)
tests/test_shortcut_view.cpp (+204/-0)
tests/test_showdesktop_handler.cpp (+2/-1)
tests/test_single_monitor_launcher_icon.cpp (+7/-4)
tests/test_software_center_launcher_icon.cpp (+258/-30)
tests/test_spread_filter.cpp (+115/-0)
tests/test_standalone_wm.h (+60/-0)
tests/test_static_cairo_text.cpp (+136/-0)
tests/test_switcher_controller.cpp (+277/-163)
tests/test_switcher_controller.h (+102/-0)
tests/test_switcher_controller_class.cpp (+96/-0)
tests/test_switcher_controller_slow.cpp (+115/-0)
tests/test_switcher_model.cpp (+276/-72)
tests/test_switcher_view.cpp (+224/-0)
tests/test_tabiterator.cpp (+401/-0)
tests/test_text_input.cpp (+117/-0)
tests/test_texture_cache.cpp (+19/-4)
tests/test_thumbnail_generator.cpp (+50/-103)
tests/test_time_util.cpp (+36/-0)
tests/test_tooltip_manager.cpp (+93/-0)
tests/test_tracks.cpp (+125/-0)
tests/test_trash_launcher_icon.cpp (+116/-2)
tests/test_ubus.cpp (+330/-0)
tests/test_unity_settings.cpp (+31/-38)
tests/test_unity_window_style.cpp (+43/-0)
tests/test_unity_window_view.cpp (+243/-0)
tests/test_unityshell_private.cpp (+69/-1)
tests/test_upstart_wrapper.cpp (+90/-0)
tests/test_uscreen_mock.h (+20/-11)
tests/test_user_authenticator_pam.cpp (+68/-0)
tests/test_utils.h (+86/-60)
tests/test_volume_imp.cpp (+33/-61)
tests/test_volume_launcher_icon.cpp (+191/-122)
tests/test_window_buttons.cpp (+197/-0)
tests/test_xdnd_manager_imp.cpp (+142/-0)
tests/test_xdnd_start_stop_notifier_imp.cpp (+107/-0)
tests/unit/TestMain.cpp (+0/-84)
tests/unit/TestPanelService.cpp (+0/-407)
tests/unit/TestStaticCairoText.cpp (+0/-106)
tests/unit/TestThreadHelper.h (+0/-23)
tests/unit/TestUBus.cpp (+0/-157)
tools/apply_unity_formatting.sh (+0/-2)
tools/migration-scripts/01_unity_change_dconf_path (+1/-1)
tools/migration-scripts/02_unity_setup_text_scale_factor (+41/-0)
tools/migration-scripts/03_unity_first_run_stamp_move (+38/-0)
tools/unity.cmake (+28/-8)
unity-shared/AbstractIconRenderer.h (+49/-10)
unity-shared/AbstractInterfaceGenerator.h (+119/-0)
unity-shared/AbstractSeparator.cpp (+0/-68)
unity-shared/AbstractSeparator.h (+0/-49)
unity-shared/AnimationUtils-inl.h (+72/-0)
unity-shared/AnimationUtils.h (+121/-0)
unity-shared/Animator.cpp (+0/-135)
unity-shared/Animator.h (+0/-64)
unity-shared/ApplicationManager.cpp (+66/-0)
unity-shared/ApplicationManager.h (+239/-0)
unity-shared/BGHash.cpp (+62/-69)
unity-shared/BGHash.h (+4/-9)
unity-shared/BackgroundEffectHelper.cpp (+190/-89)
unity-shared/BackgroundEffectHelper.h (+30/-19)
unity-shared/BamfApplicationManager.cpp (+784/-0)
unity-shared/BamfApplicationManager.h (+190/-0)
unity-shared/BamfApplicationManagerFactory.cpp (+31/-0)
unity-shared/CMakeLists.txt (+88/-30)
unity-shared/CompizUtils.cpp (+244/-0)
unity-shared/CompizUtils.h (+154/-0)
unity-shared/CoverArt.cpp (+77/-69)
unity-shared/CoverArt.h (+9/-5)
unity-shared/DashStyle.cpp (+515/-470)
unity-shared/DashStyle.h (+90/-93)
unity-shared/DashStyleInterface.h (+13/-8)
unity-shared/DebugDBusInterface.cpp (+305/-268)
unity-shared/DebugDBusInterface.h (+9/-31)
unity-shared/DecorationStyle.cpp (+856/-0)
unity-shared/DecorationStyle.h (+173/-0)
unity-shared/DefaultThumbnailProvider.cpp (+1/-0)
unity-shared/DeltaRestrainment-Inl.h (+44/-0)
unity-shared/DeltaRestrainment.cpp (+39/-0)
unity-shared/DesktopApplicationManager.cpp (+210/-0)
unity-shared/DesktopApplicationManager.h (+57/-0)
unity-shared/EMConverter.cpp (+116/-0)
unity-shared/EMConverter.h (+62/-0)
unity-shared/ExpanderView.cpp (+59/-0)
unity-shared/ExpanderView.h (+47/-0)
unity-shared/FakeKeyboardUtil.cpp (+36/-0)
unity-shared/FileManager.h (+30/-13)
unity-shared/GnomeFileManager.cpp (+252/-12)
unity-shared/GnomeFileManager.h (+28/-9)
unity-shared/GnomeKeyGrabber.cpp (+369/-0)
unity-shared/GnomeKeyGrabber.h (+53/-0)
unity-shared/GnomeKeyGrabberImpl.h (+75/-0)
unity-shared/GraphicsUtils.cpp (+88/-0)
unity-shared/GraphicsUtils.h (+38/-0)
unity-shared/GtkTexture.h (+64/-0)
unity-shared/IMTextEntry.cpp (+10/-2)
unity-shared/IMTextEntry.h (+3/-0)
unity-shared/IconLoader.cpp (+185/-160)
unity-shared/IconLoader.h (+8/-21)
unity-shared/IconRenderer.cpp (+414/-371)
unity-shared/IconRenderer.h (+12/-17)
unity-shared/IconTexture.cpp (+72/-32)
unity-shared/IconTexture.h (+18/-6)
unity-shared/IconTextureSource.cpp (+93/-9)
unity-shared/IconTextureSource.h (+30/-6)
unity-shared/Introspectable.cpp (+63/-67)
unity-shared/Introspectable.h (+8/-13)
unity-shared/IntrospectableWrappers.cpp (+26/-21)
unity-shared/IntrospectableWrappers.h (+4/-1)
unity-shared/IntrospectionData.cpp (+233/-0)
unity-shared/IntrospectionData.h (+96/-0)
unity-shared/JSONParser.cpp (+4/-21)
unity-shared/KeyGrabber.h (+45/-0)
unity-shared/KeyboardUtil.h (+35/-0)
unity-shared/LayoutSystem.cpp (+117/-68)
unity-shared/LayoutSystem.h (+32/-26)
unity-shared/LineSeparator.cpp (+32/-18)
unity-shared/LineSeparator.h (+15/-8)
unity-shared/MenuManager.cpp (+282/-0)
unity-shared/MenuManager.h (+86/-0)
unity-shared/MockableBaseWindow.h (+68/-0)
unity-shared/NuxObjectPtrHash.h (+36/-0)
unity-shared/OverlayRenderer.cpp (+348/-354)
unity-shared/OverlayRenderer.h (+12/-5)
unity-shared/OverlayScrollView.cpp (+60/-0)
unity-shared/OverlayScrollView.h (+45/-0)
unity-shared/OverlayWindowButtons.cpp (+119/-0)
unity-shared/OverlayWindowButtons.h (+59/-0)
unity-shared/PanelStyle.cpp (+210/-299)
unity-shared/PanelStyle.h (+32/-42)
unity-shared/PlacesOverlayVScrollBar.cpp (+468/-0)
unity-shared/PlacesOverlayVScrollBar.h (+118/-0)
unity-shared/PlacesVScrollBar.cpp (+67/-56)
unity-shared/PlacesVScrollBar.h (+7/-9)
unity-shared/PluginAdapter.cpp (+640/-552)
unity-shared/PluginAdapter.h (+82/-66)
unity-shared/PreviewStyle.cpp (+225/-125)
unity-shared/PreviewStyle.h (+70/-41)
unity-shared/RatingsButton.cpp (+24/-25)
unity-shared/RatingsButton.h (+6/-5)
unity-shared/RawPixel.cpp (+55/-0)
unity-shared/RawPixel.h (+48/-0)
unity-shared/ResizingBaseWindow.cpp (+45/-0)
unity-shared/ResizingBaseWindow.h (+40/-20)
unity-shared/SearchBar.cpp (+257/-270)
unity-shared/SearchBar.h (+24/-24)
unity-shared/SearchBarSpinner.cpp (+107/-77)
unity-shared/SearchBarSpinner.h (+21/-16)
unity-shared/SpreadFilter.cpp (+168/-0)
unity-shared/SpreadFilter.h (+68/-0)
unity-shared/StandaloneAppManager.cpp (+324/-0)
unity-shared/StandaloneDecorationStyle.cpp (+180/-0)
unity-shared/StandaloneWindowManager.cpp (+728/-456)
unity-shared/StandaloneWindowManager.h (+204/-0)
unity-shared/StaticCairoText.cpp (+382/-151)
unity-shared/StaticCairoText.h (+36/-11)
unity-shared/TextInput.cpp (+545/-0)
unity-shared/TextInput.h (+133/-0)
unity-shared/TextureCache.cpp (+33/-27)
unity-shared/TextureCache.h (+10/-7)
unity-shared/TextureThumbnailProvider.cpp (+1/-0)
unity-shared/ThumbnailGenerator.cpp (+41/-62)
unity-shared/ThumbnailGenerator.h (+8/-9)
unity-shared/TimeUtil.h (+60/-2)
unity-shared/Timer.h (+0/-1)
unity-shared/UBusMessages.h (+4/-36)
unity-shared/UBusServer.cpp (+115/-0)
unity-shared/UBusServer.h (+71/-0)
unity-shared/UBusWrapper.cpp (+41/-49)
unity-shared/UBusWrapper.h (+16/-23)
unity-shared/UScreen.cpp (+73/-26)
unity-shared/UScreen.h (+13/-8)
unity-shared/UnitySettings.cpp (+326/-30)
unity-shared/UnitySettings.h (+15/-2)
unity-shared/UnityWindowStyle.cpp (+146/-41)
unity-shared/UnityWindowStyle.h (+41/-17)
unity-shared/UnityWindowView.cpp (+273/-67)
unity-shared/UnityWindowView.h (+31/-9)
unity-shared/UpstartWrapper.cpp (+74/-0)
unity-shared/UpstartWrapper.h (+53/-0)
unity-shared/UserThumbnailProvider.cpp (+1/-0)
unity-shared/VScrollBarOverlayWindow.cpp (+568/-0)
unity-shared/VScrollBarOverlayWindow.h (+114/-0)
unity-shared/WindowButtonPriv.h (+92/-0)
unity-shared/WindowButtons.cpp (+416/-520)
unity-shared/WindowButtons.h (+16/-19)
unity-shared/WindowManager.cpp (+42/-0)
unity-shared/WindowManager.h (+221/-0)
unity-shared/XKeyboardUtil.cpp (+64/-25)
unity-shared/XKeyboardUtil.h (+15/-40)
unity-shared/XWindowManager.cpp (+189/-290)
unity-shared/XWindowManager.h (+23/-135)
unity-shared/pch/unity-shared_pch.hh (+33/-0)
unity-shared/ubus-server.cpp (+0/-397)
unity-shared/ubus-server.h (+0/-80)
unity-standalone/CMakeLists.txt (+13/-27)
unity-standalone/StandaloneUnity.cpp (+35/-16)
Text conflict in dash/previews/PreviewContainer.cpp
Text conflict in debian/changelog
Text conflict in launcher/Launcher.cpp
Text conflict in launcher/SwitcherView.cpp
Contents conflict in plugins/unityshell/src/ElapsedTimeMonitor.cpp
Text conflict in tests/CMakeLists.txt
Text conflict in tests/autopilot/unity/tests/launcher/test_keynav.py
Text conflict in tests/test_glib_source.cpp
Conflict adding file tests/test_time_util.cpp.  Moved existing file to tests/test_time_util.cpp.moved.
Text conflict in unity-shared/TimeUtil.h
To merge this branch: bzr merge lp://qastaging/~sethj/ubuntu/wily/unity/fix-for-1445595
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+276072@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Seth Johnson (sethj) wrote :

So... that didn't seem to work out properly. I changed 1 line, dunno how 1082 files got modified. Must have started with an old source maybe?

Unmerged revisions

4028. By Seth Johnson

Don't open nautilus when the user empties the trash from the launcher
(LP: #1445595)

4027. By CI Train Bot Account

Releasing 7.3.2+15.10.20151016-0ubuntu1

4026. By Andrea Azzarone

Avoid test failures on jenkins.
Approved by: Marco Trevisan (Treviño)

4025. By CI Train Bot Account

UnityScreen: close the session dialog in case it's open and we're requested to lock

Otherwise a grab conflict will will cause the lockscreen not to show up. Fixes: #1505234
Approved by: Andrea Azzarone

4024. By Marco Trevisan (Treviño)

PanelService: ensure that we free the "fake" IndicatorEntry's we create for dropdowns Fixes: #1503348
Approved by: Andrea Azzarone

4023. By Marco Trevisan (Treviño)

LauncherIcon: force lookup icon by scaling it at the requested size

As bonus, remove unused GtkWrapper class Fixes: #1446081, #1501973
Approved by: Andrea Azzarone

4022. By Marco Trevisan (Treviño)

ResultRendererTile: consider global scaling when scaling a not-squared icon Fixes: #1499286
Approved by: Andrea Azzarone

4021. By Marco Trevisan (Treviño)

TestDash: Use local results in PreviewNavigateTests instead of online ones

They're just more reliable
Approved by: Andrea Azzarone

4020. By Marco Trevisan (Treviño)

UnityScreen: close the session dialog in case it's open and we're requested to lock

Otherwise a grab conflict will will cause the lockscreen not to show up. Fixes: #1505234
Approved by: Andrea Azzarone

4019. By CI Train Bot Account

Releasing 7.3.2+15.10.20151002.2-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: