← Back to branch summary

~macslow/unity/backported-remote-add-to-5.0

~macslow/unity/backported-remote-add-to-5.0

« back to all changes in this revision

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

Committer: Marco Trevisan (Treviño)
Date: 2012-03-30 13:01:12 UTC
mfrom: (2194.3.8 panel-menu-changes)
mto: (1858.20.3 panel-p-tests)
mto: This revision was merged to the branch mainline in revision 2242.
Revision ID: mail@3v1n0.net-20120330130112-38l5l2232cys9us7

Merging with upstream

files added:
plugins/unityshell/src/SingleMonitorLauncherIcon.cpp

plugins/unityshell/src/SingleMonitorLauncherIcon.h

tests/test_single_monitor_launcher_icon.cpp

files modified:
UnityCore/FilesystemLenses.cpp

UnityCore/FilesystemLenses.h

manual-tests/Hud.txt

plugins/unityshell/src/AbstractLauncherIcon.h

plugins/unityshell/src/AbstractShortcutHint.h

plugins/unityshell/src/BFBLauncherIcon.cpp

plugins/unityshell/src/BamfLauncherIcon.cpp

plugins/unityshell/src/BamfLauncherIcon.h

plugins/unityshell/src/DashController.h

plugins/unityshell/src/DashStyle.cpp

plugins/unityshell/src/DashStyle.h

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/FilterBar.cpp

plugins/unityshell/src/HudController.cpp

plugins/unityshell/src/HudController.h

plugins/unityshell/src/HudIcon.cpp

plugins/unityshell/src/HudIcon.h

plugins/unityshell/src/HudLauncherIcon.cpp

plugins/unityshell/src/HudLauncherIcon.h

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IconTexture.cpp

plugins/unityshell/src/IconTexture.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LauncherController.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/LauncherIcon.h

plugins/unityshell/src/LensView.cpp

plugins/unityshell/src/MockLauncherIcon.h

plugins/unityshell/src/SearchBar.cpp

plugins/unityshell/src/SearchBar.h

plugins/unityshell/src/ShortcutController.cpp

plugins/unityshell/src/ShortcutController.h

plugins/unityshell/src/ShortcutHint.h

plugins/unityshell/src/ShortcutModel.cpp

plugins/unityshell/src/ShortcutModel.h

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/SimpleLauncherIcon.cpp

plugins/unityshell/src/SimpleLauncherIcon.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

tests/CMakeLists.txt

tests/autopilot/autopilot/emulators/X11.py

tests/autopilot/autopilot/emulators/bamf.py

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

tests/autopilot/autopilot/emulators/unity/icons.py

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

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

tests/autopilot/autopilot/tests/__init__.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_launcher.py

tests/autopilot/autopilot/tests/test_shortcut_hint.py

tests/autopilot/autopilot/tests/test_showdesktop.py

tests/autopilot/autopilot/tests/test_switcher.py

tests/test_shortcut_model.cpp

Show diffs side-by-side

added added

removed removed

plugins/unityshell/src/HudLauncherIcon.h

20

20

#ifndef UNITYSHELL_HUDLAUNCHERICON_H

21

21

#define UNITYSHELL_HUDLAUNCHERICON_H

22

22

23

#include "SimpleLauncherIcon.h"

23

#include "SingleMonitorLauncherIcon.h"

24

24

25

25

#include "LauncherOptions.h"

26

26

#include "UBusWrapper.h"

30

30

namespace launcher

31

31

{

32

32

33

class HudLauncherIcon : public SimpleLauncherIcon

33

class HudLauncherIcon : public SingleMonitorLauncherIcon

34

34

{

35

35

36

36

public:

Older »