← Back to branch summary

~brandontschaefer/unity/hud-to-dash-fix

~brandontschaefer/unity/hud-to-dash-fix

Viewing all changes in revision 2198.

Committer: Brandon Schaefer
Date: 2012-04-03 01:58:52 UTC
mfrom: (2193.1.16 unity)
Revision ID: brandontschaefer@gmail.com-20120403015852-yuuizkucg9h2h8vw

* Merged trunk, fixed conflict

files added:
UnityCore/DesktopUtilities.cpp

UnityCore/DesktopUtilities.h

manual-tests/NvResumeFromSuspend.txt

tests/autopilot/autopilot/tests/test_home_lens.py

tests/test_desktop_utilities.cpp

tests/test_launcher_entry_remote.cpp

files modified:
UnityCore/CMakeLists.txt

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/DashView.h

plugins/unityshell/src/FavoriteStoreGSettings.cpp

plugins/unityshell/src/FavoriteStorePrivate.h

plugins/unityshell/src/HudController.cpp

plugins/unityshell/src/HudController.h

plugins/unityshell/src/HudIcon.cpp

plugins/unityshell/src/HudIcon.h

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IconTexture.cpp

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherEntryRemote.cpp

plugins/unityshell/src/LauncherEntryRemote.h

plugins/unityshell/src/LauncherEntryRemoteModel.cpp

plugins/unityshell/src/LauncherEntryRemoteModel.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/UScreen.cpp

plugins/unityshell/src/UScreen.h

plugins/unityshell/src/unityshell.cpp

tests/CMakeLists.txt

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/emulators/dbus_handler.py

tests/autopilot/autopilot/emulators/ibus.py

tests/autopilot/autopilot/emulators/unity/dash.py

tests/autopilot/autopilot/emulators/unity/hud.py

tests/autopilot/autopilot/emulators/unity/launcher.py

tests/autopilot/autopilot/emulators/unity/shortcut_hint.py

tests/autopilot/autopilot/emulators/unity/switcher.py

tests/autopilot/autopilot/emulators/unity/workspace.py

tests/autopilot/autopilot/keybindings.py

tests/autopilot/autopilot/tests/test_command_lens.py

tests/autopilot/autopilot/tests/test_dash.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_ibus.py

tests/autopilot/autopilot/tests/test_launcher.py

tests/autopilot/autopilot/tests/test_quicklist.py

tests/autopilot/autopilot/tests/test_shortcut_hint.py

tests/autopilot/autopilot/tests/test_switcher.py

tests/test_favorite_store_gsettings.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/DesktopUtilities.cpp

UnityCore/DesktopUtilities.h

manual-tests/NvResumeFromSuspend.txt

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/DashView.h

plugins/unityshell/src/FavoriteStoreGSettings.cpp

plugins/unityshell/src/FavoriteStorePrivate.h

plugins/unityshell/src/HudController.cpp

plugins/unityshell/src/HudController.h

plugins/unityshell/src/HudIcon.cpp

plugins/unityshell/src/HudIcon.h

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IconTexture.cpp

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherEntryRemote.cpp

plugins/unityshell/src/LauncherEntryRemote.h

plugins/unityshell/src/LauncherEntryRemoteModel.cpp

plugins/unityshell/src/LauncherEntryRemoteModel.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/UScreen.cpp

plugins/unityshell/src/UScreen.h

plugins/unityshell/src/unityshell.cpp

tests/CMakeLists.txt

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/emulators/dbus_handler.py

tests/autopilot/autopilot/emulators/ibus.py

tests/autopilot/autopilot/emulators/unity/dash.py

tests/autopilot/autopilot/emulators/unity/hud.py

tests/autopilot/autopilot/emulators/unity/launcher.py

tests/autopilot/autopilot/emulators/unity/shortcut_hint.py

tests/autopilot/autopilot/emulators/unity/switcher.py

tests/autopilot/autopilot/emulators/unity/workspace.py

tests/autopilot/autopilot/keybindings.py

tests/autopilot/autopilot/tests/test_command_lens.py

tests/autopilot/autopilot/tests/test_dash.py

tests/autopilot/autopilot/tests/test_home_lens.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_ibus.py

tests/autopilot/autopilot/tests/test_launcher.py

tests/autopilot/autopilot/tests/test_quicklist.py

tests/autopilot/autopilot/tests/test_shortcut_hint.py

tests/autopilot/autopilot/tests/test_switcher.py

tests/test_desktop_utilities.cpp

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_entry_remote.cpp

Older »