~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to launcher/QuicklistMenuItem.cpp

Committer: Chris Townsend
Date: 2013-07-17 16:24:40 UTC
mfrom: (3379.1.48 trunk)
Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo

Merge in trunk.

files added:
UnityCore/ConnectionManager.cpp

UnityCore/ConnectionManager.h

tests/data/external.gschema.xml

tests/dummy-dbus-test-runner.sh

tests/dummy-xorg-test-runner.sh

tests/mock_indicator_object.h

tests/mock_results.cpp

tests/test_connection_manager.cpp

tests/test_panel_service.cpp

files removed:
debian/unity-common.install

tests/unit

tests/unit/TestMain.cpp

tests/unit/TestPanelService.cpp

tests/unit/TestStaticCairoText.cpp

tests/unit/TestThreadHelper.h

files renamed:
debian/libunity-core-6.0-6.install => debian/libunity-core-6.0-7.install

debian/libunity-core-6.0-6.lintian-overrides => debian/libunity-core-6.0-7.lintian-overrides

debian/unity.conf => debian/unity7.conf

tests/test_scopeview.cpp => tests/test_scope_view.cpp

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/Categories.cpp

UnityCore/Categories.h

UnityCore/Category.cpp

UnityCore/Category.h

UnityCore/Filters.cpp

UnityCore/Hud.cpp

UnityCore/Hud.h

UnityCore/Indicator.cpp

UnityCore/Indicator.h

UnityCore/MiscUtils.h

UnityCore/Model.h

UnityCore/Preview.cpp

UnityCore/Results.cpp

UnityCore/Results.h

UnityCore/Scope.cpp

UnityCore/Scope.h

UnityCore/ScopeProxy.cpp

UnityCore/ScopeProxy.h

UnityCore/ScopeProxyInterface.h

UnityCore/Scopes.cpp

UnityCore/Variant.cpp

UnityCore/pch/unitycore_pch.hh

cmake/pch.cmake

config.h.cmake

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/FilterAllButton.cpp

dash/FilterAllButton.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ScopeBar.cpp

dash/ScopeBar.h

dash/ScopeView.cpp

dash/ScopeView.h

dash/previews/Track.cpp

dash/previews/Track.h

dash/previews/Tracks.cpp

dash/previews/Tracks.h

debian/changelog

debian/control

debian/rules

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/EdgeBarrierController.cpp

launcher/EdgeBarrierControllerPrivate.h

launcher/ExpoLauncherIcon.cpp

launcher/ExpoLauncherIcon.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherControllerPrivate.h

launcher/LauncherDragWindow.cpp

launcher/LauncherDragWindow.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/MockLauncherIcon.h

launcher/PointerBarrier.cpp

launcher/PointerBarrier.h

launcher/QuicklistMenuItem.cpp

launcher/QuicklistMenuItem.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherModel.cpp

launcher/TrashLauncherIcon.cpp

launcher/VolumeLauncherIcon.cpp

panel/PanelIndicatorsView.cpp

panel/PanelIndicatorsView.h

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/CMakeLists.txt

services/panel-main.c

services/panel-service.c

services/panel-service.h

services/unity-panel-service.conf.in

shortcuts/ShortcutView.cpp

tests/CMakeLists.txt

tests/MockCategories.h

tests/MockResults.h

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_quicklist.py

tests/data/applications/ubuntu-software-center.desktop

tests/mock-application.cpp

tests/mock-application.h

tests/test-gestures/CMakeLists.txt

tests/test_application_launcher_icon.cpp

tests/test_bamf_application.cpp

tests/test_categories.cpp

tests/test_device_launcher_section.cpp

tests/test_favorite_store_gsettings.cpp

tests/test_glib_object.cpp

tests/test_glib_source.cpp

tests/test_glib_variant.cpp

tests/test_gnome_session_manager.cpp

tests/test_hud.cpp

tests/test_icon_loader.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_minimize_speed.cpp

tests/test_mock_scope.h

tests/test_model_iterator.cpp

tests/test_panel_style.cpp

tests/test_places_group.cpp

tests/test_pointer_barrier.cpp

tests/test_preview_player.cpp

tests/test_result_renderer.cpp

tests/test_results.cpp

tests/test_scope.cpp

tests/test_scope_proxy.cpp

tests/test_service_model.cpp

tests/test_software_center_launcher_icon.cpp

tests/test_static_cairo_text.cpp

tests/test_switcher_controller.cpp

tests/test_switcher_controller.h

tests/test_switcher_controller_class.cpp

tests/test_switcher_model.cpp

tests/test_switcher_view.cpp

tests/test_thumbnail_generator.cpp

tests/test_tracks.cpp

tests/test_unity_settings.cpp

tests/test_utils.h

unity-shared/ApplicationManager.h

unity-shared/BamfApplicationManager.cpp

unity-shared/BamfApplicationManager.h

unity-shared/PluginAdapter.cpp

unity-shared/PluginAdapter.h

Show diffs side-by-side

added added

removed removed

launcher/QuicklistMenuItem.cpp

const char* QuicklistMenuItem::MARKUP_ACCEL_DISABLED_PROPERTY = "unity-disable-accel";

const char* QuicklistMenuItem::MAXIMUM_LABEL_WIDTH_PROPERTY = "unity-max-label-width";

const char* QuicklistMenuItem::OVERLAY_MENU_ITEM_PROPERTY = "unity-overlay-item";

const char* QuicklistMenuItem::QUIT_ACTION_PROPERTY = "unity-quit-action";

NUX_IMPLEMENT_OBJECT_TYPE(QuicklistMenuItem);

Older »