← Back to branch summary

~ubuntu-branches/ubuntu/precise/unity/precise

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-04-17 08:09:15 UTC
  • Revision ID: package-import@ubuntu.com-20120417080915-n4isucvywpacze55
Tags: 5.10.0-0ubuntu5
https://launchpad.net/bugs/981168
https://launchpad.net/bugs/980828
* Cherry-pick two fixes from trunk:
  - Fix the software-center install animation making the display useless
    on netbooks (LP: #981168)
  - Shortcut keys in workspace section of the shortcut overlay aren't
    translated. (LP: #980828)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/Launcher.h
122
122
  sigc::signal<void, AbstractLauncherIcon::Ptr> icon_animation_complete;
123
123
  sigc::signal<void> selection_change;
124
124
  sigc::signal<void> hidden_changed;
 
125
  sigc::signal<void> sc_launcher_icon_animation;
 
126
  sigc::connection sc_launcher_icon_animation_connection;
125
127
 
126
128
  virtual bool InspectKeyEvent(unsigned int eventType,
127
129
                               unsigned int keysym,
416
418
 
417
419
  ui::AbstractIconRenderer::Ptr icon_renderer;
418
420
  BackgroundEffectHelper bg_effect_helper_;
 
421
 
 
422
  gchar*  _sc_icon;
 
423
  gchar*  _sc_icon_title;
 
424
  gint32  _sc_icon_x;
 
425
  gint32  _sc_icon_y;
 
426
  gint32  _sc_icon_size;
 
427
  gchar*  _sc_icon_desktop_file;
 
428
  gchar*  _sc_icon_aptdaemon_task;
 
429
  bool    _sc_anim_icon;
419
430
};
420
431
 
421
432
}