~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.h

Committer: Nick Dedekind
Date: 2013-02-19 15:07:36 UTC
mfrom: (3162 trunk)
mto: (3008.26.1 libunity-7.0-breakage) (2791.11.104 generic-payment-preview) (3263.2.24 payment-previews) (3324.1.1 smartscopes-into-trunk)
mto: This revision was merged to the branch mainline in revision 3325.
Revision ID: nicholas.dedekind@gmail.com-20130219150736-rzyfz40ao6pd921o

Merged with trunk. Reverted autopilot changes

files added:
dash/previews/TabIterator.cpp

dash/previews/TabIterator.h

launcher/EdgeBarrierControllerPrivate.h

launcher/SwitcherControllerImpl.h

shortcuts/AbstractShortcutModeller.h

shortcuts/CompizShortcutModeller.cpp

shortcuts/CompizShortcutModeller.h

tests/autopilot/unity/tests/test_gobject_introspection.py

tests/autopilot/unity/tests/test_search.py

tests/test_abstract_interface_generator.cpp

tests/test_filter_multirange.h

tests/test_filter_widgets.cpp

tests/test_panel_tray.cpp

tests/test_quicklist_manager.cpp

tests/test_shortcut_modeller_compiz.cpp

tests/test_tabiterator.cpp

unity-shared/AbstractInterfaceGenerator.h

unity-shared/MockableBaseWindow.h

unity-shared/OverlayWindowButtons.cpp

unity-shared/OverlayWindowButtons.h

files removed:
tests/StubSwitcherController.h

files renamed:
panel/WindowButtonPriv.h => unity-shared/WindowButtonPriv.h

panel/WindowButtons.cpp => unity-shared/WindowButtons.cpp

panel/WindowButtons.h => unity-shared/WindowButtons.h

files modified:
.bzrignore

UnityCore/MultiRangeFilter.cpp

com.canonical.Unity.gschema.xml

dash/CMakeLists.txt

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/FilterAllButton.cpp

dash/FilterAllButton.h

dash/FilterBasicButton.cpp

dash/FilterBasicButton.h

dash/FilterFactory.cpp

dash/FilterGenreButton.cpp

dash/FilterGenreButton.h

dash/FilterMultiRangeButton.cpp

dash/FilterMultiRangeButton.h

dash/FilterMultiRangeWidget.cpp

dash/FilterMultiRangeWidget.h

dash/FilterRatingsButton.cpp

dash/FilterRatingsButton.h

dash/PlacesGroup.cpp

dash/ResultView.cpp

dash/ResultView.h

dash/previews/CMakeLists.txt

dash/previews/MusicPreview.cpp

dash/previews/Preview.cpp

dash/previews/Preview.h

debian/changelog

debian/control

hud/CMakeLists.txt

hud/HudView.cpp

hud/HudView.h

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/EdgeBarrierController.cpp

launcher/EdgeBarrierController.h

launcher/ExpoLauncherIcon.cpp

launcher/ExpoLauncherIcon.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/PointerBarrier.cpp

launcher/PointerBarrier.h

launcher/QuicklistManager.cpp

launcher/QuicklistManager.h

launcher/QuicklistMenuItem.cpp

launcher/QuicklistMenuItem.h

launcher/StandaloneSwitcher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/VolumeImp.cpp

panel/CMakeLists.txt

panel/PanelController.cpp

panel/PanelController.h

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelTray.cpp

panel/PanelTray.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

plugins/unityshell/src/inputremover.cpp

plugins/unityshell/src/inputremover.h

plugins/unityshell/src/minimizedwindowhandler.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/panel-service.c

shortcuts/CMakeLists.txt

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

shortcuts/ShortcutModel.cpp

shortcuts/ShortcutView.cpp

shortcuts/StandaloneShortcuts.cpp

tests/CMakeLists.txt

tests/MockWindowManager.h

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/unity.py

tests/autopilot/unity/tests/__init__.py

tests/autopilot/unity/tests/launcher/__init__.py

tests/autopilot/unity/tests/launcher/test_capture.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/launcher/test_shortcut.py

tests/autopilot/unity/tests/launcher/test_switcher.py

tests/autopilot/unity/tests/launcher/test_visual.py

tests/autopilot/unity/tests/test_command_lens.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_home_lens.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shopping_lens.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_spread.py

tests/autopilot/unity/tests/test_switcher.py

tests/autopilot/unity/tests/xim/test_gcin.py

tests/mock-application.h

tests/mock-base-window.h

tests/test-gestures/sed_script_switcher

tests/test-input-remover/test-input-remover.cpp

tests/test-minimize-window-handler/test-minimize-handler.cpp

tests/test_application_launcher_icon.cpp

tests/test_categories.cpp

tests/test_dash_controller.cpp

tests/test_dbus_indicators.cpp

tests/test_edge_barrier_controller.cpp

tests/test_expo_launcher_icon.cpp

tests/test_gdbus_proxy.cpp

tests/test_glib_source.cpp

tests/test_hud_controller.cpp

tests/test_hud_view.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_drag_window.cpp

tests/test_layout_system.cpp

tests/test_lens.cpp

tests/test_main.cpp

tests/test_panel_menu_view.cpp

tests/test_pointer_barrier.cpp

tests/test_previews_application.cpp

tests/test_previews_generic.cpp

tests/test_previews_movie.cpp

tests/test_previews_music.cpp

tests/test_previews_social.cpp

tests/test_quicklist_menu_item.cpp

tests/test_results.cpp

tests/test_scope_filter.cpp

tests/test_service_gdbus_wrapper.c

tests/test_service_hud.c

tests/test_service_lens.c

tests/test_service_model.c

tests/test_shortcut_controller.cpp

tests/test_shortcut_view.cpp

tests/test_switcher_controller.cpp

tests/test_switcher_model.cpp

tests/test_switcher_view.cpp

tests/test_unity_settings.cpp

tests/test_uscreen_mock.h

tests/test_utils.h

tests/test_window_buttons.cpp

tests/unit/TestPanelService.cpp

unity-shared/BackgroundEffectHelper.cpp

unity-shared/BamfApplicationManager.cpp

unity-shared/CMakeLists.txt

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/Introspectable.cpp

unity-shared/Introspectable.h

unity-shared/PluginAdapter.cpp

unity-shared/PluginAdapter.h

unity-shared/ResizingBaseWindow.cpp

unity-shared/ResizingBaseWindow.h

unity-shared/StandaloneWindowManager.cpp

unity-shared/StandaloneWindowManager.h

unity-shared/WindowManager.h

Show diffs side-by-side

added added

removed removed

plugins/unityshell/src/unityshell.h

#include "FavoriteStoreGSettings.h"

#include "FontSettings.h"

#include "ShortcutController.h"

#include "ShortcutHint.h"

#include "LauncherController.h"

#include "PanelController.h"

#include "PanelStyle.h"

237

236

void OnInitiateSpread();

238

237

void OnTerminateSpread();

239

238

240

void RestoreWindow(GVariant* data);

241

239

bool SaveInputThenFocus(const guint xid);

242

240

243

void InitHints();

244

245

241

void OnPanelStyleChanged();

246

242

247

243

void InitGesturesSupport();

250

246

bool TopPanelBackgroundTextureNeedsUpdate() const;

251

247

void UpdateTopPanelBackgroundTexture();

252

248

249

unsigned CompizModifiersToNux(unsigned input) const;

250

unsigned XModifiersToNux(unsigned input) const;

251

252

void UpdateCloseWindowKey(CompAction::KeyBinding const&);

253

254

std::unique_ptr<na::TickSource> tick_source_;

254

255

std::unique_ptr<na::AnimationController> animation_controller_;

255

256

273

274

shortcut::Controller::Ptr shortcut_controller_;

274

275

debug::DebugDBusInterface debugger_;

275

276

std::list<shortcut::AbstractHint::Ptr> hints_;

277

bool enable_shortcut_overlay_;

278

279

277

/* Subscription for gestures that manipulate Unity launcher */

280

278

std::unique_ptr<nux::GesturesSubscription> gestures_sub_launcher_;

281

279

393

391

CompPoint tryNotIntersectUI(CompPoint& pos);

394

392

nux::Geometry GetScaledGeometry();

395

393

396

void paintThumbnail(nux::Geometry const& bounding, float alpha, float scale_ratio, unsigned deco_height, bool selected);

394

void paintThumbnail(nux::Geometry const& bounding, float parent_alpha, float alpha, float scale_ratio, unsigned deco_height, bool selected);

397

395

398

396

void enterShowDesktop();

399

397

void leaveShowDesktop();

Older »