← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to dash/DashController.h

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/DashController.h
45
45
  typedef std::shared_ptr<Controller> Ptr;
46
46
 
47
47
  Controller();
 
48
  ~Controller();
48
49
 
49
50
  nux::BaseWindow* window() const;
50
51
 
58
59
 
59
60
  void HideDash(bool restore_focus = true);
60
61
 
 
62
  bool IsVisible() const;
 
63
 
61
64
protected:
62
65
  std::string GetName() const;
63
66
  void AddProperties(GVariantBuilder* builder);
84
87
  void StartShowHideTimeline();
85
88
  void OnViewShowHideFrame(double progress);
86
89
 
 
90
  static void OnBusAcquired(GObject *obj, GAsyncResult *result, gpointer user_data);
 
91
  static void OnDBusMethodCall(GDBusConnection* connection, const gchar* sender,
 
92
                               const gchar* object_path, const gchar* interface_name,
 
93
                               const gchar* method_name, GVariant* parameters,
 
94
                               GDBusMethodInvocation* invocation, gpointer user_data);
 
95
 
87
96
  static void OnWindowConfigure(int width, int height, nux::Geometry& geo, void* data);
88
97
 
89
98
private:
97
106
  sigc::connection screen_ungrabbed_slot_;
98
107
  glib::SignalManager sig_manager_;
99
108
  glib::TimeoutSeconds ensure_timeout_;
100
 
  glib::SourceManager sources_;
101
109
  Animator timeline_animator_;
102
110
  UBusManager ubus_manager_;
 
111
  unsigned int dbus_owner_;
 
112
  glib::Object<GCancellable> dbus_connect_cancellable_;
 
113
  static GDBusInterfaceVTable interface_vtable;
103
114
};
104
115
 
105
116