← Back to branch summary

~azzar1/unity/fix-681503

« back to all changes in this revision

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

  • Committer: Andrea Azzarone
  • Date: 2012-01-18 13:28:09 UTC
  • mfrom: (1815.1.29 unity)
  • Revision ID: azzaronea@gmail.com-20120118132809-5pdgbnq1bgtitoz2
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.h
39
39
#include "DashSettings.h"
40
40
#include "DashStyle.h"
41
41
#include "FontSettings.h"
 
42
#include "ShortcutController.h"
 
43
#include "ShortcutHint.h"
42
44
#include "LauncherController.h"
43
45
#include "PanelController.h"
44
46
#include "PanelStyle.h"
190
192
  bool altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
191
193
  bool altTabPrevWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
192
194
 
 
195
  bool launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
196
  bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
197
  bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
198
 
193
199
  /* handle option changes and change settings inside of the
194
200
   * panel and dock views */
195
201
  void optionChanged(CompOption*, Options num);
242
248
  static void OnQuicklistEndKeyNav(GVariant* data, void* value);
243
249
  static void OnLauncherStartKeyNav(GVariant* data, void* value);
244
250
  static void OnLauncherEndKeyNav(GVariant* data, void* value);
 
251
  
 
252
  void InitHints();
245
253
 
246
254
  dash::Settings dash_settings_;
247
255
  dash::Style    dash_style_;
253
261
  panel::Controller::Ptr    panel_controller_;
254
262
  switcher::Controller::Ptr switcher_controller_;
255
263
 
 
264
  shortcut::Controller::Ptr shortcut_controller_;
 
265
  std::list<shortcut::AbstractHint*> hints_;
 
266
  bool enable_shortcut_overlay_;
 
267
 
256
268
  GestureEngine*                        gestureEngine;
257
269
  nux::WindowThread*                    wt;
258
270
  nux::BaseWindow*                      panelWindow;
266
278
  guint32                               _redraw_handle;
267
279
  gint                                  _edge_pointerY;
268
280
  guint                                 _ubus_handles[3];
269
 
 
 
281
  
270
282
  typedef std::shared_ptr<CompAction> CompActionPtr;
271
283
  typedef std::vector<CompActionPtr> ShortcutActions;
272
284
  ShortcutActions _shortcut_actions;