← Back to branch summary

~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to dash/ScopeView.h

  • Committer: Chris Townsend
  • Date: 2013-07-17 16:24:40 UTC
  • mfrom: (3379.1.48 trunk)
  • Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/ScopeView.h
29
29
#include <Nux/VLayout.h>
30
30
#include <UnityCore/Scope.h>
31
31
#include <UnityCore/GLibSource.h>
 
32
#include <UnityCore/ConnectionManager.h>
32
33
 
33
34
#include "FilterBar.h"
34
35
#include "unity-shared/Introspectable.h"
51
52
  typedef std::map<PlacesGroup::Ptr, unsigned int> ResultCounts;
52
53
 
53
54
public:
54
 
  ScopeView(Scope::Ptr scope, nux::Area* show_filters);
55
 
  ~ScopeView();
 
55
  ScopeView(Scope::Ptr const& scope, nux::Area* show_filters);
56
56
 
57
57
  CategoryGroups GetOrderedCategoryViews() const;
58
58
  FilterBar* filter_bar() const { return filter_bar_; }
142
142
  CategoryGroups category_views_;
143
143
 
144
144
  Scope::Ptr scope_;
145
 
  glib::Object<GCancellable> cancellable_;
146
 
  glib::Object<GCancellable> search_cancellable_;
 
145
  glib::Cancellable cancellable_;
 
146
  glib::Cancellable search_cancellable_;
147
147
  std::vector<unsigned int> category_order_;
148
148
  ResultCounts counts_;
149
149
  bool no_results_active_;
166
166
 
167
167
  bool filter_expansion_pushed_;
168
168
 
169
 
  sigc::connection results_updated;
170
 
  sigc::connection result_added_connection;
171
 
  sigc::connection result_removed_connection;
172
 
 
173
 
  sigc::connection categories_updated;
174
 
  sigc::connection category_added_connection;
175
 
  sigc::connection category_changed_connection;
176
 
  sigc::connection category_removed_connection;
177
 
 
178
 
  sigc::connection filters_updated;
179
 
  sigc::connection filter_added_connection;
180
 
  sigc::connection filter_removed_connection;
 
169
  connection::handle result_added_connection_;
 
170
  connection::handle result_removed_connection_;
 
171
 
 
172
  connection::handle category_added_connection_;
 
173
  connection::handle category_changed_connection_;
 
174
  connection::handle category_removed_connection_;
 
175
 
 
176
  connection::handle filter_added_connection_;
 
177
  connection::handle filter_removed_connection_;
 
178
 
 
179
  connection::handle key_nav_focus_connection_;
 
180
 
 
181
  connection::Manager conn_manager_;
181
182
 
182
183
  bool scope_connected_;
183
184
  bool search_on_next_connect_;
184
185
 
185
186
  int current_focus_category_position_;
186
187
  glib::Variant current_focus_variant_;
187
 
  sigc::connection key_nav_focus_connection_;
188
188
 
189
189
  friend class TestScopeView;
190
190
};