← Back to branch summary

~ruben-verweij/unity/fix-677594-workspaces

~ruben-verweij/unity/fix-677594-workspaces

Viewing all changes in revision 682.

Committer: Ruben Verweij
Date: 2011-02-10 21:50:31 UTC
mfrom: (679.1.169 unity)
Revision ID: rbnvrw@gmail.com-20110210215031-chp4pb7grcwdvop8

Conflicts resolved, remaining changes:     modified:
      src/LauncherController.cpp
      src/LauncherController.h
        - Add a function that displays/hides the workspace launcher when the number
          of workspaces changes
      src/unity.cpp
      src/unity.h
       - Add a function that calls the function in the LauncherController if the
         number of workspaces has changed

files added:
cmake/Documentation.cmake

doc

doc/CMakeLists.txt

doc/fr

doc/fr/unity-panel-service.fr.1

doc/fr/unity.fr.1

doc/makefile

doc/po

doc/po/fr.po

doc/po/unity-doc.pot

doc/po4a.conf

doc/unity-panel-service.1

doc/unity.1

plugin-unityshell.png

resources/launcher_arrow_ltr.png

resources/launcher_arrow_outline_ltr.png

resources/launcher_arrow_outline_rtl.png

resources/launcher_arrow_rtl.png

resources/launcher_pip_ltr.png

resources/launcher_pip_rtl.png

resources/progress_bar_fill.png

resources/progress_bar_trough.png

resources/round_glow_hl_62x62.png

services/panel-a11y.c

services/panel-a11y.h

services/panel-indicator-accessible.c

services/panel-indicator-accessible.h

services/panel-root-accessible.c

services/panel-root-accessible.h

services/panel-util-accessible.c

services/panel-util-accessible.h

src/DeviceLauncherIcon.cpp

src/DeviceLauncherIcon.h

src/DeviceLauncherSection.cpp

src/DeviceLauncherSection.h

src/IconLoader.cpp

src/IconLoader.h

src/IconTexture.cpp

src/IconTexture.h

src/LauncherDragWindow.cpp

src/LauncherDragWindow.h

src/LauncherEntryRemote.cpp

src/LauncherEntryRemote.h

src/LauncherEntryRemoteModel.cpp

src/LauncherEntryRemoteModel.h

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PanelTitlebarGrabAreaView.cpp

src/PanelTitlebarGrabAreaView.h

src/Place.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlaceFactory.cpp

src/PlaceFactory.h

src/PlaceFactoryFile.cpp

src/PlaceFactoryFile.h

src/PlaceLauncherIcon.cpp

src/PlaceLauncherIcon.h

src/PlaceLauncherSection.cpp

src/PlaceLauncherSection.h

src/PlaceRemote.cpp

src/PlaceRemote.h

src/PlacesController.cpp

src/PlacesController.h

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesHomeView.cpp

src/PlacesHomeView.h

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesResultsView.h

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesSimpleTile.cpp

src/PlacesSimpleTile.h

src/PlacesTile.cpp

src/PlacesTile.h

src/PlacesView.cpp

src/PlacesView.h

src/QuicklistManager.cpp

src/QuicklistManager.h

src/SpacerLauncherIcon.cpp

src/SpacerLauncherIcon.h

src/UBusMessages.h

src/WindowButtons.cpp

src/WindowButtons.h

src/WindowManager.cpp

src/WindowManager.h

src/nux-area-accessible.cpp

src/nux-area-accessible.h

src/nux-base-window-accessible.cpp

src/nux-base-window-accessible.h

src/nux-layout-accessible.cpp

src/nux-layout-accessible.h

src/nux-object-accessible.cpp

src/nux-object-accessible.h

src/nux-view-accessible.cpp

src/nux-view-accessible.h

src/perf-logger-utility.h

src/unity-launcher-accessible.cpp

src/unity-launcher-accessible.h

src/unity-launcher-icon-accessible.cpp

src/unity-launcher-icon-accessible.h

src/unity-root-accessible.cpp

src/unity-root-accessible.h

src/unity-util-accessible.cpp

src/unity-util-accessible.h

src/unitya11y.cpp

src/unitya11y.h

tests/TestPlaces.cpp

tests/TestPlacesBackend.cpp

tests/TestPlacesGroup.cpp

tests/TestPlacesResults.cpp

tests/TestPlacesTiles.cpp

tests/data/bfb.png

tests/ui

tests/ui/EventFaker.cpp

tests/ui/EventFaker.h

tests/ui/TestQuicklist.cpp

tests/unit/TestPlaceFactoryFile.cpp

tools/autopilot.py

tools/unity.cmake

files removed:
libunity

libunity/CMakeLists.txt

libunity/chrome-handler.vala

libunity/drag-controller.vala

libunity/drag-view.vala

libunity/entry.vala

libunity/icon-postprocessor.vala

libunity/prism-handler.vala

libunity/quicklist-rendering.vala

libunity/shell.vala

libunity/theme.vala

libunity/unity-appinfo-manager.vala

libunity/unity-cairo-canvas.vala

libunity/unity-expanding-bin.vala

libunity/unity-favorites.vala

libunity/unity-io.vala

libunity/unity-layered-bin.vala

libunity/unity-pixbuf-cache.vala

libunity/unity-place-activation.vala

libunity/unity-place-browser.vala

libunity/unity-place-renderer.vala

libunity/unity-place.vala

libunity/unity-stripe-texture.vala

libunity/unity.pc.cmake

libunity/webapp-fetcher.vala

resources/2indicate_54x54.png

resources/3indicate_54x54.png

resources/4indicate_54x54.png

resources/focused_indicator.png

resources/round_corner_50x50.png

resources/round_outline_50x50.png

resources/running_indicator.png

vala_tests

vala_tests/ui

vala_tests/ui/Makefile.am

vala_tests/ui/data

vala_tests/ui/data/Makefile.am

vala_tests/ui/data/quicklist_controller_show_label.png

vala_tests/ui/data/quicklist_shown_on_hover.png

vala_tests/ui/test-automate.vala

vala_tests/ui/test-const.vapi

vala_tests/ui/test-home-button.vala

vala_tests/ui/test-indicators.vala

vala_tests/ui/test-quicklist.vala

vala_tests/ui/test-ui.vala

vala_tests/unit

vala_tests/unit/Makefile.am

vala_tests/unit/data

vala_tests/unit/data/Makefile.am

vala_tests/unit/data/applications

vala_tests/unit/data/applications/ubuntu-about.desktop

vala_tests/unit/data/place0.badplace

vala_tests/unit/data/place0.place

vala_tests/unit/data/place1.badplace

vala_tests/unit/data/place1.place

vala_tests/unit/data/test_desktop_file.desktop

vala_tests/unit/test-appinfo-manager.vala

vala_tests/unit/test-const.vapi

vala_tests/unit/test-dbusmenu-quicklists.vala

vala_tests/unit/test-io.vala

vala_tests/unit/test-launcher.vala

vala_tests/unit/test-panel-indicator-object-entry-view.vala

vala_tests/unit/test-panel-indicator-object-view.vala

vala_tests/unit/test-place-browser.vala

vala_tests/unit/test-place.vala

vala_tests/unit/test-places-place-file-model.vala

vala_tests/unit/test-places-place.vala

vala_tests/unit/test-places.vala

vala_tests/unit/test-unit.vala

vala_tests/unit/test-unity-pixbuf-cache.vala

files renamed:
src/IntrospectionDBusInterface.cpp => src/DebugDBusInterface.cpp

src/IntrospectionDBusInterface.h => src/DebugDBusInterface.h

unity-private/testing/perf-logger.vala => src/perf-logger.vala

libunity/ubus-server.c => src/ubus-server.cpp

libunity/ubus-server.h => src/ubus-server.h

src/unity.cpp => src/unityshell.cpp

src/unity.h => src/unityshell.h

files modified:
CMakeLists.txt

INSTALL

cmake/vala/FindVala.cmake

config.h.cmake

po/POTFILES.in

po/unity.pot

resources/round_corner_54x54.png

resources/round_glow_62x62.png

resources/round_outline_54x54.png

resources/round_shine_54x54.png

services/CMakeLists.txt

services/panel-main.c

services/panel-service.c

services/panel-service.h

src/BamfLauncherIcon.cpp

src/BamfLauncherIcon.h

src/FavoriteStore.cpp

src/FavoriteStore.h

src/FavoriteStoreGSettings.cpp

src/FavoriteStoreGSettings.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectEntryProxyRemote.h

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/IndicatorObjectProxy.h

src/IndicatorObjectProxyRemote.cpp

src/IndicatorObjectProxyRemote.h

src/Introspectable.cpp

src/Introspectable.h

src/Launcher.cpp

src/Launcher.h

src/LauncherController.cpp

src/LauncherController.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/LauncherModel.cpp

src/LauncherModel.h

src/PanelHomeButton.cpp

src/PanelHomeButton.h

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelView.cpp

src/PanelView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/QuicklistMenuItem.cpp

src/QuicklistMenuItem.h

src/QuicklistMenuItemCheckmark.cpp

src/QuicklistMenuItemCheckmark.h

src/QuicklistMenuItemLabel.cpp

src/QuicklistMenuItemLabel.h

src/QuicklistMenuItemRadio.cpp

src/QuicklistMenuItemRadio.h

src/QuicklistMenuItemSeparator.cpp

src/QuicklistMenuItemSeparator.h

src/QuicklistView.cpp

src/QuicklistView.h

src/SimpleLauncherIcon.cpp

src/SimpleLauncherIcon.h

src/StartupNotifyService.cpp

src/StartupNotifyService.h

src/StaticCairoText.cpp

src/StaticCairoText.h

src/Tooltip.cpp

src/Tooltip.h

src/TrashLauncherIcon.cpp

src/TrashLauncherIcon.h

tests/CMakeLists.txt

tests/unit/TestMain.cpp *

tests/unit/TestPanelService.cpp

tests/unit/TestQuicklistMenuitems.cpp *

tests/unit/TestUBus.cpp

tools/CMakeLists.txt

tools/makebootchart.py

tools/migrate_favorites.py

unityshell.xml.in

Show diffs side-by-side

added added

removed removed

cmake/Documentation.cmake

cmake/vala/FindVala.cmake

doc/CMakeLists.txt

doc/fr/unity-panel-service.fr.1

doc/fr/unity.fr.1

doc/po/unity-doc.pot

doc/unity-panel-service.1

libunity/CMakeLists.txt

libunity/chrome-handler.vala

libunity/drag-controller.vala

libunity/drag-view.vala

libunity/entry.vala

libunity/icon-postprocessor.vala

libunity/prism-handler.vala

libunity/quicklist-rendering.vala

libunity/shell.vala

libunity/theme.vala

libunity/unity-appinfo-manager.vala

libunity/unity-cairo-canvas.vala

libunity/unity-expanding-bin.vala

libunity/unity-favorites.vala

libunity/unity-io.vala

libunity/unity-layered-bin.vala

libunity/unity-pixbuf-cache.vala

libunity/unity-place-activation.vala

libunity/unity-place-browser.vala

libunity/unity-place-renderer.vala

libunity/unity-place.vala

libunity/unity-stripe-texture.vala

libunity/unity.pc.cmake

libunity/webapp-fetcher.vala

plugin-unityshell.png

resources/2indicate_54x54.png

resources/3indicate_54x54.png

resources/4indicate_54x54.png

resources/focused_indicator.png

resources/launcher_arrow_ltr.png

resources/launcher_arrow_outline_ltr.png

resources/launcher_arrow_outline_rtl.png

resources/launcher_arrow_rtl.png

resources/launcher_pip_ltr.png

resources/launcher_pip_rtl.png

resources/progress_bar_fill.png

resources/progress_bar_trough.png

resources/round_corner_50x50.png

resources/round_corner_54x54.png

resources/round_glow_62x62.png

resources/round_glow_hl_62x62.png

resources/round_outline_50x50.png

resources/round_outline_54x54.png

resources/round_shine_54x54.png

resources/running_indicator.png

services/CMakeLists.txt

services/panel-indicator-accessible.c

services/panel-indicator-accessible.h

services/panel-main.c

services/panel-root-accessible.c

services/panel-root-accessible.h

services/panel-service.c

services/panel-service.h

services/panel-util-accessible.c

services/panel-util-accessible.h

src/BamfLauncherIcon.cpp

src/BamfLauncherIcon.h

src/DebugDBusInterface.cpp

src/DebugDBusInterface.h

src/DeviceLauncherIcon.cpp

src/DeviceLauncherIcon.h

src/DeviceLauncherSection.cpp

src/DeviceLauncherSection.h

src/FavoriteStore.cpp

src/FavoriteStore.h

src/FavoriteStoreGSettings.cpp

src/FavoriteStoreGSettings.h

src/IconLoader.cpp

src/IconLoader.h

src/IconTexture.cpp

src/IconTexture.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectEntryProxyRemote.h

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/IndicatorObjectProxy.h

src/IndicatorObjectProxyRemote.cpp

src/IndicatorObjectProxyRemote.h

src/Introspectable.cpp

src/Introspectable.h

src/Launcher.cpp

src/LauncherController.cpp

src/LauncherController.h

src/LauncherDragWindow.cpp

src/LauncherDragWindow.h

src/LauncherEntryRemote.cpp

src/LauncherEntryRemote.h

src/LauncherEntryRemoteModel.cpp

src/LauncherEntryRemoteModel.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/LauncherModel.cpp

src/LauncherModel.h

src/PanelHomeButton.cpp

src/PanelHomeButton.h

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PanelTitlebarGrabAreaView.cpp

src/PanelTitlebarGrabAreaView.h

src/PanelView.cpp

src/PanelView.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlaceFactory.cpp

src/PlaceFactory.h

src/PlaceFactoryFile.cpp

src/PlaceFactoryFile.h

src/PlaceLauncherIcon.cpp

src/PlaceLauncherIcon.h

src/PlaceLauncherSection.cpp

src/PlaceLauncherSection.h

src/PlaceRemote.cpp

src/PlaceRemote.h

src/PlacesController.cpp

src/PlacesController.h

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesHomeView.cpp

src/PlacesHomeView.h

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesResultsView.h

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesSimpleTile.cpp

src/PlacesSimpleTile.h

src/PlacesTile.cpp

src/PlacesTile.h

src/PlacesView.cpp

src/PlacesView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/QuicklistManager.cpp

src/QuicklistManager.h

src/QuicklistMenuItem.cpp

src/QuicklistMenuItem.h

src/QuicklistMenuItemCheckmark.cpp

src/QuicklistMenuItemCheckmark.h

src/QuicklistMenuItemLabel.cpp

src/QuicklistMenuItemLabel.h

src/QuicklistMenuItemRadio.cpp

src/QuicklistMenuItemRadio.h

src/QuicklistMenuItemSeparator.cpp

src/QuicklistMenuItemSeparator.h

src/QuicklistView.cpp

src/QuicklistView.h

src/SimpleLauncherIcon.cpp

src/SimpleLauncherIcon.h

src/SpacerLauncherIcon.cpp

src/SpacerLauncherIcon.h

src/StartupNotifyService.cpp

src/StartupNotifyService.h

src/StaticCairoText.cpp

src/StaticCairoText.h

src/Tooltip.cpp

src/TrashLauncherIcon.cpp

src/TrashLauncherIcon.h

src/UBusMessages.h

src/WindowButtons.cpp

src/WindowButtons.h

src/WindowManager.cpp

src/WindowManager.h

src/nux-area-accessible.cpp

src/nux-area-accessible.h

src/nux-base-window-accessible.cpp

src/nux-base-window-accessible.h

src/nux-layout-accessible.cpp

src/nux-layout-accessible.h

src/nux-object-accessible.cpp

src/nux-object-accessible.h

src/nux-view-accessible.cpp

src/nux-view-accessible.h

src/perf-logger-utility.h

src/perf-logger.vala

src/ubus-server.cpp

src/unity-launcher-accessible.cpp

src/unity-launcher-accessible.h

src/unity-launcher-icon-accessible.cpp

src/unity-launcher-icon-accessible.h

src/unity-root-accessible.cpp

src/unity-root-accessible.h

src/unity-util-accessible.cpp

src/unity-util-accessible.h

src/unitya11y.cpp

src/unitya11y.h

src/unityshell.cpp

src/unityshell.h

tests/CMakeLists.txt

tests/TestPlaces.cpp

tests/TestPlacesBackend.cpp

tests/TestPlacesGroup.cpp

tests/TestPlacesResults.cpp

tests/TestPlacesTiles.cpp

tests/data/bfb.png

tests/ui/EventFaker.cpp

tests/ui/EventFaker.h

tests/ui/TestQuicklist.cpp

tests/unit/TestMain.cpp

tests/unit/TestPanelService.cpp

tests/unit/TestPlaceFactoryFile.cpp

tests/unit/TestUBus.cpp

tools/CMakeLists.txt

tools/autopilot.py

tools/makebootchart.py

tools/migrate_favorites.py

tools/unity.cmake

unityshell.xml.in

vala_tests/ui/Makefile.am

vala_tests/ui/data/

vala_tests/ui/data/Makefile.am

vala_tests/ui/data/quicklist_controller_show_label.png

vala_tests/ui/data/quicklist_shown_on_hover.png

vala_tests/ui/test-automate.vala

vala_tests/ui/test-const.vapi

vala_tests/ui/test-home-button.vala

vala_tests/ui/test-indicators.vala

vala_tests/ui/test-quicklist.vala

vala_tests/ui/test-ui.vala

vala_tests/unit/

vala_tests/unit/Makefile.am

vala_tests/unit/data/

vala_tests/unit/data/Makefile.am

vala_tests/unit/data/applications/

vala_tests/unit/data/applications/ubuntu-about.desktop

vala_tests/unit/data/place0.badplace

vala_tests/unit/data/place0.place

vala_tests/unit/data/place1.badplace

vala_tests/unit/data/place1.place

vala_tests/unit/data/test_desktop_file.desktop

vala_tests/unit/test-appinfo-manager.vala

vala_tests/unit/test-const.vapi

vala_tests/unit/test-dbusmenu-quicklists.vala

vala_tests/unit/test-io.vala

vala_tests/unit/test-launcher.vala

vala_tests/unit/test-panel-indicator-object-entry-view.vala

vala_tests/unit/test-panel-indicator-object-view.vala

vala_tests/unit/test-place-browser.vala

vala_tests/unit/test-place.vala

vala_tests/unit/test-places-place-file-model.vala

vala_tests/unit/test-places-place.vala

vala_tests/unit/test-places.vala

vala_tests/unit/test-unit.vala

vala_tests/unit/test-unity-pixbuf-cache.vala

Older »