← Back to branch summary

~unity-2d-team/unity-2d/shortcut-hint-overlay

~unity-2d-team/unity-2d/shortcut-hint-overlay

Viewing all changes in revision 963.

Committer: LDS
Date: 2012-02-13 11:52:09 UTC
mfrom: (771.40.93 unity-2d)
Revision ID: lohith.shivamurthy@canonical.com-20120213115209-fmn6xwvaxyw3gear

merge lp:unity-2d

files added:
libunity-2d-private/src/screeninfo.cpp

libunity-2d-private/src/screeninfo.h

panel/applets/appname/artwork

panel/applets/appname/artwork/close_dash.png

panel/applets/appname/artwork/close_dash_prelight.png

panel/applets/appname/artwork/close_dash_pressed.png

panel/applets/appname/artwork/maximize_dash.png

panel/applets/appname/artwork/maximize_dash_prelight.png

panel/applets/appname/artwork/maximize_dash_pressed.png

panel/applets/appname/artwork/minimize_dash.png

panel/applets/appname/artwork/minimize_dash_prelight.png

panel/applets/appname/artwork/minimize_dash_pressed.png

panel/applets/appname/artwork/unmaximize_dash.png

panel/applets/appname/artwork/unmaximize_dash_prelight.png

panel/applets/appname/artwork/unmaximize_dash_pressed.png

shell/common/Background.qml

shell/common/visibilityBehaviors

tests/launcher/autohide_show_tests_common.rb

tests/launcher/autohide_show_tests_rtl.rb

tests/panel/verification

tests/panel/verification/dash_close_button.png

tests/panel/verification/dash_close_button_over.png

tests/panel/verification/dash_close_button_pressed.png

tests/panel/verification/dash_maximize_button.png

tests/panel/verification/dash_maximize_button_fullscreen.png

tests/panel/verification/dash_maximize_button_fullscreen_over.png

tests/panel/verification/dash_maximize_button_fullscreen_pressed.png

tests/panel/verification/dash_maximize_button_over.png

tests/panel/verification/dash_maximize_button_pressed.png

tests/panel/verification/dash_minimize_button.png

tests/panel/visual_verification.rb

tests/shell/input_shaping_common.rb

tests/shell/input_shaping_rtl.rb

files removed:
shell/MERGE-TODO

shell/dash/artwork/fullscreen_button.png

shell/launcher/artwork/shortcut_hint_borders.png

files renamed:
libunity-2d-private/src/screeninfo.cpp => libunity-2d-private/src/desktopinfo.cpp

libunity-2d-private/src/screeninfo.h => libunity-2d-private/src/desktopinfo.h

shell/dash/SearchEntry.qml => shell/common/SearchEntry.qml

shell/dash/artwork/background_sheen.png => shell/common/artwork/background_sheen.png

shell/dash/artwork/cross.png => shell/common/artwork/cross.png

shell/dash/artwork/desktop_dash_background.png => shell/common/artwork/desktop_dash_background.png

shell/dash/artwork/desktop_dash_background.sci => shell/common/artwork/desktop_dash_background.sci

shell/dash/artwork/desktop_dash_background_no_transparency.png => shell/common/artwork/desktop_dash_background_no_transparency.png

shell/dash/artwork/desktop_dash_background_no_transparency.sci => shell/common/artwork/desktop_dash_background_no_transparency.sci

shell/dash/artwork/search_background.png => shell/common/artwork/search_background.png

shell/dash/artwork/search_background.sci => shell/common/artwork/search_background.sci

shell/dash/artwork/search_icon.png => shell/common/artwork/search_icon.png

shell/common/AlwaysVisibleBehavior.qml => shell/common/visibilityBehaviors/AlwaysVisibleBehavior.qml

shell/launcher/AutoHideBehavior.qml => shell/common/visibilityBehaviors/AutoHideBehavior.qml

shell/common/BaseBehavior.qml => shell/common/visibilityBehaviors/BaseBehavior.qml

shell/launcher/IntelliHideBehavior.qml => shell/common/visibilityBehaviors/IntelliHideBehavior.qml

tests/places/ => tests/dash/

tests/places/places-tests.rb => tests/dash/dash-tests.rb

tests/manual-tests/places.txt => tests/manual-tests/dash.txt

files modified:
.bzrignore

README

config.h.in

debian/changelog

debian/control

debian/manpages/unity-2d-shell.1

debian/unity-2d-panel.install.in

libunity-2d-private/Unity2d/GnomeBackground.qml

libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

libunity-2d-private/src/abstractdbusservicemonitor.cpp

libunity-2d-private/src/abstractdbusservicemonitor.h

libunity-2d-private/src/dashclient.cpp

libunity-2d-private/src/dashclient.h

libunity-2d-private/src/gesturehandler.cpp

libunity-2d-private/src/indicatorentrywidget.cpp

libunity-2d-private/src/inputshapemanager.cpp

libunity-2d-private/src/inputshapemanager.h

libunity-2d-private/src/inputshapemask.cpp

libunity-2d-private/src/inputshapemask.h

libunity-2d-private/src/inputshaperectangle.cpp

libunity-2d-private/src/inputshaperectangle.h

libunity-2d-private/src/launcherapplication.cpp

libunity-2d-private/src/launcherapplication.h

libunity-2d-private/src/lens.cpp

libunity-2d-private/src/lenses.cpp

libunity-2d-private/src/lenses.h

libunity-2d-private/src/spreadmonitor.cpp

libunity-2d-private/src/spreadmonitor.h

libunity-2d-private/src/strutmanager.cpp

libunity-2d-private/src/strutmanager.h

libunity-2d-private/src/unity2ddeclarativeview.cpp

libunity-2d-private/src/unity2ddeclarativeview.h

libunity-2d-private/src/unity2dpanel.cpp

libunity-2d-private/src/unity2dpanel.h

libunity-2d-private/src/windowsintersectmonitor.cpp

libunity-2d-private/src/workspacesinfo.cpp

panel/app/panelmanager.cpp

panel/app/panelmanager.h

panel/applets/appname/CMakeLists.txt

panel/applets/appname/appnameapplet.cpp

panel/applets/appname/windowhelper.cpp

panel/applets/appname/windowhelper.h

shell/Shell.qml

shell/app/shell.cpp

shell/app/shelldeclarativeview.cpp

shell/app/shelldeclarativeview.h

shell/common/VisibilityController.qml

shell/common/utils.js

shell/dash/Dash.qml

shell/dash/Home.qml

shell/dash/HomeShortcuts.qml

shell/dash/LensBar.qml

shell/dash/LensView.qml

shell/dash/RendererGrid.qml

shell/dash/TileHorizontal.qml

shell/launcher/Launcher.qml

shell/launcher/LauncherList.qml

shell/launcher/LauncherLoader.qml

spread/Workspace.qml

spread/Workspaces.qml

spread/app/spread.cpp

spread/app/spreadview.cpp

spread/app/spreadview.h

tests/dash/fullscreen.rb

tests/getshape/getshape.cpp

tests/launcher/autohide_show_tests.rb

tests/launcher/launcher_sizing.rb

tests/launcher/update_pips_tests.rb

tests/launcher/visual_verification.rb

tests/manual-tests/launcher.txt

tests/manual-tests/panel.txt

tests/misc/lib/definitions.rb

tests/run-tests.rb

tests/shell/input_shaping.rb

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/manpages/unity-2d-shell.1

debian/unity-2d-panel.install.in

libunity-2d-private/Unity2d/GnomeBackground.qml

libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

libunity-2d-private/src/abstractdbusservicemonitor.cpp

libunity-2d-private/src/abstractdbusservicemonitor.h

libunity-2d-private/src/dashclient.cpp

libunity-2d-private/src/dashclient.h

libunity-2d-private/src/desktopinfo.cpp

libunity-2d-private/src/desktopinfo.h

libunity-2d-private/src/gesturehandler.cpp

libunity-2d-private/src/indicatorentrywidget.cpp

libunity-2d-private/src/inputshapemanager.cpp

libunity-2d-private/src/inputshapemanager.h

libunity-2d-private/src/inputshapemask.cpp

libunity-2d-private/src/inputshapemask.h

libunity-2d-private/src/inputshaperectangle.cpp

libunity-2d-private/src/inputshaperectangle.h

libunity-2d-private/src/launcherapplication.cpp

libunity-2d-private/src/launcherapplication.h

libunity-2d-private/src/lens.cpp

libunity-2d-private/src/lenses.cpp

libunity-2d-private/src/lenses.h

libunity-2d-private/src/screeninfo.cpp

libunity-2d-private/src/screeninfo.h

libunity-2d-private/src/spreadmonitor.cpp

libunity-2d-private/src/spreadmonitor.h

libunity-2d-private/src/strutmanager.cpp

libunity-2d-private/src/strutmanager.h

libunity-2d-private/src/unity2ddeclarativeview.cpp

libunity-2d-private/src/unity2ddeclarativeview.h

libunity-2d-private/src/unity2dpanel.cpp

libunity-2d-private/src/unity2dpanel.h

libunity-2d-private/src/windowsintersectmonitor.cpp

libunity-2d-private/src/workspacesinfo.cpp

panel/app/panelmanager.cpp

panel/app/panelmanager.h

panel/applets/appname/CMakeLists.txt

panel/applets/appname/appnameapplet.cpp

panel/applets/appname/artwork/

panel/applets/appname/artwork/close_dash.png

panel/applets/appname/artwork/close_dash_prelight.png

panel/applets/appname/artwork/close_dash_pressed.png

panel/applets/appname/artwork/maximize_dash.png

panel/applets/appname/artwork/maximize_dash_prelight.png

panel/applets/appname/artwork/maximize_dash_pressed.png

panel/applets/appname/artwork/minimize_dash.png

panel/applets/appname/artwork/minimize_dash_prelight.png

panel/applets/appname/artwork/minimize_dash_pressed.png

panel/applets/appname/artwork/unmaximize_dash.png

panel/applets/appname/artwork/unmaximize_dash_prelight.png

panel/applets/appname/artwork/unmaximize_dash_pressed.png

panel/applets/appname/windowhelper.cpp

panel/applets/appname/windowhelper.h

shell/MERGE-TODO

shell/Shell.qml

shell/app/shell.cpp

shell/app/shelldeclarativeview.cpp

shell/app/shelldeclarativeview.h

shell/common/Background.qml

shell/common/SearchEntry.qml

shell/common/VisibilityController.qml

shell/common/utils.js

shell/common/visibilityBehaviors/

shell/common/visibilityBehaviors/AlwaysVisibleBehavior.qml

shell/common/visibilityBehaviors/AutoHideBehavior.qml

shell/common/visibilityBehaviors/BaseBehavior.qml

shell/common/visibilityBehaviors/IntelliHideBehavior.qml

shell/dash/Dash.qml

shell/dash/Home.qml

shell/dash/HomeShortcuts.qml

shell/dash/LensBar.qml

shell/dash/LensView.qml

shell/dash/RendererGrid.qml

shell/dash/TileHorizontal.qml

shell/dash/artwork/fullscreen_button.png

shell/launcher/Launcher.qml

shell/launcher/LauncherList.qml

shell/launcher/LauncherLoader.qml

shell/launcher/artwork/shortcut_hint_borders.png

spread/Workspace.qml

spread/Workspaces.qml

spread/app/spread.cpp

spread/app/spreadview.cpp

spread/app/spreadview.h

tests/dash/dash-tests.rb

tests/dash/fullscreen.rb

tests/getshape/getshape.cpp

tests/launcher/autohide_show_tests.rb

tests/launcher/autohide_show_tests_common.rb

tests/launcher/autohide_show_tests_rtl.rb

tests/launcher/launcher_sizing.rb

tests/launcher/update_pips_tests.rb

tests/launcher/visual_verification.rb

tests/manual-tests/dash.txt

tests/manual-tests/launcher.txt

tests/manual-tests/panel.txt

tests/misc/lib/definitions.rb

tests/panel/verification/

tests/panel/verification/dash_close_button.png

tests/panel/verification/dash_close_button_over.png

tests/panel/verification/dash_close_button_pressed.png

tests/panel/verification/dash_maximize_button.png

tests/panel/verification/dash_maximize_button_fullscreen.png

tests/panel/verification/dash_maximize_button_fullscreen_over.png

tests/panel/verification/dash_maximize_button_fullscreen_pressed.png

tests/panel/verification/dash_maximize_button_over.png

tests/panel/verification/dash_maximize_button_pressed.png

tests/panel/verification/dash_minimize_button.png

tests/panel/visual_verification.rb

tests/run-tests.rb

tests/shell/input_shaping.rb

tests/shell/input_shaping_common.rb

tests/shell/input_shaping_rtl.rb

Older »