89e178b · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Removed some commented code.

89e178bPawel Stolowski13 years ago

plugins/Unity/lens.cpp+5−70

compare with xenial

unifiedsplit

@@ -32,11 +32,9 @@ Lens::Lens(QObject *parent) :

32 QObject(parent)

33{

34 m_results = new DeeListModel(this);

35− //m_globalResults = new DeeListModel(this);

36 m_categories = new Categories(this);

35 m_categories = new Categories(this);

38 m_categories->setResultModel(m_results);

37 m_categories->setResultModel(m_results);

39−// m_categories->setGlobalResultModel(m_globalResults);

40}

38}

42QString Lens::id() const

40QString Lens::id() const

@@ -44,16 +42,6 @@ QString Lens::id() const

44 return QString::fromStdString(m_unityLens->id());

42 return QString::fromStdString(m_unityLens->id());

45}

43}

47−/*QString Lens::dbusName() const

48−{

49− return QString::fromStdString(m_unityLens->dbus_name());

50−}

51−

52−QString Lens::dbusPath() const

53−{

54− return QString::fromStdString(m_unityLens->dbus_path());

55− }*/

56−

57QString Lens::name() const

45QString Lens::name() const

58{

46{

59 return QString::fromStdString(m_unityLens->name());

47 return QString::fromStdString(m_unityLens->name());

@@ -79,11 +67,6 @@ bool Lens::visible() const

79 return m_unityLens->visible();

67 return m_unityLens->visible();

80}

68}

82−/*bool Lens::searchInGlobal() const

83−{

84− return m_unityLens->search_in_global();

85− }*/

86−

87QString Lens::shortcut() const

70QString Lens::shortcut() const

88{

71{

89 return QString::fromStdString(m_unityLens->shortcut());

72 return QString::fromStdString(m_unityLens->shortcut());

@@ -99,11 +82,6 @@ DeeListModel* Lens::results() const

99 return m_results;

82 return m_results;

100}

83}

101

102−/*DeeListModel* Lens::globalResults() const

103−{

104− return m_globalResults;

105−}*/

106−

107Categories* Lens::categories() const

85Categories* Lens::categories() const

108{

86{

109 return m_categories;

87 return m_categories;

@@ -119,11 +97,6 @@ QString Lens::searchQuery() const

119 return m_searchQuery;

97 return m_searchQuery;

120}

98}

121

122−/*QString Lens::globalSearchQuery() const

123−{

124− return m_globalSearchQuery;

125−}*/

126−

127QString Lens::noResultsHint() const

100QString Lens::noResultsHint() const

128{

101{

129 return m_noResultsHint;

102 return m_noResultsHint;

@@ -148,20 +121,6 @@ void Lens::setSearchQuery(const QString& search_query)

148 }

121 }

149}

122}

150

123

151−//void Lens::setGlobalSearchQuery(const QString& search_query)

152−//{

153− /* Checking for m_globalSearchQuery.isNull() which returns true only when the string

154− has never been set is necessary because when search_query is the empty

155− string ("") and m_globalSearchQuery is the null string,

156− search_query != m_globalSearchQuery is still true.

157− */

158−/* if (m_globalSearchQuery.isNull() || search_query != m_globalSearchQuery) {

159− m_globalSearchQuery = search_query;

160− m_unityLens->GlobalSearch(search_query.toStdString(), sigc::mem_fun(this, &Lens::globalSearchFinished));

161− Q_EMIT globalSearchQueryChanged();

162− }

163−}*/

164−

165void Lens::setNoResultsHint(const QString& hint) {

124void Lens::setNoResultsHint(const QString& hint) {

166 if (hint != m_noResultsHint) {

125 if (hint != m_noResultsHint) {

167 m_noResultsHint = hint;

126 m_noResultsHint = hint;

@@ -171,13 +130,13 @@ void Lens::setNoResultsHint(const QString& hint) {

171

130

172void Lens::activate(const QString& uri)

131void Lens::activate(const QString& uri)

173{

132{

174− // m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData()); FIXME pawel

133+// m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData()); FIXME pawel

175}

134}

176

135

177−void Lens::onActivated(std::string const& uri, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

136+void Lens::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

178{

137{

179 if (type == unity::dash::NOT_HANDLED) {

138 if (type == unity::dash::NOT_HANDLED) {

180− fallbackActivate(QString::fromStdString(uri));

139+ fallbackActivate(QString::fromStdString(result.uri));

181 }

140 }

182}

141}

183

142

@@ -218,19 +177,13 @@ void Lens::fallbackActivate(const QString& uri)

218void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

177void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

219{

178{

220 m_unityLens = lens;

179 m_unityLens = lens;

221−// m_results->setModel(m_unityLens->results()->model());

222

180

223 if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {

181 if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {

224 m_results->setModel(m_unityLens->results()->model());

182 m_results->setModel(m_unityLens->results()->model());

225 } else {

183 } else {

226 m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));

184 m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));

227 }

185 }

228−/* if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {

186+

229− m_globalResults->setModel(m_unityLens->global_results()->model());

230− } else {

231− m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

232− }*/

233−

234 if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {

187 if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {

235 m_categories->setModel(m_unityLens->categories()->model());

188 m_categories->setModel(m_unityLens->categories()->model());

236 } else {

189 } else {

@@ -239,21 +192,16 @@ void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

239

192

240 /* Property change signals */

193 /* Property change signals */

241 m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));

194 m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));

242−// m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));

243−// m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));

244 m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));

195 m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));

245 m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));

196 m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));

246 m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));

197 m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));

247 m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));

198 m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));

248 m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));

199 m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));

249−// m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));

250 m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));

200 m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));

251 m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));

201 m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));

252 m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));

202 m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));

253 m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));

203 m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));

254 m_unityLens->results()->model.changed.connect(sigc::mem_fun(this, &Lens::onResultsModelChanged));

204 m_unityLens->results()->model.changed.connect(sigc::mem_fun(this, &Lens::onResultsModelChanged));

255−// m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));

256−// m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));

257 m_unityLens->categories()->model.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesModelChanged));

205 m_unityLens->categories()->model.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesModelChanged));

258 m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));

206 m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));

259 m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));

207 m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));

@@ -263,7 +211,7 @@ void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

263 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));

211 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));

264

212

265 /* FIXME: signal should be forwarded instead of calling the handler directly */

213 /* FIXME: signal should be forwarded instead of calling the handler directly */

266− //unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated)); //FIXME pawel

214+ m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));

267

215

268 /* Synchronize local states with m_unityLens right now and whenever

216 /* Synchronize local states with m_unityLens right now and whenever

269 m_unityLens becomes connected */

217 m_unityLens becomes connected */

@@ -284,9 +232,6 @@ void Lens::synchronizeStates()

284 if (!m_searchQuery.isNull()) {

232 if (!m_searchQuery.isNull()) {

285 m_unityLens->Search(m_searchQuery.toStdString());

233 m_unityLens->Search(m_searchQuery.toStdString());

286 }

234 }

287− /*if (!m_globalSearchQuery.isNull()) {

288− m_unityLens->GlobalSearch(m_globalSearchQuery.toStdString());

289− }*/

290 }

235 }

291}

236}

292

237

@@ -305,16 +250,6 @@ void Lens::onResultsModelChanged(unity::glib::Object<DeeModel> model)

305 m_results->setModel(m_unityLens->results()->model());

250 m_results->setModel(m_unityLens->results()->model());

306}

251}

307

252

308−//void Lens::onGlobalResultsSwarmNameChanged(const std::string& /* swarm_name */)

309−//{

310−// m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

311−//

312−

313−//id Lens::onGlobalResultsChanged(const unity::dash::Results::Ptr& /* global_results */)

314−//

315−// m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

316−//}

317−

318void Lens::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)

253void Lens::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)

319{

254{

320 m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));

255 m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));

plugins/Unity/lens.h+2−19

@@ -28,6 +28,7 @@

28// libunity-core

29#include <UnityCore/Scope.h>

30#include <UnityCore/Variant.h>

31+#include <UnityCore/Results.h>

32// dee-qt

33// dee-qt

33#include "deelistmodel.h"

34#include "deelistmodel.h"

@@ -40,23 +41,18 @@ class Lens : public QObject

40 Q_ENUMS(ViewType)

41 Q_ENUMS(ViewType)

42 Q_PROPERTY(QString id READ id NOTIFY idChanged)

43 Q_PROPERTY(QString id READ id NOTIFY idChanged)

43−// Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)

44−// Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)

45 Q_PROPERTY(QString name READ name NOTIFY nameChanged)

44 Q_PROPERTY(QString name READ name NOTIFY nameChanged)

46 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

45 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

47 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

46 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

48 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

47 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

49 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

48 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

50−// Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)

51 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

49 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

52 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

50 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

53 Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)

51 Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)

54−// Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)

55 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)

52 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)

56 Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)

53 Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)

58 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)

55 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)

59−// Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)

60 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)

56 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)

62public:

58public:

@@ -70,14 +66,11 @@ public:

71 /* getters */

67 /* getters */

72 QString id() const;

68 QString id() const;

73−// QString dbusName() const;

74−// QString dbusPath() const;

75 QString name() const;

69 QString name() const;

76 QString iconHint() const;

70 QString iconHint() const;

77 QString description() const;

71 QString description() const;

78 QString searchHint() const;

72 QString searchHint() const;

79 bool visible() const;

73 bool visible() const;

80−// bool searchInGlobal() const;

81 QString shortcut() const;

74 QString shortcut() const;

82 bool connected() const;

75 bool connected() const;

83 DeeListModel* results() const;

76 DeeListModel* results() const;

@@ -85,13 +78,11 @@ public:

85 Categories* categories() const;

78 Categories* categories() const;

86 ViewType viewType() const;

79 ViewType viewType() const;

87 QString searchQuery() const;

80 QString searchQuery() const;

88−// QString globalSearchQuery() const;

89 QString noResultsHint() const;

81 QString noResultsHint() const;

91 /* setters */

83 /* setters */

92 void setViewType(const ViewType& viewType);

84 void setViewType(const ViewType& viewType);

93 void setSearchQuery(const QString& search_query);

85 void setSearchQuery(const QString& search_query);

94−// void setGlobalSearchQuery(const QString& search_query);

95 void setNoResultsHint(const QString& hint);

86 void setNoResultsHint(const QString& hint);

97 Q_INVOKABLE void activate(const QString& uri);

88 Q_INVOKABLE void activate(const QString& uri);

@@ -107,17 +98,13 @@ Q_SIGNALS:

107 void descriptionChanged(const std::string&);

98 void descriptionChanged(const std::string&);

108 void searchHintChanged(const std::string&);

99 void searchHintChanged(const std::string&);

109 void visibleChanged(bool);

100 void visibleChanged(bool);

110−// void searchInGlobalChanged(bool);

111 void shortcutChanged(const std::string&);

101 void shortcutChanged(const std::string&);

112 void connectedChanged(bool);

102 void connectedChanged(bool);

113 void resultsChanged();

103 void resultsChanged();

114−// void globalResultsChanged();

115 void categoriesChanged();

104 void categoriesChanged();

116 void viewTypeChanged(ViewType);

105 void viewTypeChanged(ViewType);

117 void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);

106 void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);

118−// void globalSearchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&); FIXME pawel

119 void searchQueryChanged();

107 void searchQueryChanged();

120−// void globalSearchQueryChanged();

121 void noResultsHintChanged();

108 void noResultsHintChanged();

122

109

123private Q_SLOTS:

110private Q_SLOTS:

@@ -128,22 +115,18 @@ private:

128 void onResultsSwarmNameChanged(const std::string&);

115 void onResultsSwarmNameChanged(const std::string&);

129 void onResultsChanged(const unity::dash::Results::Ptr&);

116 void onResultsChanged(const unity::dash::Results::Ptr&);

130 void onResultsModelChanged(unity::glib::Object<DeeModel>);

117 void onResultsModelChanged(unity::glib::Object<DeeModel>);

131−// void onGlobalResultsSwarmNameChanged(const std::string&);

132−// void onGlobalResultsChanged(const unity::dash::Results::Ptr&);

133 void onCategoriesSwarmNameChanged(const std::string&);

118 void onCategoriesSwarmNameChanged(const std::string&);

134 void onCategoriesModelChanged(unity::glib::Object<DeeModel>);

119 void onCategoriesModelChanged(unity::glib::Object<DeeModel>);

135 void onCategoriesChanged(const unity::dash::Categories::Ptr&);

120 void onCategoriesChanged(const unity::dash::Categories::Ptr&);

136 void onViewTypeChanged(unity::dash::ScopeViewType);

121 void onViewTypeChanged(unity::dash::ScopeViewType);

137

122

138− void onActivated(std::string const& uri, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);

123+ void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);

139 void fallbackActivate(const QString& uri);

124 void fallbackActivate(const QString& uri);

140

125

141 unity::dash::Scope::Ptr m_unityLens;

126 unity::dash::Scope::Ptr m_unityLens;

142 DeeListModel* m_results;

127 DeeListModel* m_results;

143−// DeeListModel* m_globalResults;

144 Categories* m_categories;

128 Categories* m_categories;

145 QString m_searchQuery;

129 QString m_searchQuery;

146−// QString m_globalSearchQuery;

147 QString m_noResultsHint;

130 QString m_noResultsHint;

148};

131};

149

132